Skip to content

Update Service Events env var Config #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jj22ee wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −24
Open

Update Service Events env var Config #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ func setLangEnvVarsForServiceEvents(langStr string, cfg map[string]string) {
if functionInstrumentEnabled, ok := cfg["function_instrument_enabled"]; ok && functionInstrumentEnabled != "" {
_ = os.Setenv("AUTO_INSTRUMENTATION_"+langStr+"_SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED", functionInstrumentEnabled)
}
if profilerEnabled, ok := cfg["profiler_enabled"]; ok && profilerEnabled != "" {
_ = os.Setenv("AUTO_INSTRUMENTATION_"+langStr+"_SERVICE_EVENTS_PROFILER_ENABLED", profilerEnabled)
}
}

func setLangEnvVarsForDynamicInstrumentation(langStr string, cfg map[string]string) {
Expand Down
12 changes: 1 addition & 11 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ func Test_setLangEnvVars_serviceEvents(t *testing.T) {
const (
enabledVar = "AUTO_INSTRUMENTATION_JAVA_SERVICE_EVENTS_ENABLED"
functionVar = "AUTO_INSTRUMENTATION_JAVA_SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED"
profilerVar = "AUTO_INSTRUMENTATION_JAVA_SERVICE_EVENTS_PROFILER_ENABLED"
dynamicVar = "AUTO_INSTRUMENTATION_JAVA_DYNAMIC_INSTRUMENTATION_ENABLED"
)
tests := []struct {
Expand All @@ -25,7 +24,6 @@ func Test_setLangEnvVars_serviceEvents(t *testing.T) {
dynamicInst map[string]string
wantEnabled *string // nil = expect unset
wantFunction *string
wantProfiler *string
wantDynamic *string
}{
{
Expand All @@ -41,11 +39,6 @@ func Test_setLangEnvVars_serviceEvents(t *testing.T) {
serviceEvent: map[string]string{"enabled": "false"},
wantEnabled: ptr("false"),
},
{
name: "profiler_enabled=false is forwarded",
serviceEvent: map[string]string{"profiler_enabled": "false"},
wantProfiler: ptr("false"),
},
{
name: "dynamic_instrumentation enabled=true is forwarded",
dynamicInst: map[string]string{"enabled": "true"},
Expand All @@ -60,16 +53,14 @@ func Test_setLangEnvVars_serviceEvents(t *testing.T) {
serviceEvent: map[string]string{
"enabled": "true",
"function_instrument_enabled": "true",
"profiler_enabled": "false",
},
dynamicInst: map[string]string{"enabled": "true"},
wantEnabled: ptr("true"),
wantFunction: ptr("true"),
wantProfiler: ptr("false"),
wantDynamic: ptr("true"),
},
}
envVars := []string{enabledVar, functionVar, profilerVar, dynamicVar}
envVars := []string{enabledVar, functionVar, dynamicVar}
unsetAll := func() {
for _, v := range envVars {
_ = os.Unsetenv(v)
Expand All @@ -87,7 +78,6 @@ func Test_setLangEnvVars_serviceEvents(t *testing.T) {

assertEnv(t, enabledVar, tt.wantEnabled)
assertEnv(t, functionVar, tt.wantFunction)
assertEnv(t, profilerVar, tt.wantProfiler)
assertEnv(t, dynamicVar, tt.wantDynamic)
})
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/instrumentation/defaultinstrumentation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ func getServiceEventsEnvs(langStr string) []corev1.EnvVar {
if functionInstrumentEnabled, ok := os.LookupEnv("AUTO_INSTRUMENTATION_" + langStr + "_SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED"); ok {
envs = append(envs, corev1.EnvVar{Name: "OTEL_AWS_SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED", Value: functionInstrumentEnabled})
}
if profilerEnabled, ok := os.LookupEnv("AUTO_INSTRUMENTATION_" + langStr + "_SERVICE_EVENTS_PROFILER_ENABLED"); ok {
envs = append(envs, corev1.EnvVar{Name: "OTEL_AWS_SERVICE_EVENTS_PROFILER_ENABLED", Value: profilerEnabled})
}
return envs
}

Expand Down
7 changes: 0 additions & 7 deletions pkg/instrumentation/defaultinstrumentation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,11 +971,6 @@ func Test_getServiceEventsEnvs(t *testing.T) {
env: map[string]string{"SERVICE_EVENTS_ENABLED": "false"},
want: []corev1.EnvVar{{Name: "OTEL_AWS_SERVICE_EVENTS_ENABLED", Value: "false"}},
},
{
name: "profiler_enabled=false emitted on its own",
env: map[string]string{"SERVICE_EVENTS_PROFILER_ENABLED": "false"},
want: []corev1.EnvVar{{Name: "OTEL_AWS_SERVICE_EVENTS_PROFILER_ENABLED", Value: "false"}},
},
{
name: "function_instrument_enabled=true emitted on its own",
env: map[string]string{"SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED": "true"},
Expand All @@ -985,13 +980,11 @@ func Test_getServiceEventsEnvs(t *testing.T) {
name: "all toggles emitted when set",
env: map[string]string{
"SERVICE_EVENTS_ENABLED": "true",
"SERVICE_EVENTS_PROFILER_ENABLED": "true",
"SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED": "false",
},
want: []corev1.EnvVar{
{Name: "OTEL_AWS_SERVICE_EVENTS_ENABLED", Value: "true"},
{Name: "OTEL_AWS_SERVICE_EVENTS_FUNCTION_INSTRUMENT_ENABLED", Value: "false"},
{Name: "OTEL_AWS_SERVICE_EVENTS_PROFILER_ENABLED", Value: "true"},
},
},
}
Expand Down
Loading