diff --git a/cmd/otelcol/config/collector/full_config_linux.yaml b/cmd/otelcol/config/collector/full_config_linux.yaml index 66f2df3177..67a11beb2a 100644 --- a/cmd/otelcol/config/collector/full_config_linux.yaml +++ b/cmd/otelcol/config/collector/full_config_linux.yaml @@ -647,13 +647,6 @@ exporters: headers: X-SF-TOKEN: "${SPLUNK_ACCESS_TOKEN}" - # Enables the sapm exporter - # Full configuration here: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sapmexporter - # TODO: Add access token and realm - sapm: - access_token: "${SPLUNK_ACCESS_TOKEN}" - endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace" - # Enables the zipkin exporter # Full configuration here: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/zipkinexporter # NOTE: These settings should be updated to the proper destination @@ -774,7 +767,7 @@ service: - memory_limiter - batch #- resource/add_environment - exporters: [sapm, signalfx] + exporters: [otlphttp, signalfx] metrics: receivers: [otlp, signalfx] processors: [memory_limiter, batch] diff --git a/cmd/otelcol/config/collector/gateway_config.yaml b/cmd/otelcol/config/collector/gateway_config.yaml index a652d05433..3d8d9a9fdb 100644 --- a/cmd/otelcol/config/collector/gateway_config.yaml +++ b/cmd/otelcol/config/collector/gateway_config.yaml @@ -91,13 +91,10 @@ processors: exporters: # Traces - sapm: - access_token: "${SPLUNK_ACCESS_TOKEN}" - endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace" - sending_queue: - num_consumers: 32 otlphttp: traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp" + sending_queue: + num_consumers: 32 headers: "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}" # Metrics + Events diff --git a/cmd/otelcol/fips/config/gateway_config.yaml b/cmd/otelcol/fips/config/gateway_config.yaml index b88a7934b0..fe57573d95 100644 --- a/cmd/otelcol/fips/config/gateway_config.yaml +++ b/cmd/otelcol/fips/config/gateway_config.yaml @@ -89,13 +89,10 @@ processors: exporters: # Traces - sapm: - access_token: "${SPLUNK_ACCESS_TOKEN}" - endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace" - sending_queue: - num_consumers: 32 otlphttp: traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp" + sending_queue: + num_consumers: 32 headers: "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}" # Metrics + Events diff --git a/packaging/technical-addon/Splunk_TA_otel/configs/ta-agent-config.yaml b/packaging/technical-addon/Splunk_TA_otel/configs/ta-agent-config.yaml index 6b0e4c0315..634987a05c 100644 --- a/packaging/technical-addon/Splunk_TA_otel/configs/ta-agent-config.yaml +++ b/packaging/technical-addon/Splunk_TA_otel/configs/ta-agent-config.yaml @@ -121,9 +121,10 @@ processors: exporters: # Traces - sapm: - access_token: "${env:SPLUNK_ACCESS_TOKEN}" - endpoint: "${env:SPLUNK_INGEST_URL}/v2/trace" + otlphttp: + traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp" + headers: + "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}" # Metrics + Events signalfx: access_token: "${env:SPLUNK_ACCESS_TOKEN}" @@ -148,7 +149,7 @@ service: - batch - resourcedetection #- resource/add_environment - exporters: [sapm, signalfx] + exporters: [otlphttp, signalfx] metrics: receivers: [hostmetrics, otlp, signalfx] processors: [memory_limiter, batch, resourcedetection] diff --git a/packaging/technical-addon/Splunk_TA_otel/configs/ta-gateway-config.yaml b/packaging/technical-addon/Splunk_TA_otel/configs/ta-gateway-config.yaml index b7c2158c42..d476ac1569 100644 --- a/packaging/technical-addon/Splunk_TA_otel/configs/ta-gateway-config.yaml +++ b/packaging/technical-addon/Splunk_TA_otel/configs/ta-gateway-config.yaml @@ -95,11 +95,12 @@ processors: exporters: # Traces - sapm: - access_token: "${env:SPLUNK_ACCESS_TOKEN}" - endpoint: "https://ingest.${env:SPLUNK_REALM}.signalfx.com/v2/trace" + otlphttp: + traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp" sending_queue: num_consumers: 32 + headers: + "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}" # Metrics + Events signalfx: access_token: "${env:SPLUNK_ACCESS_TOKEN}" @@ -130,7 +131,7 @@ service: - memory_limiter - batch #- resource/add_environment - exporters: [sapm] + exporters: [otlphttp] metrics: receivers: [otlp, signalfx] processors: [memory_limiter, batch] diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/mysql/ta-agent-config.yaml b/packaging/technical-addon/packaging-scripts/cicd-tests/mysql/ta-agent-config.yaml index 587f8b9df5..119c71bfd3 100644 --- a/packaging/technical-addon/packaging-scripts/cicd-tests/mysql/ta-agent-config.yaml +++ b/packaging/technical-addon/packaging-scripts/cicd-tests/mysql/ta-agent-config.yaml @@ -132,9 +132,10 @@ processors: exporters: # Traces - sapm: - access_token: "${env:SPLUNK_ACCESS_TOKEN}" - endpoint: "${env:SPLUNK_INGEST_URL}/v2/trace" + otlphttp: + traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp" + headers: + "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}" # Metrics + Events signalfx: access_token: "${env:SPLUNK_ACCESS_TOKEN}" @@ -159,7 +160,7 @@ service: - batch - resourcedetection #- resource/add_environment - exporters: [sapm, signalfx] + exporters: [otlphttp, signalfx] metrics: receivers: [hostmetrics, otlp, signalfx] processors: [memory_limiter, batch, resourcedetection] diff --git a/pkg/receiver/smartagentreceiver/README.md b/pkg/receiver/smartagentreceiver/README.md index cc42dc785c..e52c7b23db 100644 --- a/pkg/receiver/smartagentreceiver/README.md +++ b/pkg/receiver/smartagentreceiver/README.md @@ -72,7 +72,6 @@ exporters: access_token: "${SIGNALFX_ACCESS_TOKEN}" realm: us1 otlphttp: - metrics_endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/datapoint/otlp" traces_endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace/otlp" headers: "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"