Merge branch 'main' into r2dbc-db-system

Author: trask

.fossa.yml

@@ -928,9 +928,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-2.0:library'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:rxjava:rxjava-3-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-3.0:javaagent'
@@ -943,6 +940,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-3.1.1:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:rxjava:rxjava-common-3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:servlet:servlet-2.2:javaagent'

.github/scripts/check-package-names.sh

@@ -25,9 +25,6 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$module_name" == "graphql-java-common" ]]; then
     continue
   fi
-  if [[ "$module_name" == "rxjava-3-common" ]]; then
-    continue
-  fi
   if [[ "$module_name" == "servlet-javax-common" ]]; then
     continue
   fi

.github/workflows/build-common.yml

@@ -248,6 +248,7 @@ jobs:
           - 21
           - 25 # renovate(java-version)
           - 25-deny-unsafe
+          - 26-ea
         vm:
           - hotspot
           - openj9
@@ -263,6 +264,8 @@ jobs:
           - vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
           - test-java-version: 25-deny-unsafe
             vm: openj9
+          - test-java-version: 26-ea
+            vm: openj9
       fail-fast: false
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/metadata-update.yml

@@ -83,6 +83,8 @@ jobs:
 
       - name: Commit and push changes
         if: steps.diffcheck.outputs.has_diff == 'true'
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
           git commit -m "chore: update instrumentation list [automated]" || echo "No changes to commit."

conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/StaticImportFormatter.kt

