fix e2e tests

DataDog · Nov 15, 2024 · a408a85 · a408a85
1 parent 2f27ce8
commit a408a85
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 68 deletions.
diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml
@@ -16,7 +16,7 @@ exporters:
   datadog:
     api:
       fail_on_invalid_key: false
-      key: '[REDACTED]'
+      key: "[REDACTED]"
       site: datadoghq.com
     auth: null
     compression: ""
@@ -79,15 +79,15 @@ exporters:
     timeout: 15s
     tls:
       ca_file: ""
-      ca_pem: '[REDACTED]'
+      ca_pem: "[REDACTED]"
       cert_file: ""
-      cert_pem: '[REDACTED]'
+      cert_pem: "[REDACTED]"
       cipher_suites: []
       include_system_ca_certs_pool: false
       insecure: false
       insecure_skip_verify: false
       key_file: ""
-      key_pem: '[REDACTED]'
+      key_pem: "[REDACTED]"
       max_version: ""
       min_version: ""
       reload_interval: 0s
@@ -207,93 +207,94 @@ receivers:
         evaluation_interval: 1m
         scrape_interval: 1m
         scrape_protocols:
-        - OpenMetricsText1.0.0
-        - OpenMetricsText0.0.1
-        - PrometheusText0.0.4
+          - OpenMetricsText1.0.0
+          - OpenMetricsText0.0.1
+          - PrometheusText0.0.4
         scrape_timeout: 10s
       runtime:
         gogc: 75
       scrape_configs:
-      - enable_compression: true
-        enable_http2: true
-        follow_redirects: true
-        honor_timestamps: true
-        job_name: datadog-agent
-        metrics_path: /metrics
-        scheme: http
-        scrape_interval: 10s
-        scrape_protocols:
-        - OpenMetricsText1.0.0
-        - OpenMetricsText0.0.1
-        - PrometheusText0.0.4
-        scrape_timeout: 10s
-        static_configs:
-        - targets:
-          - 0.0.0.0:8888
-        track_timestamps_staleness: false
+        - enable_compression: true
+          enable_http2: true
+          follow_redirects: true
+          honor_timestamps: true
+          job_name: datadog-agent
+          metrics_path: /metrics
+          scheme: http
+          scrape_interval: 10s
+          scrape_protocols:
+            - OpenMetricsText1.0.0
+            - OpenMetricsText0.0.1
+            - PrometheusText0.0.4
+          scrape_timeout: 10s
+          static_configs:
+            - targets:
+                - 0.0.0.0:8888
+          track_timestamps_staleness: false
     report_extra_scrape_metrics: false
     start_time_metric_regex: ""
     target_allocator: null
     trim_metric_suffixes: false
     use_start_time_metric: false
 service:
   extensions:
-  - pprof/dd-autoconfigured
-  - zpages/dd-autoconfigured
-  - health_check/dd-autoconfigured
-  - ddflare/dd-autoconfigured
+    - pprof/dd-autoconfigured
+    - zpages/dd-autoconfigured
+    - health_check/dd-autoconfigured
+    - ddflare/dd-autoconfigured
   pipelines:
     logs:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
-      - infraattributes/dd-autoconfigured
+        - batch
+        - infraattributes/dd-autoconfigured
       receivers:
-      - otlp
+        - otlp
     metrics:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
-      - infraattributes/dd-autoconfigured
+        - batch
+        - infraattributes/dd-autoconfigured
       receivers:
-      - otlp
-      - datadog/connector
+        - otlp
+        - datadog/connector
     metrics/dd-autoconfigured/datadog:
       exporters:
-      - datadog
+        - datadog
       processors: []
       receivers:
-      - prometheus/dd-autoconfigured
+        - prometheus/dd-autoconfigured
     traces:
       exporters:
-      - datadog/connector
+        - datadog/connector
       processors:
-      - batch
-      - infraattributes/dd-autoconfigured
+        - batch
+        - infraattributes/dd-autoconfigured
       receivers:
-      - otlp
+        - otlp
     traces/send:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
-      - infraattributes/dd-autoconfigured
+        - batch
+        - infraattributes/dd-autoconfigured
       receivers:
-      - otlp
+        - otlp
   telemetry:
     logs:
       development: false
       disable_caller: false
       disable_stacktrace: false
       encoding: console
       error_output_paths:
-      - stderr
+        - stderr
       initial_fields: {}
       level: info
       output_paths:
-      - stderr
+        - stderr
+      processors: []
       sampling:
         enabled: true
         initial: 10

diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-provided-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-provided-config.yml
@@ -16,7 +16,7 @@ exporters:
   datadog:
     api:
       fail_on_invalid_key: false
-      key: '[REDACTED]'
+      key: "[REDACTED]"
       site: datadoghq.com
     auth: null
     compression: ""
@@ -79,15 +79,15 @@ exporters:
     timeout: 15s
     tls:
       ca_file: ""
-      ca_pem: '[REDACTED]'
+      ca_pem: "[REDACTED]"
       cert_file: ""
-      cert_pem: '[REDACTED]'
+      cert_pem: "[REDACTED]"
       cipher_suites: []
       include_system_ca_certs_pool: false
       insecure: false
       insecure_skip_verify: false
       key_file: ""
-      key_pem: '[REDACTED]'
+      key_pem: "[REDACTED]"
       max_version: ""
       min_version: ""
       reload_interval: 0s
@@ -146,45 +146,46 @@ service:
   pipelines:
     logs:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
+        - batch
       receivers:
-      - otlp
+        - otlp
     metrics:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
+        - batch
       receivers:
-      - otlp
-      - datadog/connector
+        - otlp
+        - datadog/connector
     traces:
       exporters:
-      - datadog/connector
+        - datadog/connector
       processors:
-      - batch
+        - batch
       receivers:
-      - otlp
+        - otlp
     traces/send:
       exporters:
-      - datadog
+        - datadog
       processors:
-      - batch
+        - batch
       receivers:
-      - otlp
+        - otlp
   telemetry:
     logs:
       development: false
       disable_caller: false
       disable_stacktrace: false
       encoding: console
       error_output_paths:
-      - stderr
+        - stderr
       initial_fields: {}
       level: info
       output_paths:
-      - stderr
+        - stderr
+      processors: []
       sampling:
         enabled: true
         initial: 10