fix: Guard against a nil client when setting the SDK identifer (#715)

getsentry · Sep 13, 2023 · 1d05fa5 · 1d05fa5
1 parent 04ea85a
commit 1d05fa5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/echo/sentryecho.go b/echo/sentryecho.go
@@ -53,7 +53,9 @@ func (h *handler) handle(next echo.HandlerFunc) echo.HandlerFunc {
 			hub = sentry.CurrentHub().Clone()
 		}
 
-		hub.Client().SetSDKIdentifier(sdkIdentifier)
+		if client := hub.Client(); client != nil {
+			client.SetSDKIdentifier(sdkIdentifier)
+		}
 
 		hub.Scope().SetRequest(ctx.Request())
 		ctx.Set(valuesKey, hub)

diff --git a/fasthttp/sentryfasthttp.go b/fasthttp/sentryfasthttp.go
@@ -62,7 +62,9 @@ func (h *Handler) Handle(handler fasthttp.RequestHandler) fasthttp.RequestHandle
 		// context.Context but requires string keys.
 		hub := sentry.CurrentHub().Clone()
 
-		hub.Client().SetSDKIdentifier(sdkIdentifier)
+		if client := hub.Client(); client != nil {
+			client.SetSDKIdentifier(sdkIdentifier)
+		}
 
 		scope := hub.Scope()
 		scope.SetRequest(convert(ctx))

diff --git a/gin/sentrygin.go b/gin/sentrygin.go
@@ -58,7 +58,9 @@ func (h *handler) handle(c *gin.Context) {
 		ctx = sentry.SetHubOnContext(ctx, hub)
 	}
 
-	hub.Client().SetSDKIdentifier(sdkIdentifier)
+	if client := hub.Client(); client != nil {
+		client.SetSDKIdentifier(sdkIdentifier)
+	}
 
 	var transactionName string
 	var transactionSource sentry.TransactionSource

diff --git a/http/sentryhttp.go b/http/sentryhttp.go
@@ -90,7 +90,9 @@ func (h *Handler) handle(handler http.Handler) http.HandlerFunc {
 			ctx = sentry.SetHubOnContext(ctx, hub)
 		}
 
-		hub.Client().SetSDKIdentifier(sdkIdentifier)
+		if client := hub.Client(); client != nil {
+			client.SetSDKIdentifier(sdkIdentifier)
+		}
 
 		options := []sentry.SpanOption{
 			sentry.WithOpName("http.server"),

diff --git a/iris/sentryiris.go b/iris/sentryiris.go
@@ -55,7 +55,9 @@ func (h *handler) handle(ctx iris.Context) {
 		hub = sentry.CurrentHub().Clone()
 	}
 
-	hub.Client().SetSDKIdentifier(sdkIdentifier)
+	if client := hub.Client(); client != nil {
+		client.SetSDKIdentifier(sdkIdentifier)
+	}
 
 	hub.Scope().SetRequest(ctx.Request())
 	ctx.Values().Set(valuesKey, hub)

diff --git a/martini/sentrymartini.go b/martini/sentrymartini.go
@@ -50,7 +50,9 @@ func (h *handler) handle(rw http.ResponseWriter, r *http.Request, ctx martini.Co
 		hub = sentry.CurrentHub().Clone()
 	}
 
-	hub.Client().SetSDKIdentifier(sdkIdentifier)
+	if client := hub.Client(); client != nil {
+		client.SetSDKIdentifier(sdkIdentifier)
+	}
 
 	hub.Scope().SetRequest(r)
 	ctx.Map(hub)

diff --git a/negroni/sentrynegroni.go b/negroni/sentrynegroni.go
@@ -51,7 +51,9 @@ func (h *handler) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.H
 		hub = sentry.CurrentHub().Clone()
 	}
 
-	hub.Client().SetSDKIdentifier(sdkIdentifier)
+	if client := hub.Client(); client != nil {
+		client.SetSDKIdentifier(sdkIdentifier)
+	}
 
 	hub.Scope().SetRequest(r)
 	ctx = sentry.SetHubOnContext(