@@ -91,12 +91,9 @@ class StaticImportFormatter : FormatterFunc, Serializable {
       content
         .lines()
         .mapNotNull { line -> semconvImportRegex.find(line.trim()) }
-        .filter { it.groupValues[2] != "SchemaUrls" }
+        .filter { it.groupValues[2] != "SchemaUrls" && it.groupValues[3].isEmpty() }
         .map { m ->
-          // If there is a nested class (group 3), use the nested class as the className so that
-          // references like `DbSystemNameIncubatingValues.COUCHBASE` are rewritten correctly.
-          val className = if (m.groupValues[3].isNotEmpty()) m.groupValues[3] else m.groupValues[2]
-          Triple(className, m.groupValues[1], "[A-Z][A-Z_0-9]*")
+          Triple(m.groupValues[2], m.groupValues[1], "[A-Z][A-Z_0-9]*")
         }
     for ((className, pkg, memberPattern) in semconvRules) {
       val regex = Regex("\\b${className}\\.(${memberPattern})\\b")
@@ -118,6 +115,37 @@ class StaticImportFormatter : FormatterFunc, Serializable {
       content = lines.joinToString("\n")
     }
 
+    // Handle nested value class references through the outer class, e.g.
+    // DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA when only
+    // DbIncubatingAttributes is imported (not the nested class directly).
+    // Rewrites to NestedClass.CONSTANT and adds a regular import of the nested class.
+    val outerOnlySemconvImports =
+      content
+        .lines()
+        .mapNotNull { line -> semconvImportRegex.find(line.trim()) }
+        .filter { it.groupValues[2] != "SchemaUrls" && it.groupValues[3].isEmpty() }
+        .map { m -> Pair(m.groupValues[2], m.groupValues[1]) }
+    for ((outerClassName, outerPkg) in outerOnlySemconvImports) {
+      val regex =
+        Regex("\\b${outerClassName}\\.([A-Z][a-zA-Z0-9]*[a-z][a-zA-Z0-9]*)\\.([A-Z][A-Z_0-9]+)\\b")
+      val lines = content.lines().toMutableList()
+      var inBlockComment = false
+      for (i in lines.indices) {
+        val trimmed = lines[i].trimStart()
+        if (trimmed.startsWith("/*")) inBlockComment = true
+        if (inBlockComment) {
+          if (trimmed.contains("*/")) inBlockComment = false
+          continue
+        }
+        if (trimmed.startsWith("import ")) continue
+        for (match in regex.findAll(lines[i])) {
+          importsToAdd.add("import ${outerPkg}.${match.groupValues[1]};")
+        }
+        lines[i] = regex.replace(lines[i], "$1.$2")
+      }
+      content = lines.joinToString("\n")
+    }
+
     if (importsToAdd.isNotEmpty()) {
       val lines = content.lines().toMutableList()
       val firstImportIndex = lines.indexOfFirst { it.trimStart().startsWith("import ") }

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualified.java

@@ -27,6 +27,7 @@
 import static com.google.errorprone.util.ASTHelpers.getGeneratedBy;
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
 import static com.google.errorprone.util.ASTHelpers.getType;
+import static com.google.errorprone.util.ASTHelpers.hasExplicitSource;
 import static com.google.errorprone.util.ASTHelpers.isGeneratedConstructor;
 import static com.google.errorprone.util.FindIdentifiers.findIdent;
 import static com.sun.tools.javac.code.Kinds.KindSelector.VAL_TYP;
@@ -64,7 +65,6 @@
 import com.sun.tools.javac.code.Symbol.PackageSymbol;
 import com.sun.tools.javac.code.Symbol.TypeSymbol;
 import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.util.Position;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -235,7 +235,7 @@ private void handle(TreePath path) {
         if (isDeprecatedForRemoval(symbol)) {
           return;
         }
-        if (state.getEndPosition(tree) == Position.NOPOS) {
+        if (!hasExplicitSource(tree, state)) {
           return;
         }
         List<TreePath> treePaths = table.get(tree.getIdentifier(), symbol.type.tsym);

custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelDeprecatedApiUsageTest.java

@@ -161,9 +161,9 @@ void positiveCases_externalDeprecatedApi() {
             "ExternalDeprecated.java",
             "package test;",
             "public class ExternalDeprecated {",
-            "  void method(Thread t) {",
+            "  void method() {",
             "    // BUG: Diagnostic contains: Use of deprecated API",
-            "    t.stop();",
+            "    new Boolean(false);",
             "  }",
             "}")
         .doTest();

docs/instrumentation-list.yaml

@@ -2403,14 +2403,6 @@ libraries:
       spans:
       - span_kind: CLIENT
         attributes:
-        - name: db.namespace
-          type: STRING
-        - name: db.query.summary
-          type: STRING
-        - name: db.query.text
-          type: STRING
-        - name: db.system.name
-          type: STRING
         - name: http.request.method
           type: STRING
         - name: http.response.status_code
@@ -5441,12 +5433,24 @@ libraries:
     library_link: https://javalin.io/
     features:
     - HTTP_ROUTE
-    source_path: instrumentation/javalin-5.0
+    source_path: instrumentation/javalin/javalin-5.0
     minimum_java_version: 11
     scope:
       name: io.opentelemetry.javalin-5.0
     javaagent_target_versions:
-    - io.javalin:javalin:[5.0.0,)
+    - io.javalin:javalin:[5.0.0,7.0.0)
+  - name: javalin-7.0
+    description: This instrumentation enriches existing HTTP server spans with route
+      information, it does not emit any telemetry on its own.
+    library_link: https://javalin.io/
+    features:
+    - HTTP_ROUTE
+    source_path: instrumentation/javalin/javalin-7.0
+    minimum_java_version: 17
+    scope:
+      name: io.opentelemetry.javalin-7.0
+    javaagent_target_versions:
+    - io.javalin:javalin:[7.0.0,)
   jaxrs:
   - name: jaxrs-1.0
     display_name: JAX-RS 1.x
@@ -8177,6 +8181,8 @@ libraries:
       spans:
       - span_kind: CLIENT
         attributes:
+        - name: db.operation
+          type: STRING
         - name: db.statement
           type: STRING
         - name: db.system
@@ -8200,6 +8206,8 @@ libraries:
         type: HISTOGRAM
         unit: s
         attributes:
+        - name: db.operation.name
+          type: STRING
         - name: db.system.name
           type: STRING
         - name: network.peer.address
@@ -8213,11 +8221,13 @@ libraries:
       spans:
       - span_kind: CLIENT
         attributes:
+        - name: db.operation.name
+          type: STRING
         - name: db.query.text
           type: STRING
         - name: db.system.name
           type: STRING
-        - name: error
+        - name: error.type
           type: STRING
         - name: network.peer.address
           type: STRING

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java

@@ -12,7 +12,6 @@
 import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
 import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
 import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
-import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
 import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 
@@ -136,21 +135,22 @@ public void onEnd(
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
     internalNetworkExtractor.onEnd(attributes, request, response);
-    onEndCommon(attributes, getter, response, error);
+    onEndCommon(attributes, getter, request, response, error);
   }
 
   static <REQUEST, RESPONSE> void onEndCommon(
       AttributesBuilder attributes,
       DbClientAttributesGetter<REQUEST, RESPONSE> getter,
+      REQUEST request,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
     if (emitStableDatabaseSemconv()) {
-      if (error != null) {
-        attributes.put(ERROR_TYPE, error.getClass().getName());
-      }
-      if (error != null || response != null) {
-        attributes.put(DB_RESPONSE_STATUS_CODE, getter.getDbResponseStatusCode(response, error));
+      String errorType = getter.getErrorType(request, response, error);
+      // fall back to exception class name
+      if (errorType == null && error != null) {
+        errorType = error.getClass().getName();
       }
+      attributes.put(ERROR_TYPE, errorType);
     }
   }
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java

@@ -79,6 +79,7 @@ default String getConnectionString(REQUEST request) {
 
   // TODO: make this required to implement
   @Nullable
+  @Deprecated
   default String getDbResponseStatusCode(@Nullable RESPONSE response, @Nullable Throwable error) {
     return null;
   }
@@ -93,4 +94,20 @@ default Long getDbOperationBatchSize(REQUEST request) {
   default Map<String, String> getDbQueryParameters(REQUEST request) {
     return emptyMap();
   }
+
+  /**
+   * Returns a description of a class of error the operation ended with.
+   *
+   * <p>If this method returns {@code null}, the exception class name (if any) will be used as error
+   * type.
+   *
+   * <p>The cardinality of the error type should be low. The instrumentations implementing this
+   * method are recommended to document the custom values they support.
+   */
+  @Nullable
+  // TODO remove the default implementation and make this required to implement
+  default String getErrorType(
+      REQUEST request, @Nullable RESPONSE response, @Nullable Throwable error) {
+    return null;
+  }
 }