Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions gprofiler/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion granulate-utils
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down