Merge branch 'main' into r2dbc-db-system

Author: trask

.fossa.yml

@@ -658,9 +658,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:ktor:ktor-1.0:library'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:ktor:ktor-2-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:ktor:ktor-2.0:javaagent'
@@ -676,6 +673,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:ktor:ktor-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:ktor:ktor-common-2.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:lettuce:lettuce-4.0:javaagent'

.github/config/lychee.toml

@@ -10,7 +10,9 @@ max_concurrency = 4
 include_fragments = true
 
 remap = [
-  "https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1"
+  "https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1",
+  # lychee doesn't understand scroll to text fragment anchors
+  "https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/extension/build.gradle#:~:text=extendedAgent https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/extension/build.gradle"
 ]
 
 # excluding links to pull requests and issues is done for performance

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

@@ -61,6 +61,11 @@ class StaticImportFormatter : FormatterFunc, Serializable {
         "io.opentelemetry.instrumentation.api.internal.SemconvStability",
         "emit[a-zA-Z0-9]*"
       ),
+      Triple(
+        "SqlDialect",
+        "io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlDialect", 
+        "DOUBLE_QUOTES_ARE_[A-Z_]+"
+      ),
       Triple("Collectors", "java.util.stream.Collectors", "[a-z][a-zA-Z0-9]*"),
     )
 

dependencyManagement/build.gradle.kts

@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.47.0"
+val errorProneVersion = "2.48.0"
 val byteBuddyVersion = "1.18.5"
 val asmVersion = "9.9.1"
 val jmhVersion = "1.37"

examples/distro/build.gradle

@@ -67,7 +67,7 @@ subprojects {
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}"))
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))
 
-    testImplementation("org.mockito:mockito-core:5.21.0")
+    testImplementation("org.mockito:mockito-core:5.22.0")
 
     testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")

examples/distro/smoke-tests/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.21.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.5")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.34.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -100,7 +100,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:2.0.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.21.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.5")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.34.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")

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

@@ -183,6 +183,7 @@ private SqlClientSpanNameExtractor(SqlClientAttributesGetter<REQUEST, ?> getter)
     @Override
     public String extract(REQUEST request) {
       String namespace = getter.getDbNamespace(request);
+      SqlDialect dialect = getter.getSqlDialect(request);
       Collection<String> rawQueryTexts = getter.getRawQueryTexts(request);
 
       if (rawQueryTexts.isEmpty()) {
@@ -202,8 +203,8 @@ public String extract(REQUEST request) {
         if (rawQueryTexts.size() > 1) { // for backcompat(?)
           return computeSpanName(namespace, null, null, null);
         }
-        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyze(rawQueryTexts.iterator().next());
-
+        SqlQuery analyzedQuery =
+            SqlQueryAnalyzerUtil.analyze(rawQueryTexts.iterator().next(), dialect);
         return computeSpanName(
             namespace,
             analyzedQuery.getOperationName(),
@@ -213,7 +214,7 @@ public String extract(REQUEST request) {
 
       if (rawQueryTexts.size() == 1) {
         String rawQueryText = rawQueryTexts.iterator().next();
-        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText);
+        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText, dialect);
         boolean batch = isBatch(request);
         String querySummary = analyzedQuery.getQuerySummary();
         if (querySummary != null) {
@@ -223,7 +224,7 @@ public String extract(REQUEST request) {
             getter, request, batch ? "BATCH" : null, null, analyzedQuery.getStoredProcedureName());
       }
 
-      MultiQuery multiQuery = MultiQuery.analyzeWithSummary(rawQueryTexts, false);
+      MultiQuery multiQuery = MultiQuery.analyzeWithSummary(rawQueryTexts, dialect, false);
       String querySummary = multiQuery.getQuerySummary();
       if (querySummary != null) {
         return querySummary;
@@ -266,7 +267,9 @@ public String extract(REQUEST request) {
       Collection<String> rawQueryTexts = getter.getRawQueryTexts(request);
       String operationName = null;
       if (rawQueryTexts.size() == 1) {
-        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyze(rawQueryTexts.iterator().next());
+        String rawQuery = rawQueryTexts.iterator().next();
+        SqlDialect dialect = getter.getSqlDialect(request);
+        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyze(rawQuery, dialect);
         operationName = analyzedQuery.getOperationName();
       }
       if (operationName == null) {

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

@@ -24,12 +24,12 @@ private MultiQuery(
   }
 
   static MultiQuery analyzeWithSummary(
-      Collection<String> rawQueryTexts, boolean querySanitizationEnabled) {
+      Collection<String> rawQueryTexts, SqlDialect dialect, boolean querySanitizationEnabled) {
     UniqueValue uniqueStoredProcedureName = new UniqueValue();
     Set<String> uniqueQueryTexts = new LinkedHashSet<>();
     UniqueValue uniqueQuerySummary = new UniqueValue();
     for (String rawQueryText : rawQueryTexts) {
-      SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText);
+      SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText, dialect);
       uniqueStoredProcedureName.set(analyzedQuery.getStoredProcedureName());
       uniqueQueryTexts.add(querySanitizationEnabled ? analyzedQuery.getQueryText() : rawQueryText);
       uniqueQuerySummary.set(analyzedQuery.getQuerySummary());

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

@@ -80,14 +80,15 @@ public static <REQUEST, RESPONSE> SqlClientAttributesExtractorBuilder<REQUEST, R
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     Collection<String> rawQueryTexts = getter.getRawQueryTexts(request);
+    SqlDialect dialect = getter.getSqlDialect(request);
 
     Long batchSize = getter.getDbOperationBatchSize(request);
     boolean isBatch = batchSize != null && batchSize > 1;
 
     if (emitOldDatabaseSemconv()) {
       if (rawQueryTexts.size() == 1) { // for backcompat(?)
         String rawQueryText = rawQueryTexts.iterator().next();
-        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyze(rawQueryText);
+        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyze(rawQueryText, dialect);
         String operationName = analyzedQuery.getOperationName();
         attributes.put(
             DB_STATEMENT, querySanitizationEnabled ? analyzedQuery.getQueryText() : rawQueryText);
@@ -106,7 +107,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
       boolean shouldSanitize = querySanitizationEnabled && !parameterizedQuery;
       if (rawQueryTexts.size() == 1) {
         String rawQueryText = rawQueryTexts.iterator().next();
-        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText);
+        SqlQuery analyzedQuery = SqlQueryAnalyzerUtil.analyzeWithSummary(rawQueryText, dialect);
         attributes.put(DB_QUERY_TEXT, shouldSanitize ? analyzedQuery.getQueryText() : rawQueryText);
         String querySummary = analyzedQuery.getQuerySummary();
         attributes.put(
@@ -115,7 +116,8 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
         attributes.put(DB_STORED_PROCEDURE_NAME, analyzedQuery.getStoredProcedureName());
       } else if (rawQueryTexts.size() > 1) {
         MultiQuery multiQuery =
-            MultiQuery.analyzeWithSummary(getter.getRawQueryTexts(request), shouldSanitize);
+            MultiQuery.analyzeWithSummary(
+                getter.getRawQueryTexts(request), dialect, shouldSanitize);
         attributes.put(DB_QUERY_TEXT, join("; ", multiQuery.getQueryTexts()));
         attributes.put(DB_QUERY_SUMMARY, multiQuery.getQuerySummary());
         attributes.put(DB_STORED_PROCEDURE_NAME, multiQuery.getStoredProcedureName());