fix(instrumentation/jdbc): JDBC URL Parser StringIndexOutOfBoundsException Fix

Author: wl2027

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java

@@ -339,14 +339,14 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
 
       if (portLoc > 0) {
         hostEndLoc = portLoc;
-        int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
+        int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : (dbLoc > 0 ? dbLoc : jdbcUrl.length());
         try {
           builder.port(Integer.parseInt(jdbcUrl.substring(portLoc + 1, portEndLoc)));
         } catch (NumberFormatException e) {
           logger.log(FINE, e.getMessage(), e);
         }
       } else {
-        hostEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
+        hostEndLoc = clusterSepLoc > 0 ? clusterSepLoc : (dbLoc > 0 ? dbLoc : jdbcUrl.length());
       }
 
       if (ipv6End > 0) {

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParserTest.java

@@ -5,8 +5,11 @@
 
 package io.opentelemetry.instrumentation.jdbc.internal;
 
+import static io.opentelemetry.instrumentation.jdbc.internal.JdbcConnectionUrlParser.MYSQL;
 import static io.opentelemetry.instrumentation.jdbc.internal.JdbcConnectionUrlParser.parse;
+import static io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo.DEFAULT;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo;
@@ -40,12 +43,12 @@ private static Properties stdProps() {
   @ParameterizedTest
   @ValueSource(strings = {"", "jdbc:", "jdbc::", "bogus:string"})
   void testInvalidUrlReturnsDefault(String url) {
-    assertThat(JdbcConnectionUrlParser.parse(url, null)).isEqualTo(DbInfo.DEFAULT);
+    assertThat(JdbcConnectionUrlParser.parse(url, null)).isEqualTo(DEFAULT);
   }
 
   @Test
   void testNullUrlReturnsDefault() {
-    assertThat(JdbcConnectionUrlParser.parse(null, null)).isEqualTo(DbInfo.DEFAULT);
+    assertThat(JdbcConnectionUrlParser.parse(null, null)).isEqualTo(DEFAULT);
   }
 
   private static Stream<Arguments> mySqlArguments() {
@@ -1374,4 +1377,16 @@ static Stream<Arguments> args(ParseTestArgument... testArguments) {
     }
     return list.stream();
   }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "mysql:loadbalance://string_without_slash",
+        "mysql:loadbalance://host:3306", // with port but no slash
+        "mariadb:failover://[::1]:3306" // IPv6 without slash
+      })
+  void testMySQLUrlsWithoutSlashDoNotThrowException(String url) {
+    assertThatCode(() -> MYSQL.doParse(url, DEFAULT.toBuilder().system("mysql")))
+        .doesNotThrowAnyException();
+  }
 }