ref: Improve isSentryRequestUrl (#636)

getsentry · May 8, 2023 · ce90464 · ce90464
1 parent 94e8e06
commit ce90464
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/otel/internal/utils/sentryrequest.go b/otel/internal/utils/sentryrequest.go
@@ -38,6 +38,10 @@ func isSentryRequestUrl(ctx context.Context, url string) bool {
 		return false
 	}
 
-	dsn, _ := sentry.NewDsn(client.Options().Dsn)
-	return strings.Contains(url, dsn.GetHost()) && strings.Contains(url, dsn.GetProjectID())
+	dsn, err := sentry.NewDsn(client.Options().Dsn)
+	if err != nil {
+		return false
+	}
+
+	return strings.Contains(url, dsn.GetAPIURL().String())
 }
diff --git a/otel/span_processor_test.go b/otel/span_processor_test.go
@@ -313,7 +313,7 @@ func TestOnEndDoesNotFinishSentryRequests(t *testing.T) {
 		emptyContextWithSentry(),
 		"POST to Sentry",
 		// Hostname is same as in Sentry DSN
-		trace.WithAttributes(attribute.String("http.url", "https://example.com/123")),
+		trace.WithAttributes(attribute.String("http.url", "https://example.com/api/123/envelope/")),
 	)
 	sentrySpan, _ := sentrySpanMap.Get(otelSpan.SpanContext().SpanID())
 	otelSpan.End()