Skip to content

Commit a2752df

Browse files
Andreagit97Andreagit97
committed
remove STS_STS_URL
We should always use `STS_PROCESS_AGENT_URL` Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>
1 parent 6ae68b3 commit a2752df

2 files changed

Lines changed: 0 additions & 128 deletions

File tree

‎config/config.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -428,16 +428,6 @@ func mergeEnvironmentVariables(c *AgentConfig) *AgentConfig {
428428
log.Infof("Using 'process_dd_url' (%s) and ignoring 'site' (%s)", v, site)
429429
}
430430
log.Infof("Overriding process api endpoint with environment variable `STS_PROCESS_AGENT_URL`: %s", u)
431-
} else if v := os.Getenv("STS_STS_URL"); v != "" {
432-
// check if we don't already have a api endpoint configured, specific process configuration takes precedence.
433-
u, err := url.Parse(v)
434-
if err != nil {
435-
log.Warnf("STS_STS_URL is invalid: %s", err)
436-
} else {
437-
log.Infof("overriding API endpoint from env STS_STS_URL")
438-
c.APIEndpoints[0].Endpoint = u
439-
}
440-
log.Infof("Overriding process api endpoint with environment variable `STS_STS_URL`: %s", u)
441431
}
442432

443433
// Process Arguments Scrubbing

‎config/config_test.go‎

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -733,131 +733,13 @@ func TestStackStateFallbackAgentConfigToSTSUrl(t *testing.T) {
733733
assert.Equal("default-endpoint.test.stackstate.com", ep.Endpoint.Hostname())
734734
}
735735

