update trace endpoint for sapm

Author: asreehari-splunk

cmd/otelcol/config/collector/agent_config.yaml

@@ -129,7 +129,7 @@ exporters:
   # Traces
   sapm:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
-    endpoint: "${SPLUNK_TRACE_URL}"
+    endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
   # Metrics + Events
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"

cmd/otelcol/fips/config/agent_config.yaml

@@ -119,7 +119,7 @@ exporters:
   # Traces
   sapm:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
-    endpoint: "${SPLUNK_TRACE_URL}"
+    endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
   # Metrics + Events
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"

tests/general/default_config_test.go

@@ -65,15 +65,12 @@ func TestDefaultGatewayConfig(t *testing.T) {
 							"num_consumers": 32,
 						},
 					},
-					"otlp": map[string]any{
+					"otlphttp": map[string]any{
 						"headers": map[string]any{
 							"X-SF-Token": "<redacted>",
 						},
 						"metrics_endpoint": "https://ingest.not.real.signalfx.com/v2/datapoint/otlp",
 						"traces_endpoint":  "https://ingest.not.real.signalfx.com/v2/trace/otlp",
-						"sending_queue": map[string]any{
-							"num_consumers": 32,
-						},
 					},
 					"signalfx": map[string]any{
 						"access_token": "<redacted>",

tests/msi/msi_test.go

@@ -232,7 +232,7 @@ func assertServiceConfiguration(t *testing.T, msiProperties map[string]string) {
 		"SPLUNK_REALM":        installRealm,
 		"SPLUNK_API_URL":      optionalInstallPropertyOrDefault(msiProperties, "SPLUNK_API_URL", "https://api."+installRealm+".signalfx.com"),
 		"SPLUNK_INGEST_URL":   ingestURL,
-		"SPLUNK_TRACE_URL":    ingestURL + "/v2/trace",
+		"SPLUNK_TRACE_URL":    ingestURL + "/v2/trace/otlp",
 		"SPLUNK_HEC_URL":      ingestURL + "/v1/log",
 		"SPLUNK_HEC_TOKEN":    optionalInstallPropertyOrDefault(msiProperties, "SPLUNK_HEC_TOKEN", msiProperties["SPLUNK_ACCESS_TOKEN"]),
 		"SPLUNK_BUNDLE_DIR":   filepath.Join(programFilesDir, "Splunk", "OpenTelemetry Collector", "agent-bundle"),

tests/zeroconfig/windows/testdata/Dockerfile.iis.server

@@ -24,7 +24,7 @@ ENV ACCESS_TOKEN_TMP=$access_token
 RUN `
     $token = $Env:ACCESS_TOKEN_TMP; `
     $collector_msi_path = (dir "c:\setup\splunk-otel-collector-*.msi").FullName; `
-    c:\setup\install.ps1 -access_token $token -msi_path $collector_msi_path -with_dotnet_instrumentation $true -deployment_env zc-iis-test -ingest_url "http://splunk-otel-collector:9943" -trace_url "http://splunk-otel-collector:7276/v2/trace" -network_interface "0.0.0.0"
+    c:\setup\install.ps1 -access_token $token -msi_path $collector_msi_path -with_dotnet_instrumentation $true -deployment_env zc-iis-test -ingest_url "http://splunk-otel-collector:9943" -trace_url "http://splunk-otel-collector:7276/v2/trace/otlp" -network_interface "0.0.0.0"
 ENV ACCESS_TOKEN_TMP=
 
 COPY apps/bin/aspnetfxapp/_PublishedWebsites/AspNet.WebApi.NetFramework/ /apps/aspnetfx