From 2dd573d17ed30a235a2b6b470a5e212c29193d3a Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Wed, 3 Jan 2024 01:56:37 +0200 Subject: [PATCH 1/3] upgrade --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 77609c23c..34a53f8e8 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 77609c23c8ac044084d7b582824897d449f39c95 +Subproject commit 34a53f8e83d0b4ef384e0f97f91007efed68de7c From 3b27207b505644ef6c2dfef540baa482e3f1b705 Mon Sep 17 00:00:00 2001 From: slicklash Date: Wed, 5 Jun 2024 15:16:24 +0300 Subject: [PATCH 2/3] up --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5238d8484..3d4c80fed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ ConfigArgParse==1.3 distro==1.7.0 setuptools==65.5.1 # For pkg_resources packaging==23.1 -pyelftools==0.28 +pyelftools==0.31 curlify==2.2.1 retry==0.9.2 websocket-client==1.3.1 From 3a5f249e8d44eceffe1aaec70338183c0b8df144 Mon Sep 17 00:00:00 2001 From: slicklash Date: Wed, 5 Jun 2024 15:24:24 +0300 Subject: [PATCH 3/3] up --- gprofiler/main.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gprofiler/main.py b/gprofiler/main.py index 3541e020b..32a72b003 100644 --- a/gprofiler/main.py +++ b/gprofiler/main.py @@ -34,7 +34,6 @@ from granulate_utils.linux.ns import is_running_in_init_pid from granulate_utils.linux.process import is_process_running from granulate_utils.metadata.cloud import get_aws_execution_env -from granulate_utils.metadata.databricks_client import DBXWebUIEnvWrapper, get_name_from_metadata from psutil import NoSuchProcess, Process from requests import RequestException, Timeout @@ -1043,18 +1042,18 @@ def main() -> None: # assume we run in the root cgroup (when containerized, that's our view) usage_logger = CgroupsUsageLogger(logger, "/") if args.log_usage else NoopUsageLogger() - if args.databricks_job_name_as_service_name: - # "databricks" will be the default name in case of failure with --databricks-job-name-as-service-name flag - args.service_name = "databricks" - dbx_web_ui_wrapper = DBXWebUIEnvWrapper(logger) - dbx_metadata = dbx_web_ui_wrapper.all_props_dict - if dbx_metadata is not None: - service_suffix = get_name_from_metadata(dbx_metadata) - if service_suffix is not None: - args.service_name = f"databricks-{service_suffix}" - - if remote_logs_handler is not None: - remote_logs_handler.update_service_name(args.service_name) + # if args.databricks_job_name_as_service_name: + # # "databricks" will be the default name in case of failure with --databricks-job-name-as-service-name flag + # args.service_name = "databricks" + # dbx_web_ui_wrapper = DBXWebUIEnvWrapper(logger) + # dbx_metadata = dbx_web_ui_wrapper.all_props_dict + # if dbx_metadata is not None: + # service_suffix = get_name_from_metadata(dbx_metadata) + # if service_suffix is not None: + # args.service_name = f"databricks-{service_suffix}" + # + # if remote_logs_handler is not None: + # remote_logs_handler.update_service_name(args.service_name) try: logger.info(