review

Author: trask

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

@@ -107,7 +107,8 @@ private JdbcConnectionUrlParser() {}
    *
    * @param connectionUrl the JDBC connection URL
    * @param props optional connection properties
-   * @return the parsed DbInfo, or DbInfo.DEFAULT if parsing fails
+   * @return the parsed DbInfo, or DbInfo.DEFAULT for null/invalid non-JDBC inputs; parser failures
+   *     return the best-effort result accumulated before the failure
    */
   public static DbInfo parse(String connectionUrl, Properties props) {
     if (connectionUrl == null) {
@@ -129,13 +130,11 @@ public static DbInfo parse(String connectionUrl, Properties props) {
     }
 
     String type = jdbcUrl.substring(0, typeLoc);
+    JdbcUrlParser parser = TYPE_PARSERS.get(type);
+    ParseContext ctx = ParseContext.of(type, props);
 
     try {
-      JdbcUrlParser parser = TYPE_PARSERS.get(type);
-
-      ParseContext ctx = ParseContext.of(type, props);
       if (parser == null) {
-        // Unknown JDBC type: apply all standard DataSource properties and use generic parser
         ctx.applyDataSourceProperties();
         GenericUrlParser.INSTANCE.parse(jdbcUrl, ctx);
       } else {
@@ -145,7 +144,7 @@ public static DbInfo parse(String connectionUrl, Properties props) {
       return ctx.toDbInfo();
     } catch (RuntimeException e) {
       logger.log(FINE, "Error parsing URL", e);
-      return DEFAULT;
+      return ctx.toDbInfo();
     }
   }
 

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

@@ -62,6 +62,23 @@ void testNullUrlReturnsDefault() {
     assertThat(JdbcConnectionUrlParser.parse(null, null)).isEqualTo(DEFAULT);
   }
 
+  @Test
+  void testParserExceptionReturnsBestEffortInfo() {
+    // Intentionally malformed Oracle URL: missing subtype/connect info, which triggers the
+    // Oracle parser's substring-based failure path after it has already applied defaults/props.
+    testVerifySystemSubtypeParsingOfUrl(
+        arg("jdbc:oracle:")
+            .setProperties(stdProps())
+            .setShortUrl("oracle://stdServerName:9999")
+            .setSystem("oracle.db")
+            .setOldSystem("oracle")
+            .setUser("stdUserName")
+            .setHost("stdServerName")
+            .setPort(9999)
+            .setName("stdDatabaseName")
+            .build());
+  }
+
   private static Stream<Arguments> mySqlArguments() {
     return args(
         // https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-jdbc-url-format.html