Merge branch 'main' into spring-kafka-end

laurit · laurit · commit c3c896243c27 · 2025-11-18T20:28:15.000+02:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -13,7 +13,7 @@
       matchManagers: [
         'github-actions',
         'dockerfile',
-        'regex',
+        'custom.regex',
       ],
       extends: [
         'schedule:weekly',
@@ -146,7 +146,7 @@
       matchPackageNames: [
         'uk.org.webcompere:system-stubs-jupiter',
       ],
-      allowedVersions: '/^2\.0\./',
+      allowedVersions: '/^2\\.0\\./',
     },
     {
       // wiremock 3+ requires Java 11+
@@ -217,7 +217,7 @@
       matchPackageNames: [
         'ch.qos.logback:**',
       ],
-      allowedVersions: '/^1\.2\./',
+      allowedVersions: '/^1\\.2\\./',
     },
     {
       // intentionally using slf4j 1 in this smoke tests
@@ -277,7 +277,7 @@
       matchPackageNames: [
         'org.scala-lang:scala-library',
       ],
-      allowedVersions: '/^2\.11\./',
+      allowedVersions: '/^2\\.11\\./',
     },
     {
       // intentionally testing against specific major Java versions
@@ -321,7 +321,7 @@
       matchPackageNames: [
         'ch.qos.logback:**',
       ],
-      allowedVersions: '/^1\.3\./',
+      allowedVersions: '/^1\\.3\\./',
     },
     {
       // intentionally using Spring Boot 2 in dependency management (for Java 8 support)
diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.3.1")
+  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("org.slf4j:slf4j-simple:2.0.17")
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.3.1")
+    classpath("com.squareup.okhttp3:okhttp:5.3.2")
   }
 }
 
diff --git a/examples/distro/instrumentation/servlet-3/build.gradle b/examples/distro/instrumentation/servlet-3/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.3.1"
+  testImplementation "com.squareup.okhttp3:okhttp:5.3.2"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"
diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.3.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -101,7 +101,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.3.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
 
diff --git a/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedMetricsParser.java b/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedMetricsParser.java
@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.docs.parsers;
 
+import static io.opentelemetry.instrumentation.docs.parsers.TelemetryParser.normalizeWhenCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.opentelemetry.instrumentation.docs.internal.EmittedMetrics;
 import io.opentelemetry.instrumentation.docs.utils.FileManager;
