diff --git a/CHANGELOG.md b/CHANGELOG.md index c90596c5f5..8892a5827a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,15 @@ ## Unreleased -### Features - -- Add captureProfile method to hub and client ([#2290](https://github.com/getsentry/sentry-java/pull/2290)) - ### Fixes - Ensure potential callback exceptions are caught #2123 ([#2291](https://github.com/getsentry/sentry-java/pull/2291)) - Remove verbose FrameMetricsAggregator failure logging ([#2293](https://github.com/getsentry/sentry-java/pull/2293)) +- Ignore broken regex for tracePropagationTarget ([#2288](https://github.com/getsentry/sentry-java/pull/2288)) + +### Features + +- Add captureProfile method to hub and client ([#2290](https://github.com/getsentry/sentry-java/pull/2290)) ## 6.5.0 diff --git a/sentry/src/main/java/io/sentry/TracePropagationTargets.java b/sentry/src/main/java/io/sentry/TracePropagationTargets.java index 3425642854..d910c4fafa 100644 --- a/sentry/src/main/java/io/sentry/TracePropagationTargets.java +++ b/sentry/src/main/java/io/sentry/TracePropagationTargets.java @@ -15,9 +15,16 @@ public static boolean contain(final @NotNull List origins, final @NotNul return false; } for (final String origin : origins) { - if (url.contains(origin) || url.matches(origin)) { + if (url.contains(origin)) { return true; } + try { + if (url.matches(origin)) { + return true; + } + } catch (Exception e) { + // ignore invalid regex + } } return false; } diff --git a/sentry/src/test/java/io/sentry/TracePropagationTargetsTest.kt b/sentry/src/test/java/io/sentry/TracePropagationTargetsTest.kt index 60eb178723..a2d49b41f0 100644 --- a/sentry/src/test/java/io/sentry/TracePropagationTargetsTest.kt +++ b/sentry/src/test/java/io/sentry/TracePropagationTargetsTest.kt @@ -26,4 +26,9 @@ class TracePropagationTargetsTest { fun `when no origins are defined, returns false for every url`() { assertFalse(TracePropagationTargets.contain(emptyList(), "http://some.api.com/")) } + + @Test + fun `ignores broken regex`() { + assertFalse(TracePropagationTargets.contain(listOf("AABB???"), "http://some.api.com/")) + } }