Merge pull request #114 from scribd/laynax/SERF-1677/sentry1

[SERF-1677] Move sentry flush to the tracking package

Author: laynax

pkg/interceptors/recovery.go

@@ -2,11 +2,10 @@ package interceptors
 
 import (
 	"context"
+	"fmt"
 	stdlog "log"
 	"runtime/debug"
-	"time"
 
-	"github.com/getsentry/sentry-go"
 	grpcrecovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -31,17 +30,14 @@ func RecoveryStreamServerInterceptor() grpc.StreamServerInterceptor {
 
 var recoveryOption = []grpcrecovery.Option{
 	grpcrecovery.WithRecoveryHandlerContext(func(ctx context.Context, rec interface{}) (err error) {
-		sentry.CurrentHub().Recover(rec)
-		sentry.Flush(time.Second * 5)
-
 		l, err := sdkloggercontext.Extract(ctx)
 		if err != nil {
 			debug.PrintStack()
 			stdlog.Printf("logger not found in context: %v\n", err)
 			stdlog.Fatalf("grpc: panic error: %v", rec)
 		}
 
-		l.Fatalf("panic error: %v", rec)
+		l.WithError(fmt.Errorf("%v", rec)).Fatalf("panic error: %v", rec)
 		return status.Errorf(codes.Internal, "")
 	}),
 }

pkg/middleware/recovery.go

@@ -1,12 +1,10 @@
 package middleware
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"runtime/debug"
-	"time"
-
-	"github.com/getsentry/sentry-go"
 
 	sdkloggercontext "github.com/scribd/go-sdk/pkg/context/logger"
 )
@@ -27,17 +25,15 @@ func (rm RecoveryMiddleware) Handler(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if rec := recover(); rec != nil {
-				sentry.CurrentHub().Recover(rec)
-				sentry.Flush(time.Second * 5)
-
 				l, err := sdkloggercontext.Extract(r.Context())
 				if err != nil {
 					debug.PrintStack()
 					log.Printf("logger not found in context: %v\n", err)
 					log.Fatalf("http: panic serving URI %s: %v", r.URL.RequestURI(), rec)
 				}
 
-				l.Fatalf("http: panic serving URI %s: %v", r.URL.RequestURI(), rec)
+				l.WithError(fmt.Errorf("%v", rec)).
+					Fatalf("http: panic serving URI %s: %v", r.URL.RequestURI(), rec)
 			}
 		}()
 

pkg/pubsub/kafka/partitionconsumer.go

@@ -2,9 +2,7 @@ package kafka
 
 import (
 	"context"
-	"time"
 
-	"github.com/getsentry/sentry-go"
 	"github.com/twmb/franz-go/pkg/kgo"
 
 	sdkkafka "github.com/scribd/go-sdk/pkg/instrumentation/kafka"
@@ -20,14 +18,6 @@ type pconsumer struct {
 }
 
 func (pc *pconsumer) consume(cl *kgo.Client, logger sdklogger.Logger, shouldCommit bool, handler func(*kgo.Record)) {
-	defer func() {
-		if rec := recover(); rec != nil {
-			sentry.CurrentHub().Recover(rec)
-			sentry.Flush(time.Second * 5)
-			logger.Fatalf("kafka consumer: panic error: %v", rec)
-		}
-	}()
-
 	defer close(pc.done)
 
 	for {

pkg/tracking/sentry.go

@@ -2,6 +2,7 @@ package tracking
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/getsentry/sentry-go"
 	"github.com/sirupsen/logrus"
@@ -67,6 +68,10 @@ func (hook *Hook) Fire(entry *logrus.Entry) error {
 
 	sentry.CaptureEvent(event)
 
+	if entry.Level <= logrus.FatalLevel {
+		sentry.Flush(time.Second * 5)
+	}
+
 	return nil
 }