@@ -62,8 +64,7 @@ private static Map<String, List<EmittedMetrics.MetricsByScope>> parseAllMetricFi
                 path -> {
                   String content = FileManager.readFileToString(path.toString());
                   if (content != null) {
-                    String when = content.substring(0, content.indexOf('\n'));
-                    String whenKey = when.replace("when: ", "");
+                    String whenKey = normalizeWhenCondition(content);
 
                     int metricsIndex = content.indexOf("metrics_by_scope:");
                     if (metricsIndex != -1) {
diff --git a/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedSpanParser.java b/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedSpanParser.java
@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.docs.parsers;
 
+import static io.opentelemetry.instrumentation.docs.parsers.TelemetryParser.normalizeWhenCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.opentelemetry.instrumentation.docs.internal.EmittedSpans;
 import io.opentelemetry.instrumentation.docs.internal.TelemetryAttribute;
@@ -49,8 +51,7 @@ public static Map<String, EmittedSpans> getSpansByScopeFromFiles(
                 path -> {
                   String content = FileManager.readFileToString(path.toString());
                   if (content != null) {
-                    String when = content.substring(0, content.indexOf('\n'));
-                    String whenKey = when.replace("when: ", "");
+                    String whenKey = normalizeWhenCondition(content);
 
                     spansByScope.putIfAbsent(whenKey, new StringBuilder("spans_by_scope:\n"));
 
diff --git a/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/TelemetryParser.java b/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/TelemetryParser.java
@@ -73,5 +73,25 @@ static boolean scopeIsValid(String telemetryScope, String moduleScope) {
         || scopeAllowList.getOrDefault(moduleScope, emptySet()).contains(telemetryScope);
   }
 
+  /**
+   * Normalizes the 'when' condition from the given content by stripping quotes and whitespace.
+   *
+   * @param content the content containing the 'when' condition
+   * @return normalized when condition
+   */
+  static String normalizeWhenCondition(String content) {
+    if (content == null) {
+      return "";
+    }
+
+    String when = content.substring(0, content.indexOf('\n'));
+    String whenCondition = when.replace("when: ", "").strip();
+    // Remove surrounding quotes if present (to avoid double-quoting in output)
+    if (whenCondition.startsWith("\"") && whenCondition.endsWith("\"")) {
+      whenCondition = whenCondition.substring(1, whenCondition.length() - 1);
+    }
+    return whenCondition;
+  }
+
   private TelemetryParser() {}
 }
diff --git a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/EmittedMetricsParserTest.java b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/EmittedMetricsParserTest.java
@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.MockedStatic;
 
-@SuppressWarnings("NullAway")
 class EmittedMetricsParserTest {
 
   @Test
diff --git a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/TelemetryParserTest.java b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/TelemetryParserTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.docs.parsers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class TelemetryParserTest {
+
+  @Test
+  void normalizeWhenConditionStripsQuotes() {
+    String content =
+        """
+        when: "otel.instrumentation.common.experimental.view-telemetry.enabled=true,otel.instrumentation.jsp.experimental-span-attributes=true"
+        metrics_by_scope:
+          - scope: io.opentelemetry.jsp-2.3
+        """;
+
+    String result = TelemetryParser.normalizeWhenCondition(content);
+
+    assertThat(result)
+        .isEqualTo(
+            "otel.instrumentation.common.experimental.view-telemetry.enabled=true,otel.instrumentation.jsp.experimental-span-attributes=true");
+  }
+
+  @Test
+  void normalizeWhenConditionHandlesUnquotedValue() {
+    String content =
+        """
+        when: default
+        metrics_by_scope:
+          - scope: io.opentelemetry.test
+        """;
+
+    String result = TelemetryParser.normalizeWhenCondition(content);
+
+    assertThat(result).isEqualTo("default");
+  }
+
+  @Test
+  void normalizeWhenConditionReturnsEmptyForNull() {
+    String result = TelemetryParser.normalizeWhenCondition(null);
+
+    assertThat(result).isEmpty();
+  }
+
+  @Test
+  void normalizeWhenConditionHandlesComplexConditions() {
+    String content =
+        """
+        when: "config1=value1,config2=value2,config3=value3"
+        spans_by_scope:
+          - scope: io.opentelemetry.test
+        """;
+
+    String result = TelemetryParser.normalizeWhenCondition(content);
+
+    assertThat(result).isEqualTo("config1=value1,config2=value2,config3=value3");
+  }
+}
diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/DoNothingBatchErrorHandler.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/DoNothingBatchErrorHandler.java
diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/DoNothingErrorHandler.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/DoNothingErrorHandler.java
diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/ErrorHandlerSetter.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/ErrorHandlerSetter.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ plugins {`
`22`	`22`
`23`	`23`	`buildscript {`
`24`	`24`	`dependencies {`
`25`		`- classpath("com.squareup.okhttp3:okhttp:5.3.1")`
	`25`	`+ classpath("com.squareup.okhttp3:okhttp:5.3.2")`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`28`	`28`	`}`
`29`	`29`
`30`		`- testImplementation "com.squareup.okhttp3:okhttp:5.3.1"`
	`30`	`+ testImplementation "com.squareup.okhttp3:okhttp:5.3.2"`
`31`	`31`	`testImplementation "javax.servlet:javax.servlet-api:3.0.1"`
`32`	`32`	`testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"`
`33`	`33`	`testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"`