Merge remote-tracking branch 'upstream/main' into r2dbc-db-system

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

Author: trask

benchmark-overhead/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("org.jooq:joox:2.0.1")
-  testImplementation("com.jayway.jsonpath:json-path:2.10.0")
+  testImplementation("com.jayway.jsonpath:json-path:3.0.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")
   testImplementation("org.assertj:assertj-core:3.27.7")
 

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

@@ -35,6 +35,11 @@ class StaticImportFormatter : FormatterFunc, Serializable {
         "java.nio.charset.StandardCharsets",
         "[A-Z][A-Z_0-9]*"
       ),
+      Triple(
+        "Collections",
+        "java.util.Collections",
+        "singleton[a-zA-Z0-9]*|empty[a-zA-Z0-9]*"
+      ),
       Triple(
         "ArgumentMatchers",
         "org.mockito.ArgumentMatchers",
@@ -51,6 +56,11 @@ class StaticImportFormatter : FormatterFunc, Serializable {
         "io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions",
         "[a-z][a-zA-Z0-9]*"
       ),
+      Triple(
+        "SemconvStability",
+        "io.opentelemetry.instrumentation.api.internal.SemconvStability",
+        "emit[a-zA-Z0-9]*"
+      ),
     )
 
     var content = input

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java

@@ -5,14 +5,14 @@
 
 package io.opentelemetry.instrumentation.config.bridge;
 
+import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -102,8 +102,7 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
 
   public static DeclarativeConfigProperties createInstrumentationConfig(
       ConfigProperties configProperties) {
-    return new ConfigPropertiesBackedDeclarativeConfigProperties(
-        configProperties, Collections.emptyList());
+    return new ConfigPropertiesBackedDeclarativeConfigProperties(configProperties, emptyList());
   }
 
   private ConfigPropertiesBackedDeclarativeConfigProperties(

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

@@ -6,6 +6,8 @@
 package io.opentelemetry.instrumentation.config.bridge;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -115,7 +117,7 @@ public List<String> getList(String propertyName) {
             propertyName,
             o -> (List<String>) o,
             (properties, lastPart) -> properties.getScalarList(lastPart, String.class));
-    return propertyValue == null ? Collections.emptyList() : propertyValue;
+    return propertyValue == null ? emptyList() : propertyValue;
   }
 
   @Override
@@ -126,7 +128,7 @@ public Map<String, String> getMap(String propertyName) {
             DeclarativeConfigProperties.class,
             DeclarativeConfigProperties::getStructured);
     if (propertyValue == null) {
-      return Collections.emptyMap();
+      return emptyMap();
     }
     Map<String, String> result = new HashMap<>();
     propertyValue

docs/contributing/style-guide.md

@@ -149,6 +149,25 @@ Following the reasoning from
 - `Optional` shouldn't appear in public API signatures
 - Avoid `Optional` on the hot path (instrumentation code), unless the instrumented library uses it
 
+## Semantic convention constants
+
+**Library instrumentation**: Copy semantic convention constants directly into library
+instrumentation classes rather than depending on the semconv artifact. Library instrumentation is
+used by end users, and this avoids exposing a dependency on the semconv artifact (which may change
+across versions). For example:
+
+```java
+// copied from MessagingIncubatingAttributes
+private static final AttributeKey<String> MESSAGING_SYSTEM =
+    AttributeKey.stringKey("messaging.system");
+```
+
+**Javaagent instrumentation**: Use the semconv constants from the semconv artifact directly. The
+javaagent bundles its own dependencies, so there is no risk of version conflicts for end users.
+
+**Tests**: Use the semconv constants from the semconv artifact directly. Test dependencies do not
+affect end users.
+
 ## Tooling conventions
 
 ### AssertJ

docs/supported-libraries.md

@@ -91,7 +91,7 @@ These are the supported libraries and frameworks:
 | [Java Http Server](https://docs.oracle.com/en/java/javase/21/docs/api/jdk.httpserver/module-summary.html)                                   | Java 8+                            | [opentelemetry-java-http-server](../instrumentation/java-http-server/library)                                                                                                                                                                                                                                                                                                           | [HTTP Server Spans], [HTTP Server Metrics]                                                                                                        |
 | [java.util.logging](https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html)                                       | Java 8+                            | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                              |
 | [Java Platform](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ManagementFactory.html)                                      | Java 8+                            | [opentelemetry-runtime-telemetry-java8](../instrumentation/runtime-telemetry/runtime-telemetry-java8/library),<br>[opentelemetry-runtime-telemetry-java17](../instrumentation/runtime-telemetry/runtime-telemetry-java17/library),<br>[opentelemetry-resources](../instrumentation/resources/library)                                                                                   | [JVM Runtime Metrics]                                                                                                                             |
-| [Javalin](https://javalin.io/)                                                                                                              | 5.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                                         |
+| [Javalin](https://javalin.io/)                                                                                                              | 5.0+ (not including 7.0+ yet)      | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                                         |
 | [JAX-RS](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/package-summary.html)                                                    | 0.5+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2], Controller Spans [3]                                                                                                   |
 | [JAX-RS Client](https://javaee.github.io/javaee-spec/javadocs/javax/ws/rs/client/package-summary.html)                                      | 1.1+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics]                                                                                                        |
 | [JAX-WS](https://jakarta.ee/specifications/xml-web-services/2.3/apidocs/javax/xml/ws/package-summary.html)                                  | 2.0+ (not including 3.0+ yet)      | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2], Controller Spans [3]                                                                                                   |

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

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv;
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
 import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
 import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
 import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
@@ -93,7 +95,7 @@ static <REQUEST, RESPONSE> void onStartCommon(
     Long batchSize = getter.getDbOperationBatchSize(request);
     boolean isBatch = batchSize != null && batchSize > 1;
 
-    if (SemconvStability.emitStableDatabaseSemconv()) {
+    if (emitStableDatabaseSemconv()) {
       attributes.put(
           DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(getter.getDbSystemName(request)));
       attributes.put(DB_NAMESPACE, getter.getDbNamespace(request));
@@ -104,7 +106,7 @@ static <REQUEST, RESPONSE> void onStartCommon(
         attributes.put(DB_OPERATION_BATCH_SIZE, batchSize);
       }
     }
-    if (SemconvStability.emitOldDatabaseSemconv()) {
+    if (emitOldDatabaseSemconv()) {
       attributes.put(DB_SYSTEM, getter.getDbSystem(request));
       attributes.put(DB_USER, getter.getUser(request));
       attributes.put(DB_NAME, getter.getDbNamespace(request));
@@ -142,7 +144,7 @@ static <REQUEST, RESPONSE> void onEndCommon(
       DbClientAttributesGetter<REQUEST, RESPONSE> getter,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
-    if (SemconvStability.emitStableDatabaseSemconv()) {
+    if (emitStableDatabaseSemconv()) {
       if (error != null) {
         attributes.put(ERROR_TYPE, error.getClass().getName());
       }

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

@@ -5,9 +5,10 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
+import static java.util.Collections.emptyMap;
+
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
 import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesGetter;
-import java.util.Collections;
 import java.util.Map;
 import javax.annotation.Nullable;
 
@@ -90,6 +91,6 @@ default Long getDbOperationBatchSize(REQUEST request) {
 
   // TODO: make this required to implement
   default Map<String, String> getDbQueryParameters(REQUEST request) {
-    return Collections.emptyMap();
+    return emptyMap();
   }
 }

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.FINE;
 
@@ -19,7 +20,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
 import io.opentelemetry.instrumentation.api.instrumenter.OperationMetrics;
 import io.opentelemetry.instrumentation.api.internal.OperationMetricsUtil;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import java.util.logging.Logger;
 
 /**
@@ -45,7 +45,7 @@ public final class DbClientMetrics implements OperationListener {
    * @see InstrumenterBuilder#addOperationMetrics(OperationMetrics)
    */
   public static OperationMetrics get() {
-    if (SemconvStability.emitStableDatabaseSemconv()) {
+    if (emitStableDatabaseSemconv()) {
       return OperationMetricsUtil.create("database client", DbClientMetrics::new);
     }
     return meter -> OperationMetricsUtil.NOOP_OPERATION_LISTENER;

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

@@ -5,8 +5,9 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
+
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import java.util.Collection;
 import javax.annotation.Nullable;
 
@@ -153,7 +154,7 @@ private GenericDbClientSpanNameExtractor(DbClientAttributesGetter<REQUEST, ?> ge
 
     @Override
     public String extract(REQUEST request) {
-      if (SemconvStability.emitStableDatabaseSemconv()) {
+      if (emitStableDatabaseSemconv()) {
         String querySummary = getter.getDbQuerySummary(request);
         if (querySummary != null) {
           return querySummary;
@@ -182,7 +183,7 @@ public String extract(REQUEST request) {
       Collection<String> rawQueryTexts = getter.getRawQueryTexts(request);
 
       if (rawQueryTexts.isEmpty()) {
-        if (SemconvStability.emitStableDatabaseSemconv()) {
+        if (emitStableDatabaseSemconv()) {
           String querySummary = getter.getDbQuerySummary(request);
           if (querySummary != null) {
             return querySummary;
@@ -194,7 +195,7 @@ public String extract(REQUEST request) {
         return computeSpanName(namespace, operationName, null, null);
       }
 
-      if (!SemconvStability.emitStableDatabaseSemconv()) {
+      if (!emitStableDatabaseSemconv()) {
         if (rawQueryTexts.size() > 1) { // for backcompat(?)
           return computeSpanName(namespace, null, null, null);
         }
@@ -253,7 +254,7 @@ private MigratingSqlClientSpanNameExtractor(SqlClientAttributesGetter<REQUEST, ?
 
     @Override
     public String extract(REQUEST request) {
-      if (SemconvStability.emitStableDatabaseSemconv()) {
+      if (emitStableDatabaseSemconv()) {
         return sqlDelegate.extract(request);
       }
       // For old semconv, use the generic span name format (operation + namespace)