736-
func TestStackStateFallbackAgentConfigToEnvSTSUrl(t *testing.T) {
737-
assert := assert.New(t)
738-
os.Unsetenv("STS_PROCESS_AGENT_URL")
739-
os.Unsetenv("STS_STS_URL")
740-
os.Setenv("STS_STS_URL", "http://default-endpoint.test.stackstate.com")
741-
var ddy YamlAgentConfig
742-
err := yaml.Unmarshal([]byte(strings.Join([]string{
743-
"api_key: apikey_30",
744-
"process_config:",
745-
" enabled: 'true'",
746-
" queue_size: 10",
747-
" intervals:",
748-
" container: 8",
749-
" process: 30",
750-
"network_tracer_config:",
751-
" network_tracing_enabled: 'true'",
752-
" initial_connections_from_proc: 'true'",
753-
}, "\n")), &ddy)
754-
assert.NoError(err)
755-
756-
agentConfig, err := NewAgentConfig(&ddy)
757-
assert.NoError(err)
758-
759-
ep := agentConfig.APIEndpoints[0]
760-
assert.Equal("apikey_30", ep.APIKey)
761-
assert.Equal("default-endpoint.test.stackstate.com", ep.Endpoint.Hostname())
762-
}
763-
764-
func TestStackStateFallbackAgentConfigEmptyUrlToEnvSTSUrl(t *testing.T) {
765-
assert := assert.New(t)
766-
os.Unsetenv("STS_PROCESS_AGENT_URL")
767-
os.Unsetenv("STS_STS_URL")
768-
os.Setenv("STS_STS_URL", "http://default-endpoint.test.stackstate.com")
769-
var ddy YamlAgentConfig
770-
err := yaml.Unmarshal([]byte(strings.Join([]string{
771-
"api_key: apikey_30",
772-
"process_config:",
773-
" enabled: 'true'",
774-
" queue_size: 10",
775-
" intervals:",
776-
" container: 8",
777-
" process: 30",
778-
"network_tracer_config:",
779-
" network_tracing_enabled: 'true'",
780-
" initial_connections_from_proc: 'true'",
781-
}, "\n")), &ddy)
782-
assert.NoError(err)
783-
784-
agentConfig, err := NewAgentConfig(&ddy)
785-
assert.NoError(err)
786-
787-
ep := agentConfig.APIEndpoints[0]
788-
assert.Equal("apikey_30", ep.APIKey)
789-
assert.Equal("default-endpoint.test.stackstate.com", ep.Endpoint.Hostname())
790-
}
791-
792-
// case 5: STS_URL as env PROCESS_AGENT_URL as env
793736
func TestStackStatePreferAgentConfigToEnvPROCESS_AGENT_URL(t *testing.T) {
794737
assert := assert.New(t)
795738
os.Unsetenv("STS_PROCESS_AGENT_URL")
796-
os.Unsetenv("STS_STS_URL")
797-
os.Setenv("STS_STS_URL", "http://default-endpoint.test.stackstate.com")
798-
os.Setenv("STS_PROCESS_AGENT_URL", "http://process-endpoint.test.stackstate.com")
799-
var ddy YamlAgentConfig
800-
err := yaml.Unmarshal([]byte(strings.Join([]string{
801-
"api_key: apikey_30",
802-
"process_config:",
803-
" enabled: 'true'",
804-
" queue_size: 10",
805-
" intervals:",
806-
" container: 8",
807-
" process: 30",
808-
"network_tracer_config:",
809-
" network_tracing_enabled: 'true'",
810-
" initial_connections_from_proc: 'true'",
811-
}, "\n")), &ddy)
812-
assert.NoError(err)
813-
814-
agentConfig, err := NewAgentConfig(&ddy)
815-
assert.NoError(err)
816-
817-
ep := agentConfig.APIEndpoints[0]
818-
assert.Equal("apikey_30", ep.APIKey)
819-
assert.Equal("process-endpoint.test.stackstate.com", ep.Endpoint.Hostname())
820-
}
821-
822-
// case 7: STS_URL as env PROCESS_AGENT_URL as yaml - STS URL wins, more specific
823-
func TestStackStatePreferSTS_STS_URLOverYamlProcessAgentConfig(t *testing.T) {
824-
assert := assert.New(t)
825-
os.Unsetenv("STS_PROCESS_AGENT_URL")
826-
os.Unsetenv("STS_STS_URL")
827-
os.Setenv("STS_STS_URL", "http://default-endpoint.test.stackstate.com")
828-
var ddy YamlAgentConfig
829-
err := yaml.Unmarshal([]byte(strings.Join([]string{
830-
"api_key: apikey_30",
831-
"process_config:",
832-
" enabled: 'true'",
833-
" queue_size: 10",
834-
" intervals:",
835-
" container: 8",
836-
" process: 30",
837-
"network_tracer_config:",
838-
" network_tracing_enabled: 'true'",
839-
" initial_connections_from_proc: 'true'",
840-
}, "\n")), &ddy)
841-
assert.NoError(err)
842-
843-
agentConfig, err := NewAgentConfig(&ddy)
844-
assert.NoError(err)
845-
846-
ep := agentConfig.APIEndpoints[0]
847-
assert.Equal("apikey_30", ep.APIKey)
848-
assert.Equal("default-endpoint.test.stackstate.com", ep.Endpoint.Hostname())
849-
}
850-
851-
// case 8: STS_URL as yaml, PROCESS_AGENT_URL as env - ENV wins
852-
func TestStackStatePreferPROCESS_AGENT_URLOverYamlsts_sts_url(t *testing.T) {
853-
assert := assert.New(t)
854-
os.Unsetenv("STS_PROCESS_AGENT_URL")
855-
os.Unsetenv("STS_STS_URL")
856739
os.Setenv("STS_PROCESS_AGENT_URL", "http://process-endpoint.test.stackstate.com")
857740
var ddy YamlAgentConfig
858741
err := yaml.Unmarshal([]byte(strings.Join([]string{
859742
"api_key: apikey_30",
860-
"sts_url: http://default-endpoint.test.stackstate.com",
861743
"process_config:",
862744
" enabled: 'true'",
863745
" queue_size: 10",

0 commit comments

Comments
 (0)