Update default exporter for traces to otlphttp (#1518)

* Update default exporter for traces to otlphttp * add otlphttp exporter * update issues in change log * add otlphttp exporter to agent config * remove sapm exporter * remove retry disabled setting * fix config and changelog
signalfx · Nov 1, 2024 · 42457d3 · 42457d3
1 parent a655653
commit 42457d3
Show file tree

Hide file tree

Showing 62 changed files with 228 additions and 153 deletions.
diff --git a/.chloggen/update-default-traces-exporter-to-otlphttp.yaml b/.chloggen/update-default-traces-exporter-to-otlphttp.yaml
@@ -0,0 +1,15 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: agent, gateway, chart
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: update default traces exporter to otlphttp
+# One or more tracking issues related to the change
+issues: [1518]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  If you use the sapm exporter with custom settings, you have two options:
+  - Migrate your sapm settings to the new otlphttp exporter.
+  - Retain SAPM settings by moving them to your agent.config or gateway.config overrides to ensure they remain effective.
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -472,7 +474,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 4862f26e2f083ffb617ecd3f842356701bc183aa76a228b57bd6add5e7f6635e
+        checksum/config: 0ddcd80f84fdf2e6bfedd55f809f46930319a9d021e8be6926ac1cee276f59e9
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -422,7 +424,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: ad596a61d53914bd4ef7cde042d55266ea096e8c8a5637cecaef2ecf5ce00c6f
+        checksum/config: 713de06a7de5ba9df9411672d7441ff7d4894cc5b1ea6480f24778ed20ce36a2
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -300,7 +302,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: a08848ea1a480939f703fa88ccd6a6922b64fc532baee310c10f47d3c08158f6
+        checksum/config: 3eabb8da188e5dc7d834d747ee8041622b671175e9dc20e5823aa2c96838774e
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -288,7 +290,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 5b9bcb88a530865d90b45564e31f60aa07f4aca3a15e683899eec312b1580c3f
+        checksum/config: b1ebf018694bd0c1f6aea797a0abdbb5f088a4c793be704192b43d5c5688b0cf
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -464,7 +466,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f35725fe89125f3d9f76abb9d5e6f9a5a31d1581aa829886ffcfd0516eafaa79
+        checksum/config: e2c4aa1ac525a087c9eaa76a0956814dd77874fa72405b1f1136ddee903e2a7c
         kubectl.kubernetes.io/default-container: otel-collector
         sidecar.istio.io/inject: "false"
     spec:

diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -285,7 +287,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 71289ab7fac49bdf026a3731813f2fbc4aae35aa80f89f5650f8d64c837ff81c
+        checksum/config: 15a38e9a91cdfd6bac2c37679bf6856bf86b7bfcd1d2d6dbe1399726964cc33a
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml
@@ -18,11 +18,13 @@ metadata:
 data:
   relay: |
     exporters:
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
         sending_queue:
           num_consumers: 32
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -202,7 +204,7 @@ data:
           - prometheus/collector
         traces:
           exporters:
-          - sapm
+          - otlphttp
           processors:
           - memory_limiter
           - k8sattributes

diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: a75cfb40a3322e3aa581e71872aaa2d7555dba7f996b4144b1e637fb4af106e8
+        checksum/config: 5a92aacede6962b931c8831c33c6fbd4311b45acbf47973427d9b5930622eab0
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml
@@ -18,11 +18,13 @@ metadata:
 data:
   relay: |
     exporters:
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
         sending_queue:
           num_consumers: 32
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -202,7 +204,7 @@ data:
           - prometheus/collector
         traces:
           exporters:
-          - sapm
+          - otlphttp
           processors:
           - memory_limiter
           - k8sattributes

diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: a75cfb40a3322e3aa581e71872aaa2d7555dba7f996b4144b1e637fb4af106e8
+        checksum/config: 5a92aacede6962b931c8831c33c6fbd4311b45acbf47973427d9b5930622eab0
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -325,7 +327,7 @@ data:
           - receiver_creator
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: b247aa05c77c61ca433e70fc8a4f4785dce779de9ccaf88aa92afefe9d514f4a
+        checksum/config: 9d375fa45d37805176151213dc79dd6625a5cb09d9855eb670aa69dd91ded7bf
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml
@@ -18,13 +18,15 @@ metadata:
 data:
   relay: |
     exporters:
+      otlphttp:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp
+        traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
       otlphttp/entities:
         headers:
           X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
-      sapm:
-        access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com
@@ -285,7 +287,7 @@ data:
           - prometheus/agent
         traces:
           exporters:
-          - sapm
+          - otlphttp
           - signalfx
           processors:
           - memory_limiter

diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 71289ab7fac49bdf026a3731813f2fbc4aae35aa80f89f5650f8d64c837ff81c
+        checksum/config: 15a38e9a91cdfd6bac2c37679bf6856bf86b7bfcd1d2d6dbe1399726964cc33a
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true