feat: enable universal instrumentation by default (#151)

* enable universal instrumentation by default also enabled tracing * update unit tests to use `t.Setenv`
DataDog · Dec 8, 2023 · 5dd4520 · 5dd4520
1 parent c4bb486
commit 5dd4520
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/ddlambda.go b/ddlambda.go
@@ -202,9 +202,9 @@ func InvokeDryRun(callback func(ctx context.Context), cfg *Config) (interface{},
 
 func (cfg *Config) toTraceConfig() trace.Config {
 	traceConfig := trace.Config{
-		DDTraceEnabled:           false,
+		DDTraceEnabled:           true,
 		MergeXrayTraces:          false,
-		UniversalInstrumentation: false,
+		UniversalInstrumentation: true,
 	}
 
 	if cfg != nil {
@@ -217,16 +217,16 @@ func (cfg *Config) toTraceConfig() trace.Config {
 		traceConfig.TraceContextExtractor = trace.DefaultTraceExtractor
 	}
 
-	if !traceConfig.DDTraceEnabled {
-		traceConfig.DDTraceEnabled, _ = strconv.ParseBool(os.Getenv(DatadogTraceEnabledEnvVar))
+	if tracingEnabled, err := strconv.ParseBool(os.Getenv(DatadogTraceEnabledEnvVar)); err == nil {
+		traceConfig.DDTraceEnabled = tracingEnabled;
 	}
 
 	if !traceConfig.MergeXrayTraces {
 		traceConfig.MergeXrayTraces, _ = strconv.ParseBool(os.Getenv(MergeXrayTracesEnvVar))
 	}
 
-	if !traceConfig.UniversalInstrumentation {
-		traceConfig.UniversalInstrumentation, _ = strconv.ParseBool(os.Getenv(UniversalInstrumentation))
+	if universalInstrumentation, err := strconv.ParseBool(os.Getenv(UniversalInstrumentation)); err == nil {
+		traceConfig.UniversalInstrumentation = universalInstrumentation
 	}
 
 	return traceConfig

diff --git a/ddlambda_test.go b/ddlambda_test.go
@@ -17,6 +17,9 @@ import (
 )
 
 func TestInvokeDryRun(t *testing.T) {
+	t.Setenv(UniversalInstrumentation, "false")
+	t.Setenv(DatadogTraceEnabledEnvVar, "false")
+
 	called := false
 	_, err := InvokeDryRun(func(ctx context.Context) {
 		called = true