imporve test

Author: laurit

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

@@ -324,29 +324,30 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
       portLoc = clusterSepLoc != -1 && clusterSepLoc < portLoc ? -1 : portLoc;
       int dbLoc = jdbcUrl.indexOf("/", Math.max(portLoc, clusterSepLoc));
 
-      int paramLoc = jdbcUrl.indexOf("?", dbLoc);
+      int paramLoc = dbLoc != -1 ? jdbcUrl.indexOf("?", dbLoc) : -1;
 
       if (paramLoc > 0) {
         populateStandardProperties(builder, splitQuery(jdbcUrl.substring(paramLoc + 1), "&"));
         builder.db(jdbcUrl.substring(dbLoc + 1, paramLoc));
-      } else {
+      } else if (dbLoc != -1) {
         builder.db(jdbcUrl.substring(dbLoc + 1));
       }
 
       if (jdbcUrl.startsWith("address=")) {
         return MARIA_ADDRESS.doParse(jdbcUrl, builder);
       }
 
+      dbLoc = dbLoc != -1 ? dbLoc : jdbcUrl.length();
       if (portLoc > 0) {
         hostEndLoc = portLoc;
-        int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : (dbLoc > 0 ? dbLoc : jdbcUrl.length());
+        int portEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
         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 > 0 ? dbLoc : jdbcUrl.length());
+        hostEndLoc = clusterSepLoc > 0 ? clusterSepLoc : dbLoc;
       }
 
       if (ipv6End > 0) {

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

@@ -5,11 +5,9 @@
 
 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;
@@ -150,6 +148,27 @@ private static Stream<Arguments> mySqlArguments() {
             .setHost("mdb.host")
             .setPort(3306)
             .setDb("mdbdb")
+            .build(),
+        arg("jdbc:mysql:loadbalance://localhost")
+            .setShortUrl("mysql:loadbalance://localhost:3306")
+            .setSystem("mysql")
+            .setSubtype("loadbalance")
+            .setHost("localhost")
+            .setPort(3306)
+            .build(),
+        arg("jdbc:mysql:loadbalance://host:3306") // with port but no slash
+            .setShortUrl("mysql:loadbalance://host:3306")
+            .setSystem("mysql")
+            .setSubtype("loadbalance")
+            .setHost("host")
+            .setPort(3306)
+            .build(),
+        arg("jdbc:mysql:failover://[::1]:3306") // IPv6 without slash
+            .setShortUrl("mysql:failover://::1:3306")
+            .setSystem("mysql")
+            .setSubtype("failover")
+            .setHost("::1")
+            .setPort(3306)
             .build());
   }
 
@@ -332,6 +351,27 @@ private static Stream<Arguments> mariaDbArguments() {
             .setHost("localhost")
             .setPort(33)
             .setDb("mdbdb")
+            .build(),
+        arg("jdbc:mariadb:loadbalance://localhost")
+            .setShortUrl("mariadb:loadbalance://localhost:3306")
+            .setSystem("mariadb")
+            .setSubtype("loadbalance")
+            .setHost("localhost")
+            .setPort(3306)
+            .build(),
+        arg("jdbc:mariadb:loadbalance://host:3306") // with port but no slash
+            .setShortUrl("mariadb:loadbalance://host:3306")
+            .setSystem("mariadb")
+            .setSubtype("loadbalance")
+            .setHost("host")
+            .setPort(3306)
+            .build(),
+        arg("jdbc:mariadb:failover://[::1]:3306") // IPv6 without slash
+            .setShortUrl("mariadb:failover://::1:3306")
+            .setSystem("mariadb")
+            .setSubtype("failover")
+            .setHost("::1")
+            .setPort(3306)
             .build());
   }
 
@@ -1377,16 +1417,4 @@ 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();
-  }
 }