disable extension if env vars are false

chaudharysaket · Sep 5, 2024 · 12a793a · 12a793a
1 parent 8a15ffa
commit 12a793a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/config/config.go b/config/config.go
@@ -38,9 +38,9 @@ type Configuration struct {
 }
 
 func ConfigurationFromEnvironment() *Configuration {
-	enabledStr, extensionEnabledOverride := os.LookupEnv("NEW_RELIC_LAMBDA_EXTENSION_ENABLED")
 	nrEnabledStr, nrEnabledOverride := os.LookupEnv("NEW_RELIC_ENABLED")
 	nrEnabledRubyStr, nrEnabledRubyOverride := os.LookupEnv("NEW_RELIC_AGENT_ENABLED")
+	enabledStr, extensionEnabledOverride := os.LookupEnv("NEW_RELIC_LAMBDA_EXTENSION_ENABLED")
 	licenseKey, lkOverride := os.LookupEnv("NEW_RELIC_LICENSE_KEY")
 	licenseKeySecretId, lkSecretOverride := os.LookupEnv("NEW_RELIC_LICENSE_KEY_SECRET")
 	licenseKeySSMParameterName, lkSSMParameterOverride := os.LookupEnv("NEW_RELIC_LICENSE_KEY_SSM_PARAMETER_NAME")
@@ -57,6 +57,12 @@ func ConfigurationFromEnvironment() *Configuration {
 	collectTraceIDStr, collectTraceIDOverride := os.LookupEnv("NEW_RELIC_COLLECT_TRACE_ID")
 
 	extensionEnabled := true
+	if nrEnabledOverride && strings.ToLower(nrEnabledStr) == "false" {
+		extensionEnabled = false
+	}
+	if nrEnabledRubyOverride && strings.ToLower(nrEnabledRubyStr) == "false" {
+		extensionEnabled = false
+	}
 	if extensionEnabledOverride && strings.ToLower(enabledStr) == "false" {
 		extensionEnabled = false
 	}