еще улучшены логи и трейсы

2026-06-20 18:59:42 +03:00
parent 02f5ef93b0
commit d0301b3922
5 changed files with 108 additions and 10 deletions
@@ -13,19 +13,23 @@ receivers:
      - type: json_parser
        parse_to: attributes
        on_error: send
+      - type: json_parser
+        parse_from: attributes["attrs"]
+        parse_to: attributes["docker_attrs"]
+        on_error: send
      - type: filter
        expr: |
-          attributes["attrs"] == nil or
-          attributes["attrs"]["tag"] == nil or
+          attributes["docker_attrs"] == nil or
+          attributes["docker_attrs"]["tag"] == nil or
          (
-            attributes["attrs"]["tag"] != "g2s-aggregator${CONTAINER_SUFFIX}" and
-            attributes["attrs"]["tag"] != "g2s-aggregator-migrations${CONTAINER_SUFFIX}" and
-            attributes["attrs"]["tag"] != "g2s-aggregator-waybill-poller${CONTAINER_SUFFIX}" and
-            attributes["attrs"]["tag"] != "g2s-aggregator-waybill-email-sender${CONTAINER_SUFFIX}"
+            attributes["docker_attrs"]["tag"] != "g2s-aggregator${CONTAINER_SUFFIX}" and
+            attributes["docker_attrs"]["tag"] != "g2s-aggregator-migrations${CONTAINER_SUFFIX}" and
+            attributes["docker_attrs"]["tag"] != "g2s-aggregator-waybill-poller${CONTAINER_SUFFIX}" and
+            attributes["docker_attrs"]["tag"] != "g2s-aggregator-waybill-email-sender${CONTAINER_SUFFIX}"
          )
        on_error: send
      - type: regex_parser
-        parse_from: attributes["attrs"]["tag"]
+        parse_from: attributes["docker_attrs"]["tag"]
        regex: '^(?P<service_name>g2s-aggregator(?:-migrations|-waybill-poller|-waybill-email-sender)?)(?:-stage)?$'
        on_error: send
      - type: move
@@ -43,10 +47,21 @@ receivers:
      - type: remove
        field: attributes["attrs"]
        on_error: send
+      - type: remove
+        field: attributes["docker_attrs"]
+        on_error: send
      - type: json_parser
        parse_from: attributes.log
        parse_to: attributes
        on_error: send
+      - type: trace_parser
+        trace_id:
+          parse_from: attributes.trace_id
+        span_id:
+          parse_from: attributes.span_id
+        trace_flags:
+          parse_from: attributes.trace_flags
+        on_error: send
      - type: time_parser
        parse_from: attributes.timestamp
        layout: '%Y-%m-%dT%H:%M:%S.%fZ'