chore: use more elegant way

Signed-off-by: Dominik Rosiek <[email protected]>
SumoLogic · Dec 7, 2023 · 68bd309 · 68bd309
1 parent 00f906f
commit 68bd309
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml
@@ -46,8 +46,8 @@ processors:
     log_statements:
       - context: log
         statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"] == 0
 
 receivers:
   raw_k8s_events: {}

diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml
@@ -376,8 +376,8 @@ processors:
     log_statements:
       - context: log
         statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"] == 0
 
   ## Move attributes from the body to the record and drop the body if it's a map
   ## The map check isn't perfect, as there's no way to check for this explicitly in OTTL

diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml
@@ -52,9 +52,8 @@ data:
         log_statements:
         - context: log
           statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"]
-            == 0
     receivers:
       raw_k8s_events: {}
     service:

diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml
@@ -48,9 +48,8 @@ data:
         log_statements:
         - context: log
           statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"]
-            == 0
     receivers:
       raw_k8s_events: {}
     service:

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml
@@ -248,9 +248,8 @@ data:
         log_statements:
         - context: log
           statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"]
-            == 0
       transform/containers_parse_json:
         error_mode: ignore
         log_statements:

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml
@@ -275,9 +275,8 @@ data:
         log_statements:
         - context: log
           statements:
+          - set(time, Now()) where time_unix_nano == 0
           - set(attributes["timestamp"], Int(time_unix_nano / 1000000))
-          - set(attributes["timestamp"], UnixMilli(Now())) where attributes["timestamp"]
-            == 0
       transform/containers_parse_json:
         error_mode: ignore
         log_statements: