Merge remote-tracking branch 'upstream/main' into conditions

Author: trask

.github/agents/knowledge/general-rules.md

@@ -77,6 +77,18 @@ Do not flag the following patterns (common false positives):
 
 - FQCN is acceptable when class-name collision makes import impossible.
 
+## [Style] Visibility modifiers
+
+Follow the principle of minimal necessary visibility. Use the most restrictive access modifier that
+still allows the code to function correctly.
+
+**Exception — Single public class**: If a module has only one public class then don't change it to
+package-private. Javadoc task fails when module has no public classes.**
+
+**Exception — Used from advice**: All classes and methods used from methods annotated with
+`@Advice.OnMethodEnter` or `@Advice.OnMethodExit` must be public. These methods are inlined into
+transformed classes and must be accessible from those classes, which may be in different packages.
+
 ## [Style] `@SuppressWarnings` Usage
 
 - Method-level `@SuppressWarnings` is preferred over class-level for tighter scope, but

.github/agents/knowledge/testing-general-patterns.md

@@ -17,14 +17,19 @@
 - In JUnit tests, when an `AutoCloseable` is intended to remain live for most or all of the test
   and only needs cleanup at test end, prefer `AutoCleanupExtension` with `deferCleanup(...)`
   over wrapping most of the test body in try-with-resources.
+- For resources created in `@BeforeAll` or other class-scoped setup, prefer
+  `AutoCleanupExtension` with `deferAfterAll(...)` over nested `@AfterAll` cleanup
+  chains.
 - Reuse an existing `cleanup` extension when one is already in scope.
   Otherwise, add a `@RegisterExtension` field when the deferred-cleanup pattern improves
   clarity or avoids wrapping most of the test body.
 - Keep try-with-resources for semantically scoped resources whose lifetime must end before the
   rest of the test continues, such as `Scope` / `Context.makeCurrent()`, Mockito
   `MockedStatic`, and short-lived readers, writers, streams, response bodies, or parsers.
-- Do not use `AutoCleanupExtension` in non-JUnit helper methods, `@BeforeAll`, or other shared
-  setup code where cleanup is not tied to a single test method.
+- Keep `AutoCleanupExtension` usage scoped to JUnit-managed test classes; do not introduce it in
+  generic helper utilities or other non-JUnit code.
+- In `@BeforeAll` or other shared setup code where cleanup is not tied to a single test method,
+  use `deferAfterAll(...)` instead of `deferCleanup(...)`.
 - If the test intentionally closes the resource mid-test or asserts behavior around explicit
   close, keep the direct close or try-with-resources in the test body.
 

.github/config/lychee.toml

@@ -20,6 +20,9 @@ exclude = [
   '^http://code.google.com/p/concurrentlinkedhashmap$',
   '^https://softwareengineering.stackexchange.com/questions/29727.*',
   '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
+  # url in zipkin pom files points to a non-existent location
+  '^https://github.com/openzipkin/zipkin-reporter-java/zipkin-reporter$',
+  '^https://github.com/openzipkin/zipkin-reporter-java/zipkin-sender-okhttp3$',
   # flaky links
   '^http://www.slf4j.org.*',
   '^https://logback.qos.ch/.*',

.github/scripts/instrumentations.sh

@@ -250,6 +250,7 @@ readonly INSTRUMENTATIONS=(
   "servlet:servlet-3.0:javaagent-testing:test"
   "servlet:servlet-5.0:jetty12-testing:test"
   "spring:spring-batch-3.0:javaagent:test"
+  "spring:spring-batch-3.0:javaagent:testExperimental"
   "spring:spring-data:spring-data-1.8:javaagent:test"
   "spring:spring-integration-4.1:javaagent:test"
   "spring:spring-integration-4.1:javaagent:testWithProducerInstrumentation"

dependencyManagement/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.60.1"
+val otelSdkVersion = "1.61.0"
 val otelContribVersion = "1.55.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.48.0"
+val errorProneVersion = "2.49.0"
 val byteBuddyVersion = "1.18.7"
 val asmVersion = "9.9.1"
 val jmhVersion = "1.37"
@@ -85,7 +85,7 @@ val DEPENDENCIES = listOf(
   "io.r2dbc:r2dbc-proxy:1.1.6.RELEASE",
   "ch.qos.logback:logback-classic:1.3.16", // 1.4+ requires Java 11+
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.13.1",
+  "com.uber.nullaway:nullaway:0.13.2",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.11.0",
   "commons-codec:commons-codec:1.21.0",

docs/instrumentation-list.yaml

@@ -13591,6 +13591,10 @@ libraries:
       type: boolean
       default: false
     telemetry:
+    - when: default
+      spans:
+      - span_kind: INTERNAL
+        attributes: []
     - when: otel.instrumentation.spring-batch.experimental-span-attributes=true
       spans:
       - span_kind: INTERNAL

examples/distro/build.gradle

@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.60.1",
+      opentelemetrySdk           : "1.61.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "2.27.0-SNAPSHOT",

examples/extension/build.gradle.kts

@@ -24,7 +24,7 @@ version = "1.0"
 
 val versions = mapOf(
   // this line is managed by .github/scripts/update-sdk-version.sh
-  "opentelemetrySdk" to "1.60.1",
+  "opentelemetrySdk" to "1.61.0",
 
   // these lines are managed by .github/scripts/update-version.sh
   "opentelemetryJavaagent" to "2.27.0-SNAPSHOT",

gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts

@@ -1,3 +1,4 @@
+import java.net.URLConnection
 import net.bytebuddy.ClassFileVersion
 import net.bytebuddy.build.gradle.ByteBuddySimpleTask
 
@@ -37,6 +38,10 @@ val inputClasspath = (sourceSet.output.resourcesDir?.let { codegen.plus(project.
   .plus(sourceSet.output.dirs) // needed to support embedding shadowed modules into instrumentation
   .plus(configurations.runtimeClasspath.get())
 
+// disable url connection caching to avoid java.util.zip.ZipException: ZipFile invalid LOC header (bad signature)
+// during byte buddy plugin discovery when muzzle jar has changed
+URLConnection.setDefaultUseCaches("jar", false)
+
 val languageTasks = LANGUAGES.map { language ->
   if (fileTree("src/${sourceSet.name}/${language}").isEmpty) {
     return@map null
@@ -61,6 +66,7 @@ fun createLanguageTask(
     group = "Byte Buddy"
     outputs.cacheIf { true }
     classFileVersion = ClassFileVersion.JAVA_V8
+    isWarnOnEmptyTypeSet = false
     val compileTask = compileTaskProvider.get()
     // this does not work for kotlin as compile task does not extend AbstractCompile
     if (compileTask is AbstractCompile) {

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java

@@ -11,23 +11,16 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class ActivejHttpServerInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class ActivejHttpServerInstrumentationModule extends InstrumentationModule {
 
   public ActivejHttpServerInstrumentationModule() {
     super("activej-http", "activej-http-6.0");
   }
 
-  @Override
-  public boolean isIndyReady() {
-    return true;
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ActivejAsyncServletInstrumentation());