OTel: Add log context to body in transform processor config to satisfy collector 0.125.0.

dsessler7 · jmckulk · commit 5593bbe46bb2 · 2025-05-09T11:00:28.000-04:00
diff --git a/internal/collector/generated/postgres_logs_transforms.json b/internal/collector/generated/postgres_logs_transforms.json
diff --git a/internal/collector/postgres_logs_transforms.yaml b/internal/collector/postgres_logs_transforms.yaml
@@ -8,7 +8,7 @@
 # TODO(postgres-14): We can stop parsing CSV logs when 14 is EOL.
 # https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/contexts/ottllog#readme
 - conditions:
-    - body["format"] == "csv"
+    - log.body["format"] == "csv"
   statements:
     # https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/ottlfuncs#parsecsv
     - set(log.cache, ParseCSV(log.body["original"], log.body["headers"], delimiter=",", mode="strict"))
@@ -196,7 +196,7 @@
     # https://github.com/pgaudit/pgaudit/blame/17.0/pgaudit.c#L876
     # TODO(postgres-18): Check this prefix and update the URL above.
     - >-
-      Len(body["message"]) > 7 and Substring(body["message"], 0, 7) == "AUDIT: "
+      Len(log.body["message"]) > 7 and Substring(log.body["message"], 0, 7) == "AUDIT: "
   statements:
     # https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/ottlfuncs#parsecsv
     - >-
diff --git a/internal/collector/postgres_test.go b/internal/collector/postgres_test.go
@@ -123,7 +123,7 @@ processors:
   transform/postgres_logs:
     log_statements:
     - conditions:
-      - body["format"] == "csv"
+      - log.body["format"] == "csv"
       statements:
       - set(log.cache, ParseCSV(log.body["original"], log.body["headers"], delimiter=",",
         mode="strict"))
@@ -203,8 +203,8 @@ processors:
       - set(log.attributes["process.title"], log.body["ps"]) where IsString(log.body["ps"])
       - set(log.attributes["user.name"], log.body["user"]) where IsString(log.body["user"])
     - conditions:
-      - 'Len(body["message"]) > 7 and Substring(body["message"], 0, 7) == "AUDIT:
-        "'
+      - 'Len(log.body["message"]) > 7 and Substring(log.body["message"], 0, 7) ==
+        "AUDIT: "'
       statements:
       - set(log.body["pgaudit"], ParseCSV(Substring(log.body["message"], 7, Len(log.body["message"])
         - 7), "audit_type,statement_id,substatement_id,class,command,object_type,object_name,statement,parameter",
@@ -383,7 +383,7 @@ processors:
   transform/postgres_logs:
     log_statements:
     - conditions:
-      - body["format"] == "csv"
+      - log.body["format"] == "csv"
       statements:
       - set(log.cache, ParseCSV(log.body["original"], log.body["headers"], delimiter=",",
         mode="strict"))
@@ -463,8 +463,8 @@ processors:
       - set(log.attributes["process.title"], log.body["ps"]) where IsString(log.body["ps"])
       - set(log.attributes["user.name"], log.body["user"]) where IsString(log.body["user"])
     - conditions:
-      - 'Len(body["message"]) > 7 and Substring(body["message"], 0, 7) == "AUDIT:
-        "'
+      - 'Len(log.body["message"]) > 7 and Substring(log.body["message"], 0, 7) ==
+        "AUDIT: "'
       statements:
       - set(log.body["pgaudit"], ParseCSV(Substring(log.body["message"], 7, Len(log.body["message"])
         - 7), "audit_type,statement_id,substatement_id,class,command,object_type,object_name,statement,parameter",
