From c2f7aec7a9b2b50ce736b28b36c7b7d364c69f77 Mon Sep 17 00:00:00 2001
From: Ben Galewsky <ben@peartreestudio.net>
Date: Wed, 27 Nov 2024 15:14:16 -0600
Subject: [PATCH] Add file-id to all transformer logging

---
 .../src/transformer_sidecar/servicex_adapter.py           | 1 +
 .../src/transformer_sidecar/transformer.py                | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/transformer_sidecar/src/transformer_sidecar/servicex_adapter.py b/transformer_sidecar/src/transformer_sidecar/servicex_adapter.py
index d82a045a..689c9f3e 100644
--- a/transformer_sidecar/src/transformer_sidecar/servicex_adapter.py
+++ b/transformer_sidecar/src/transformer_sidecar/servicex_adapter.py
@@ -102,6 +102,7 @@ def put_file_complete(self, rec: FileCompleteRecord):
                            tries=MAX_RETRIES,
                            delay=RETRY_DELAY)
                 self.logger.info("Put file complete.", extra={'requestId': rec.request_id,
+                                                              "file-id": rec.file_id,
                                                               "place": PLACE,
                                                               "file_path": rec.file_path})
             except requests.exceptions.ConnectionError:
diff --git a/transformer_sidecar/src/transformer_sidecar/transformer.py b/transformer_sidecar/src/transformer_sidecar/transformer.py
index 21d5c665..8b0bc835 100644
--- a/transformer_sidecar/src/transformer_sidecar/transformer.py
+++ b/transformer_sidecar/src/transformer_sidecar/transformer.py
@@ -343,12 +343,16 @@ def upload_file(source_path: Path,
         object_name = source_path.name
 
     logger.info("Uploading file to object store.",
-                extra={'requestId': request_id, "place": PLACE,
+                extra={'requestId': request_id,
+                       "file-id": rec.file_id,
+                       "place": PLACE,
                        "objectName": object_name})
     t0 = time.time()
     object_store.upload_file(request_id, object_name, file_to_upload.as_posix())
     logger.info("File uploaded to object store.",
-                extra={'requestId': request_id, "place": PLACE,
+                extra={'requestId': request_id,
+                       "file-id": rec.file_id,
+                       "place": PLACE,
                        "objectName": object_name,
                        "elapsed": time.time()-t0})