Do not show error messages even if neither DD_API_KEY nor DD_KMS_API_KEY is set when Lambda Extension is running (#102)

Author: skatsuta

ddlambda.go

@@ -214,16 +214,17 @@ func initializeListeners(cfg *Config) []wrapper.HandlerListener {
 		logger.SetLogLevel(logger.LevelDebug)
 	}
 	extensionManager := extension.BuildExtensionManager()
+	isExtensionRunning := extensionManager.IsExtensionRunning()
 
 	// Wrap the handler with listeners that add instrumentation for traces and metrics.
 	tl := trace.MakeListener(cfg.toTraceConfig(), extensionManager)
-	ml := metrics.MakeListener(cfg.toMetricsConfig(), extensionManager)
+	ml := metrics.MakeListener(cfg.toMetricsConfig(isExtensionRunning), extensionManager)
 	return []wrapper.HandlerListener{
 		&tl, &ml,
 	}
 }
 
-func (cfg *Config) toMetricsConfig() metrics.Config {
+func (cfg *Config) toMetricsConfig(isExtensionRunning bool) metrics.Config {
 
 	mc := metrics.Config{
 		ShouldRetryOnFailure: false,
@@ -263,8 +264,10 @@ func (cfg *Config) toMetricsConfig() metrics.Config {
 	if mc.KMSAPIKey == "" {
 		mc.KMSAPIKey = os.Getenv(DatadogKMSAPIKeyEnvVar)
 	}
-	if mc.APIKey == "" && mc.KMSAPIKey == "" && !mc.ShouldUseLogForwarder {
-		logger.Error(fmt.Errorf("couldn't read DD_API_KEY or DD_KMS_API_KEY from environment"))
+	if !isExtensionRunning && mc.APIKey == "" && mc.KMSAPIKey == "" && !mc.ShouldUseLogForwarder {
+		logger.Error(fmt.Errorf(
+			"couldn't read %s or %s from environment", DatadogAPIKeyEnvVar, DatadogKMSAPIKeyEnvVar,
+		))
 	}
 
 	enhancedMetrics := os.Getenv("DD_ENHANCED_METRICS")

internal/metrics/listener.go

@@ -106,9 +106,14 @@ func MakeListener(config Config, extensionManager *extension.ExtensionManager) L
 	}
 }
 
+// canSendMetrics reports whether l can send metrics.
+func (l *Listener) canSendMetrics() bool {
+	return l.isAgentRunning || l.apiClient.apiKey != "" || l.config.KMSAPIKey != "" || l.config.ShouldUseLogForwarder
+}
+
 // HandlerStarted adds metrics service to the context
 func (l *Listener) HandlerStarted(ctx context.Context, msg json.RawMessage) context.Context {
-	if l.apiClient.apiKey == "" && l.config.KMSAPIKey == "" && !l.config.ShouldUseLogForwarder {
+	if !l.canSendMetrics() {
 		logger.Error(fmt.Errorf("datadog api key isn't set, won't be able to send metrics"))
 	}