From c092236c3a88d988bf94adcde73d2ef3fd63f4d0 Mon Sep 17 00:00:00 2001
From: Dekel Reches <dekel.reches@granulate.com>
Date: Tue, 24 Sep 2024 00:34:02 +0300
Subject: [PATCH] lint fix

---
 granulate_utils/gprofiler/java.py           | 4 ++--
 granulate_utils/gprofiler/utils/__init__.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/granulate_utils/gprofiler/java.py b/granulate_utils/gprofiler/java.py
index f9947a2c..a0ffd674 100644
--- a/granulate_utils/gprofiler/java.py
+++ b/granulate_utils/gprofiler/java.py
@@ -352,7 +352,7 @@ def get_java_version_logged(
     logger: Union[logging.LoggerAdapter, logging.Logger],
 ) -> Optional[str]:
     java_version = get_java_version(process, stop_event, logger)
-    logger.debug("java -version output", java_version_output=java_version, pid=process.pid)
+    logger.debug("java -version output", extra={"java_version_output": java_version, "pid": process.pid})
     return java_version
 
 
@@ -678,7 +678,7 @@ def _run_async_profiler(self, cmd: List[str]) -> str:
         else:
             ap_log = self._read_ap_log()
             ap_log_stripped = MEM_INFO_LOG_RE.sub("", ap_log)  # strip out mem info log only when for gProfiler log
-            self.logger.debug("async-profiler log", jattach_cmd=cmd, ap_log=ap_log_stripped)
+            self.logger.debug("async-profiler log", extra={"jattach_cmd": cmd, "ap_log": ap_log_stripped})
             return ap_log
 
     def _run_fdtransfer(self) -> None:
diff --git a/granulate_utils/gprofiler/utils/__init__.py b/granulate_utils/gprofiler/utils/__init__.py
index 240c769c..f0b23c21 100644
--- a/granulate_utils/gprofiler/utils/__init__.py
+++ b/granulate_utils/gprofiler/utils/__init__.py
@@ -114,7 +114,7 @@ def start_process(
     if isinstance(cmd, str):
         cmd = [cmd]
 
-    logger.debug("Running command", command=cmd)
+    logger.debug("Running command", extra={"command": cmd})
 
     env = kwargs.pop("env", None)
     staticx_dir = get_staticx_dir()
@@ -303,13 +303,13 @@ def run_process(
     result: CompletedProcess[bytes] = CompletedProcess(process.args, retcode, stdout, stderr)
 
     # decoding stdout/stderr as latin-1 which should never raise UnicodeDecodeError.
-    extra: Dict[str, Any] = {"exit_code": result.returncode}
+    extra: Dict[str, Any] = {"exit_code": result.returncode, "command": process.args}
     if not suppress_log:
         if result.stdout:
             extra["stdout"] = result.stdout.decode("latin-1")
         if result.stderr:
             extra["stderr"] = result.stderr.decode("latin-1")
-    logger.debug("Command exited", command=process.args, **extra)
+    logger.debug("Command exited", extra=extra)
     if reraise_exc is not None:
         raise reraise_exc
     elif check and retcode != 0: