Merge pull request #17 from DirectDuck/update_sentry

Update sentry hub usage

Author: sas1024

sentry.go

@@ -13,12 +13,6 @@ import (
 	"github.com/vmkteam/zenrpc/v2"
 )
 
-// NewSentryHubContext creates new context with Sentry Hub.
-// Deprecated: use appkit.NewSentryHubContext.
-func NewSentryHubContext(ctx context.Context, sentryHub *sentry.Hub) context.Context {
-	return appkit.NewSentryHubContext(ctx, sentryHub)
-}
-
 // WithSentry sets additional parameters for current Sentry scope. Extras: params, duration, ip. Tags: platform,
 // version, method. It's also handles panic.
 func WithSentry(serverName string) zenrpc.MiddlewareFunc {
@@ -36,7 +30,7 @@ func WithSentry(serverName string) zenrpc.MiddlewareFunc {
 					}
 				}
 
-				if hub, ok := appkit.SentryHubFromContext(ctx); ok {
+				if hub := sentry.GetHubFromContext(ctx); hub != nil {
 					start, platform, version, ip, xRequestID := time.Now(), appkit.PlatformFromContext(ctx), appkit.VersionFromContext(ctx), appkit.IPFromContext(ctx), appkit.XRequestIDFromContext(ctx)
 
 					methodName := fullMethodName(serverName, zenrpc.NamespaceFromContext(ctx), method)
@@ -80,22 +74,29 @@ func WithErrorLogger(pf Printf, serverName string) zenrpc.MiddlewareFunc {
 
 				pf("ip=%s platform=%q version=%q method=%s duration=%v params=%s xRequestId=%q err=%q", ip, platform, version, methodName, duration, params, xRequestID, r.Error)
 
-				sentry.WithScope(func(scope *sentry.Scope) {
-					scope.SetExtras(map[string]interface{}{
-						"params":     params,
-						"duration":   duration.String(),
-						"ip":         ip,
-						"error.data": r.Error.Data,
-						"error.code": r.Error.Code,
-					})
-					scope.SetTags(map[string]string{
-						"platform":   platform,
-						"version":    version,
-						"method":     methodName,
-						"xRequestId": xRequestID,
-					})
-					sentry.CaptureException(r.Error)
+				// initialize hub and scope
+				currentHub, scope := sentry.CurrentHub(), sentry.NewScope()
+
+				// set hub and scope from context, if present
+				if hub := sentry.GetHubFromContext(ctx); hub != nil {
+					scope = hub.Scope()
+					currentHub = hub
+				}
+
+				scope.SetExtras(map[string]interface{}{
+					"params":     params,
+					"duration":   duration.String(),
+					"ip":         ip,
+					"error.data": r.Error.Data,
+					"error.code": r.Error.Code,
 				})
+				scope.SetTags(map[string]string{
+					"platform":   platform,
+					"version":    version,
+					"method":     methodName,
+					"xRequestId": xRequestID,
+				})
+				currentHub.CaptureException(r.Error)
 
 				// remove sensitive error data from response
 				r.Error.Err = nil
@@ -145,22 +146,29 @@ func WithErrorSLog(pf Print, serverName string, fn LogAttrs) zenrpc.MiddlewareFu
 
 				pf(ctx, "rpc error", append(logArgs, args...)...)
 
-				sentry.WithScope(func(scope *sentry.Scope) {
-					scope.SetExtras(map[string]interface{}{
-						"params":     params,
-						"duration":   duration.String(),
-						"ip":         ip,
-						"error.data": r.Error.Data,
-						"error.code": r.Error.Code,
-					})
-					scope.SetTags(map[string]string{
-						"platform":   platform,
-						"version":    version,
-						"method":     methodName,
-						"xRequestId": xRequestID,
-					})
-					sentry.CaptureException(r.Error)
+				// initialize hub and scope
+				currentHub, scope := sentry.CurrentHub(), sentry.NewScope()
+
+				// set hub and scope from context, if present
+				if hub := sentry.GetHubFromContext(ctx); hub != nil {
+					scope = hub.Scope()
+					currentHub = hub
+				}
+
+				scope.SetExtras(map[string]interface{}{
+					"params":     params,
+					"duration":   duration.String(),
+					"ip":         ip,
+					"error.data": r.Error.Data,
+					"error.code": r.Error.Code,
+				})
+				scope.SetTags(map[string]string{
+					"platform":   platform,
+					"version":    version,
+					"method":     methodName,
+					"xRequestId": xRequestID,
 				})
+				currentHub.CaptureException(r.Error)
 
 				// remove sensitive error data from response
 				r.Error.Err = nil