Fix race conditions on log when accessing scope (#1050)

Author: giortzisg

log.go

@@ -6,6 +6,7 @@ import (
 	"maps"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/getsentry/sentry-go/attribute"
@@ -43,6 +44,7 @@ type sentryLogger struct {
 	ctx        context.Context
 	client     *Client
 	attributes map[string]Attribute
+	mu         sync.RWMutex
 }
 
 type logEntry struct {
@@ -64,7 +66,12 @@ func NewLogger(ctx context.Context) Logger {
 
 	client := hub.Client()
 	if client != nil && client.batchLogger != nil {
-		return &sentryLogger{ctx, client, make(map[string]Attribute)}
+		return &sentryLogger{
+			ctx:        ctx,
+			client:     client,
+			attributes: make(map[string]Attribute),
+			mu:         sync.RWMutex{},
+		}
 	}
 
 	DebugLogger.Println("fallback to noopLogger: enableLogs disabled")
@@ -89,13 +96,21 @@ func (l *sentryLogger) log(ctx context.Context, level LogLevel, severity int, me
 
 	var traceID TraceID
 	var spanID SpanID
+	var span *Span
+	var user User
 
-	span := hub.Scope().span
-	if span != nil {
-		traceID = span.TraceID
-		spanID = span.SpanID
-	} else {
-		traceID = hub.Scope().propagationContext.TraceID
+	scope := hub.Scope()
+	if scope != nil {
+		scope.mu.Lock()
+		span = scope.span
+		if span != nil {
+			traceID = span.TraceID
+			spanID = span.SpanID
+		} else {
+			traceID = scope.propagationContext.TraceID
+		}
+		user = scope.user
+		scope.mu.Unlock()
 	}
 
 	attrs := map[string]Attribute{}
@@ -110,9 +125,12 @@ func (l *sentryLogger) log(ctx context.Context, level LogLevel, severity int, me
 		}
 	}
 
+	l.mu.RLock()
 	for k, v := range l.attributes {
 		attrs[k] = v
 	}
+	l.mu.RUnlock()
+
 	for k, v := range entryAttrs {
 		attrs[k] = v
 	}
@@ -129,19 +147,16 @@ func (l *sentryLogger) log(ctx context.Context, level LogLevel, severity int, me
 	} else if serverAddr, err := os.Hostname(); err == nil {
 		attrs["sentry.server.address"] = Attribute{Value: serverAddr, Type: AttributeString}
 	}
-	scope := hub.Scope()
-	if scope != nil {
-		user := scope.user
-		if !user.IsEmpty() {
-			if user.ID != "" {
-				attrs["user.id"] = Attribute{Value: user.ID, Type: AttributeString}
-			}
-			if user.Name != "" {
-				attrs["user.name"] = Attribute{Value: user.Name, Type: AttributeString}
-			}
-			if user.Email != "" {
-				attrs["user.email"] = Attribute{Value: user.Email, Type: AttributeString}
-			}
+
+	if !user.IsEmpty() {
+		if user.ID != "" {
+			attrs["user.id"] = Attribute{Value: user.ID, Type: AttributeString}
+		}
+		if user.Name != "" {
+			attrs["user.name"] = Attribute{Value: user.Name, Type: AttributeString}
+		}
+		if user.Email != "" {
+			attrs["user.email"] = Attribute{Value: user.Email, Type: AttributeString}
 		}
 	}
 	if span != nil {
@@ -177,6 +192,9 @@ func (l *sentryLogger) log(ctx context.Context, level LogLevel, severity int, me
 }
 
 func (l *sentryLogger) SetAttributes(attrs ...attribute.Builder) {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
 	for _, v := range attrs {
 		t, ok := mapTypesToStr[v.Value.Type()]
 		if !ok || t == "" {