From 7a5bccf433cde8eb370bec07719f548e60aebf1e Mon Sep 17 00:00:00 2001 From: Raphael Fakhri <153192858+RaphaelFakhri@users.noreply.github.com> Date: Tue, 3 Nov 2026 12:36:17 +0000 Subject: [PATCH] Fix JDBC host detection for connection URLs with multiple hosts --- CHANGELOG.next-release.md | 1 + .../elastic/apm/agent/jdbc/helper/ConnectionMetaData.java | 6 ++++++ .../apm/agent/jdbc/helper/ConnectionMetaDataTest.java | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELOG.next-release.md b/CHANGELOG.next-release.md index 6850e01088..8c530f7da2 100644 --- a/CHANGELOG.next-release.md +++ b/CHANGELOG.next-release.md @@ -10,6 +10,7 @@ This file contains all changes which are not released yet. # Fixes - Fix JVM tool bootstrap check when program arguments contain slashes - [#4269](https://github.com/elastic/apm-agent-java/issues/4269) +- Fix JDBC host and port detection for PostgreSQL and H2 connection URLs with multiple hosts - [#4616](https://github.com/elastic/apm-agent-java/issues/4616) # Features and enhancements diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java index 9814a1e75e..7aa390bc91 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java @@ -535,6 +535,12 @@ protected ConnectionMetaData.Builder defaultParse(String vendorUrl, ConnectionMe authority = authority.substring(0, authorityEnd); } + // multiple hosts for failover or clustering, for example //host1:666,host2:777/database: use the first one + int hostsSeparator = authority.indexOf(','); + if (hostsSeparator > 0) { + authority = authority.substring(0, hostsSeparator); + } + parseAuthority(authority, builder); } } else if (!vendorUrl.equals("/")) { diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaDataTest.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaDataTest.java index 000fe01d3b..b97b629457 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaDataTest.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaDataTest.java @@ -104,6 +104,12 @@ void testPostgresql() { testUrl("jdbc:postgresql://[::1]/", "postgresql", "::1", 5432, null); testUrl("jdbc:postgresql://[::1]:666/", "postgresql", "::1", 666, null); + // multiple hosts: the first one is used + testUrl("jdbc:postgresql://myhost1:666,myhost2:777/database", "postgresql", "myhost1", 666, "database"); + testUrl("jdbc:postgresql://myhost1,myhost2/database?targetServerType=primary", "postgresql", "myhost1", 5432, "database"); + testUrl("jdbc:postgresql://myhost1:666,myhost2:777/", "postgresql", "myhost1", 666, null); + testUrl("jdbc:postgresql://[::1]:666,[::2]:777/database", "postgresql", "::1", 666, "database"); + testUrl("jdbc:postgresql:database", "postgresql", "localhost", 5432, "database"); testUrl("jdbc:postgresql:/", "postgresql", "localhost", 5432, null); } @@ -300,6 +306,7 @@ void testH2() { testUrl("jdbc:h2:tcp://dbserv:8084/~/sample", "h2", "dbserv", 8084, "sample"); testUrl("jdbc:h2:ssl://dbserv:8085/~/sample;", "h2", "dbserv", 8085, "sample"); testUrl("jdbc:h2:ssl://dbserv:8085/~/sample;prop1=val1;prop2=val2", "h2", "dbserv", 8085, "sample"); + testUrl("jdbc:h2:tcp://server1:9101,server2:9102/~/sample", "h2", "server1", 9101, "sample"); } @Test