Skip to content

perf: Replace java.net.URI with custom string parsing in Dsn #5448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runningcode wants to merge 3 commits into
base: main
Choose a base branch
from
+143 −26
Open

perf: Replace java.net.URI with custom string parsing in Dsn #5448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0246373
perf: Replace java.net.URI with custom string parsing in Dsn
runningcode May 19, 2026
83dfd9f
test: Add tests for custom DSN string parsing
runningcode May 19, 2026
cacc249
changelog: Add entry for custom DSN parser
runningcode May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Improvements

- Improve SDK init performance by replacing `java.net.URI` with custom string parsing for DSN ([#5448](https://github.com/getsentry/sentry-java/pull/5448))

### Features

- Add support to configure reporting historical ANRs via `AndroidManifest.xml` using the `io.sentry.anr.report-historical` attribute ([#5387](https://github.com/getsentry/sentry-java/pull/5387))
Expand Down
98 changes: 72 additions & 26 deletions sentry/src/main/java/io/sentry/Dsn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,54 +53,100 @@ URI getSentryUri() {
return sentryUri;
}

// Avoids java.net.URI for DSN parsing, which is slow on Android.
Dsn(@Nullable String dsn) throws IllegalArgumentException {
try {
final String dsnString = Objects.requireNonNull(dsn, "The DSN is required.").trim();
Copy link
Copy Markdown
Member

@0xadam-brown 0xadam-brown May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Thoughts about extracting logic into static methods for legibility? Something like:

        try {
          final String s  = requireValid(dsn);
          final String scheme  = extractScheme(s);

          final String userInfo  = extractUserInfo(s);
          final int keyColon  = userInfo.indexOf(':');
          this.publicKey = keyColon < 0 ? userInfo : userInfo.substring(0, keyColon);
          this.secretKey = keyColon < 0 ? null : userInfo.substring(keyColon + 1);
          if (this.publicKey.isEmpty()) {
              throw new IllegalArgumentException("Invalid DSN: No public key provided.");
          }
  
          final String hostPort = extractHostPort(s);
          final int portColon = hostPort.indexOf(':');
          final String host = portColon < 0 ? hostPort : hostPort.substring(0, portColon);
          final int port = portColon < 0 ? -1 : Integer.parseInt(hostPort.substring(portColon + 1));
  
          final String rawPath = extractNormalizedPath(s);
          this.path = extractPathSegment(rawPath);
          final String projectId = extractProjectId(rawPath);
          this.projectId = projectId;

          this.sentryUri = buildSentryUri(scheme, host, port, this.path, projectId);
          this.orgId = extractOrgId(host);
      } catch (Throwable e) {
          throw new IllegalArgumentException(e);
      }

Claude thinks HotSpot, dex2oat, etc. would inline the invocations, meaning no practical overhead.

Up to you, of course.

if (dsnString.isEmpty()) {
throw new IllegalArgumentException("The DSN is empty.");
}
final URI uri = new URI(dsnString).normalize();
final String scheme = uri.getScheme();

// Extract scheme
final int schemeEnd = dsnString.indexOf("://");
if (schemeEnd < 0) {
throw new IllegalArgumentException("Invalid DSN: missing scheme.");
}
final String scheme = dsnString.substring(0, schemeEnd);
if (!("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme))) {
throw new IllegalArgumentException("Invalid DSN scheme: " + scheme);
}

String userInfo = uri.getUserInfo();
if (userInfo == null || userInfo.isEmpty()) {
// Extract userinfo (public key and optional secret key)
final int authStart = schemeEnd + 3;
final int atIndex = dsnString.indexOf('@', authStart);
if (atIndex < 0) {
throw new IllegalArgumentException("Invalid DSN: No public key provided.");
}
final String userInfo = dsnString.substring(authStart, atIndex);
if (userInfo.isEmpty()) {
throw new IllegalArgumentException("Invalid DSN: No public key provided.");
}
String[] keys = userInfo.split(":", -1);
publicKey = keys[0];
if (publicKey == null || publicKey.isEmpty()) {
final int colonIndex = userInfo.indexOf(':');
if (colonIndex < 0) {
publicKey = userInfo;
secretKey = null;
} else {
publicKey = userInfo.substring(0, colonIndex);
secretKey = userInfo.substring(colonIndex + 1);
}
if (publicKey.isEmpty()) {
throw new IllegalArgumentException("Invalid DSN: No public key provided.");
}
secretKey = keys.length > 1 ? keys[1] : null;
String uriPath = uri.getPath();
if (uriPath.endsWith("/")) {
uriPath = uriPath.substring(0, uriPath.length() - 1);

// Extract host, optional port, and path+projectId
final int hostStart = atIndex + 1;

// Strip query string if present
Copy link
Copy Markdown
Member

@0xadam-brown 0xadam-brown May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strip any fragment too?

 final int fragmentIndex = dsnString.indexOf('#', hostStart);

URI would've done it. Not sure how much we care about saving folks from obvious errors they're unlikely to make, but including it will keep parity.

Copy link
Copy Markdown
Member

@0xadam-brown 0xadam-brown May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...ah, cursorbot beat me to it.

final int queryIndex = dsnString.indexOf('?', hostStart);
final String hostAndPath =
queryIndex < 0
? dsnString.substring(hostStart)
: dsnString.substring(hostStart, queryIndex);
Copy link
Copy Markdown

@cursor cursor Bot May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

URI fragment not stripped, corrupts projectId silently

Low Severity

The new parser strips query strings (?...) but never strips URI fragments (#...). The old java.net.URI.getPath() automatically excluded fragments. If a DSN contains a # (e.g. https://key@host/123#frag), the fragment leaks into projectId (becoming 123#frag), and the multi-arg URI constructor percent-encodes # as %23, producing an incorrect sentryUri path. The queryIndex stripping logic at line 100 needs a similar check for #.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit cacc249. Configure here.


final int firstSlash = hostAndPath.indexOf('/');
if (firstSlash < 0) {
throw new IllegalArgumentException("Invalid DSN: A Project Id is required.");
}

final String hostPort = hostAndPath.substring(0, firstSlash);
final int portColon = hostPort.indexOf(':');
final String host;
final int port;
if (portColon < 0) {
host = hostPort;
port = -1;
} else {
host = hostPort.substring(0, portColon);
port = Integer.parseInt(hostPort.substring(portColon + 1));
Copy link
Copy Markdown
Member

@0xadam-brown 0xadam-brown May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: We could give a more informative error message if the port is malformed / not an int:

final String portStr = hostPort.substring(portColon + 1);
  try {
      port = Integer.parseInt(portStr);
  } catch (NumberFormatException e) {
      throw new IllegalArgumentException("Invalid DSN: invalid port: " + portStr);
  }

(Presumably rare in practice, and cleaner to do if we extract logic into static methods. Also up to you.)

}
Copy link
Copy Markdown

@cursor cursor Bot May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IPv6 host parsing broken by first-colon port detection

Low Severity

hostPort.indexOf(':') finds the first colon, which for IPv6 literals like [::1] or [::1]:9000 matches a colon inside the brackets rather than the port separator. This causes host to be [ and Integer.parseInt to throw on the remaining garbage. The old java.net.URI parser handled IPv6 bracket syntax correctly. Self-hosted Sentry users with IPv6 addresses would be unable to initialize the SDK.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit cacc249. Configure here.


// Normalize the path (collapse double slashes, like URI.normalize())
String rawPath = hostAndPath.substring(firstSlash);
while (rawPath.contains("//")) {
rawPath = rawPath.replace("//", "/");
}

if (rawPath.endsWith("/")) {
rawPath = rawPath.substring(0, rawPath.length() - 1);
}
int projectIdStart = uriPath.lastIndexOf("/") + 1;
String path = uriPath.substring(0, projectIdStart);
if (!path.endsWith("/")) {
path += "/";
final int projectIdStart = rawPath.lastIndexOf('/') + 1;
String pathSegment = rawPath.substring(0, projectIdStart);
if (!pathSegment.endsWith("/")) {
pathSegment += "/";
}
this.path = path;
projectId = uriPath.substring(projectIdStart);
this.path = pathSegment;
projectId = rawPath.substring(projectIdStart);
if (projectId.isEmpty()) {
throw new IllegalArgumentException("Invalid DSN: A Project Id is required.");
}
sentryUri =
new URI(
scheme, null, uri.getHost(), uri.getPort(), path + "api/" + projectId, null, null);

sentryUri = new URI(scheme, null, host, port, pathSegment + "api/" + projectId, null, null);

// Extract org ID from host (e.g., "o123.ingest.sentry.io" -> "123")
String extractedOrgId = null;
final String host = uri.getHost();
if (host != null) {
final Matcher matcher = ORG_ID_PATTERN.matcher(host);
if (matcher.find()) {
extractedOrgId = matcher.group(1);
}
final Matcher matcher = ORG_ID_PATTERN.matcher(host);
if (matcher.find()) {
extractedOrgId = matcher.group(1);
}
orgId = extractedOrgId;
} catch (Throwable e) {
Expand Down
67 changes: 67 additions & 0 deletions sentry/src/test/java/io/sentry/DsnTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,71 @@ class DsnTest {
val dsn = Dsn("http://key@localhost:9000/456")
assertNull(dsn.orgId)
}

@Test
fun `when dsn is null, throws exception`() {
assertFailsWith<IllegalArgumentException> { Dsn(null) }
Copy link
Copy Markdown
Member

@0xadam-brown 0xadam-brown May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: My vote would be for asserting particular error messages in these tests, as they're part of our implicit API. (Looks like we sometimes do it above.)

}

@Test
fun `when dsn has no scheme separator, throws exception`() {
assertFailsWith<IllegalArgumentException> { Dsn("httpspublicKey@host/id") }
}

@Test
fun `when dsn has no slash after host, throws exception`() {
assertFailsWith<IllegalArgumentException> { Dsn("https://key@host") }
}

@Test
fun `dsn parsed with multiple path segments`() {
val dsn = Dsn("https://key@host/path/to/sentry/id")

assertEquals("https://host/path/to/sentry/api/id", dsn.sentryUri.toURL().toString())
assertEquals("key", dsn.publicKey)
assertEquals("/path/to/sentry/", dsn.path)
assertEquals("id", dsn.projectId)
}

@Test
fun `dsn parsed with port and path`() {
val dsn = Dsn("http://key:secret@host:8080/path/id")

assertEquals("http://host:8080/path/api/id", dsn.sentryUri.toURL().toString())
assertEquals("key", dsn.publicKey)
assertEquals("secret", dsn.secretKey)
assertEquals("/path/", dsn.path)
assertEquals("id", dsn.projectId)
}

@Test
fun `dsn with multiple double slashes in path is normalized`() {
val dsn = Dsn("http://key@host//path//id")
assertEquals("http://host/path/api/id", dsn.sentryUri.toURL().toString())
}

@Test
fun `dsn with query string and port`() {
val dsn = Dsn("https://key@host:443/id?foo=bar&baz=1")

assertEquals("https://host:443/api/id", dsn.sentryUri.toURL().toString())
assertEquals("id", dsn.projectId)
}

@Test
fun `dsn with empty secret key after colon`() {
val dsn = Dsn("https://publicKey:@host/id")

assertEquals("publicKey", dsn.publicKey)
assertEquals("", dsn.secretKey)
}

@Test
fun `dsn with numeric project id`() {
val dsn = Dsn("https://key@o123.ingest.sentry.io/1234567")

assertEquals("1234567", dsn.projectId)
assertEquals("123", dsn.orgId)
assertEquals("https://o123.ingest.sentry.io/api/1234567", dsn.sentryUri.toURL().toString())
}
}
Loading