use sentry WithScope and CaptureMessage instead of logger

Author: briskt

cdk/cdk.go

@@ -48,6 +48,7 @@ func NewCdkStack(scope constructs.Construct, id string, props *CdkStackProps) aw
 			"TOTP_TABLE":     jsii.String(totpTable),
 			"WEBAUTHN_TABLE": jsii.String(webauthnTable),
 			"AWS_ENDPOINT":   jsii.String(""),
+			"ENVIRONMENT":    jsii.String(env),
 			"SENTRY_DSN":     jsii.String(os.Getenv("SENTRY_DSN")),
 		},
 		FunctionName:  &functionName,

cdk/env.json

@@ -1,6 +1,8 @@
 {
   "Parameters": {
     "AWS_ENDPOINT": "http://172.17.0.1:8000",
+    "SENTRY_DSN": "",
+    "ENVIRONMENT": "local",
     "API_KEY_TABLE": "ApiKey",
     "TOTP_TABLE": "Totp",
     "WEBAUTHN_TABLE": "WebAuthn"

config.go

@@ -23,7 +23,8 @@ type EnvConfig struct {
 
 	AWSConfig aws.Config `json:"-"`
 
-	SentryDSN string `split_words:"true"`
+	Environment string
+	SentryDSN   string `split_words:"true"`
 }
 
 func (e *EnvConfig) InitAWS() {

lambda/main.go

@@ -61,9 +61,11 @@ func handler(ctx context.Context, req events.APIGatewayProxyRequest) (events.API
 	}
 
 	if w.Status == http.StatusInternalServerError && envConfig.SentryDSN != "" {
-		logger := sentry.NewLogger(ctx)
-		logger.Error().Emit(string(w.Body))
-		defer sentry.Flush(2 * time.Second)
+		sentry.WithScope(func(scope *sentry.Scope) {
+			scope.SetLevel(sentry.LevelError)
+			sentry.CaptureMessage(string(w.Body))
+		})
+		sentry.Flush(2 * time.Second)
 	}
 
 	return events.APIGatewayProxyResponse{
@@ -99,8 +101,9 @@ func sentryInit() {
 	}
 
 	if err := sentry.Init(sentry.ClientOptions{
-		Dsn:        envConfig.SentryDSN,
-		EnableLogs: true,
+		Dsn:         envConfig.SentryDSN,
+		EnableLogs:  true,
+		Environment: envConfig.Environment,
 	}); err != nil {
 		log.Printf("Sentry initialization failed: %v\n", err)
 	}