diff --git a/deployments/chef/test/integration/default/test.rb b/deployments/chef/test/integration/default/test.rb index 5395f91b4c..d6ef753b94 100644 --- a/deployments/chef/test/integration/default/test.rb +++ b/deployments/chef/test/integration/default/test.rb @@ -27,6 +27,7 @@ { name: 'SPLUNK_MEMORY_TOTAL_MIB', type: :string, data: splunk_memory_total }, { name: 'SPLUNK_REALM', type: :string, data: splunk_realm }, { name: 'SPLUNK_TRACE_URL', type: :string, data: "#{splunk_ingest_url}/v2/trace" }, + ] collector_env_vars_strings = [] diff --git a/internal/settings/settings.go b/internal/settings/settings.go index f5f8100b72..b3833c0d18 100644 --- a/internal/settings/settings.go +++ b/internal/settings/settings.go @@ -385,15 +385,9 @@ func setDefaultEnvVars(s *Settings) error { if realm, ok := os.LookupEnv(RealmEnvVar); ok { defaultEnvVars[APIURLEnvVar] = fmt.Sprintf("https://api.%s.signalfx.com", realm) defaultEnvVars[IngestURLEnvVar] = fmt.Sprintf("https://ingest.%s.signalfx.com", realm) - defaultEnvVars[TraceIngestURLEnvVar] = fmt.Sprintf("https://ingest.%s.signalfx.com/v2/trace", realm) defaultEnvVars[HecLogIngestURLEnvVar] = fmt.Sprintf("https://ingest.%s.signalfx.com/v1/log", realm) } - if ingestURL, ok := os.LookupEnv(IngestURLEnvVar); ok { - ingestURL = strings.TrimSuffix(ingestURL, "/") - defaultEnvVars[TraceIngestURLEnvVar] = fmt.Sprintf("%s/v2/trace", ingestURL) - } - if token, ok := os.LookupEnv(TokenEnvVar); ok { defaultEnvVars[HecTokenEnvVar] = token }