handle sentry.Request properly in sentrylogrus

getsentry · Jan 25, 2025 · c67c464 · c67c464
1 parent f2d4348
commit c67c464
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/logrus/logrusentry.go b/logrus/logrusentry.go
@@ -172,6 +172,18 @@ func (h *Hook) entryToEvent(l *logrus.Entry) *sentry.Event {
 	}
 
 	key := h.key(FieldRequest)
+	switch request := s.Extra[key].(type) {
+	case *http.Request:
+		delete(s.Extra, key)
+		s.Request = sentry.NewRequest(request)
+	case sentry.Request:
+		delete(s.Extra, key)
+		s.Request = &request
+	case *sentry.Request:
+		delete(s.Extra, key)
+		s.Request = request
+	}
+
 	if req, ok := s.Extra[key].(*http.Request); ok {
 		delete(s.Extra, key)
 		s.Request = sentry.NewRequest(req)

diff --git a/logrus/logrusentry_test.go b/logrus/logrusentry_test.go
@@ -166,6 +166,44 @@ func Test_entryToEvent(t *testing.T) {
 				Logger: "logrus",
 			},
 		},
+		"sentry request": {
+			entry: &logrus.Entry{
+				Data: map[string]any{
+					FieldRequest: sentry.Request{
+						URL:    "http://example.com/",
+						Method: http.MethodGet,
+					},
+				},
+			},
+			want: &sentry.Event{
+				Level: "fatal",
+				Extra: map[string]any{},
+				Request: &sentry.Request{
+					URL:    "http://example.com/",
+					Method: http.MethodGet,
+				},
+				Logger: "logrus",
+			},
+		},
+		"sentry pointer to request": {
+			entry: &logrus.Entry{
+				Data: map[string]any{
+					FieldRequest: &sentry.Request{
+						URL:    "http://example.com/",
+						Method: http.MethodGet,
+					},
+				},
+			},
+			want: &sentry.Event{
+				Level: "fatal",
+				Extra: map[string]any{},
+				Request: &sentry.Request{
+					URL:    "http://example.com/",
+					Method: http.MethodGet,
+				},
+				Logger: "logrus",
+			},
+		},
 		"error": {
 			entry: &logrus.Entry{
 				Data: map[string]any{