Merge remote-tracking branch 'upstream/main' into remove-more-deprecated-props

# Conflicts:
#	instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/metadata.yaml
#	instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/metadata.yaml
#	instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/metadata.yaml

Author: trask

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

@@ -76,7 +76,10 @@ Do not flag the following patterns (common false positives):
 
 - FQCN is acceptable when class-name collision makes import impossible.
 - Do not claim that a Java non-capturing lambda or method reference allocates per
-  call. On HotSpot / OpenJDK 8+, these are cached at the call site.
+  call. On HotSpot / OpenJDK 8+, these are cached at the `invokedynamic` call site.
+  Do not suggest hoisting such a lambda into a `private static final` field for
+  allocation/performance reasons — it is pure noise. If a PR makes that hoist,
+  flag it and recommend reverting to the in-line lambda.
 
 ## [Style] Visibility modifiers
 
@@ -86,9 +89,17 @@ 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.
+**Exception — Directly referenced from advice**: Classes and methods that are _directly_
+referenced from methods annotated with `@Advice.OnMethodEnter` or `@Advice.OnMethodExit` must be
+public, since the advice may be applied to classes in other packages.
+
+This applies only to **direct** references in the advice methods, not transitive ones. Helpers
+reached only from inside another helper called by the advice (for example, a same-package
+`*Singletons` accessor invoked from inside `AdviceScope.start()`) can keep package-private
+visibility. A source-level `inline = false` on the advice annotation is not a reason to widen
+visibility — the agent forcibly overrides the `inline` attribute at runtime based on the
+configured indy mode, so the source value does not determine how the advice is dispatched.
+Reason about visibility from "what does the advice method directly reference?".
 
 ## [Style] `@SuppressWarnings` Usage
 

instrumentation/rocketmq/rocketmq-client-5.0/javaagent/src/test/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java

@@ -27,6 +27,7 @@
 import io.opentelemetry.sdk.trace.data.StatusData;
 import java.time.Duration;
 import org.apache.rocketmq.client.apis.ClientConfiguration;
+import org.apache.rocketmq.client.apis.ClientException;
 import org.apache.rocketmq.client.apis.ClientServiceProvider;
 import org.apache.rocketmq.client.apis.consumer.ConsumeResult;
 import org.apache.rocketmq.client.apis.consumer.FilterExpression;
@@ -58,7 +59,7 @@ static void tearDown() {
   }
 
   @Test
-  void testSendAndConsumeMessage() throws Throwable {
+  void testSendAndConsumeMessage() throws ClientException {
     ClientConfiguration clientConfiguration =
         ClientConfiguration.newBuilder()
             .setEndpoints(CONTAINER.endpoints)
@@ -104,7 +105,8 @@ void testSendAndConsumeMessage() throws Throwable {
     SendReceipt sendReceipt =
         testing()
             .runWithSpan(
-                "parent", (ThrowingSupplier<SendReceipt, Throwable>) () -> producer.send(message));
+                "parent",
+                (ThrowingSupplier<SendReceipt, ClientException>) () -> producer.send(message));
     testing()
         .waitAndAssertTraces(
             trace ->

instrumentation/rocketmq/rocketmq-client-5.0/javaagent/src/test/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java

@@ -123,7 +123,7 @@ void tearDown() throws IOException {
   }
 
   @Test
-  void testSendAndConsumeNormalMessage() throws Throwable {
+  void testSendAndConsumeNormalMessage() throws ClientException {
     String[] keys = new String[] {"yourMessageKey-0", "yourMessageKey-1"};
     byte[] body = "foobar".getBytes(UTF_8);
     Message message =
@@ -138,7 +138,8 @@ void testSendAndConsumeNormalMessage() throws Throwable {
     SendReceipt sendReceipt =
         testing()
             .runWithSpan(
-                "parent", (ThrowingSupplier<SendReceipt, Throwable>) () -> producer.send(message));
+                "parent",
+                (ThrowingSupplier<SendReceipt, ClientException>) () -> producer.send(message));
     AtomicReference<SpanData> sendSpanData = new AtomicReference<>();
     testing()
         .waitAndAssertSortedTraces(
@@ -173,7 +174,7 @@ void testSendAndConsumeNormalMessage() throws Throwable {
   }
 
   @Test
-  void testSendAsyncMessage() throws Exception {
+  void testSendAsyncMessage() {
     String[] keys = new String[] {"yourMessageKey-0", "yourMessageKey-1"};
     byte[] body = "foobar".getBytes(UTF_8);
     Message message =
@@ -196,7 +197,7 @@ void testSendAsyncMessage() throws Exception {
                             (result, throwable) -> {
                               testing().runWithSpan("child", () -> {});
                             })
-                        .get());
+                        .join());
     AtomicReference<SpanData> sendSpanData = new AtomicReference<>();
     testing()
         .waitAndAssertSortedTraces(
@@ -232,7 +233,7 @@ void testSendAsyncMessage() throws Exception {
   }
 
   @Test
-  void testSendAndConsumeFifoMessage() throws Throwable {
+  void testSendAndConsumeFifoMessage() throws ClientException {
     String[] keys = new String[] {"yourMessageKey-0", "yourMessageKey-1"};
     byte[] body = "foobar".getBytes(UTF_8);
     String messageGroup = "yourMessageGroup";
@@ -249,7 +250,8 @@ void testSendAndConsumeFifoMessage() throws Throwable {
     SendReceipt sendReceipt =
         testing()
             .runWithSpan(
-                "parent", (ThrowingSupplier<SendReceipt, Throwable>) () -> producer.send(message));
+                "parent",
+                (ThrowingSupplier<SendReceipt, ClientException>) () -> producer.send(message));
     AtomicReference<SpanData> sendSpanData = new AtomicReference<>();
     testing()
         .waitAndAssertSortedTraces(
@@ -286,7 +288,7 @@ void testSendAndConsumeFifoMessage() throws Throwable {
   }
 
   @Test
-  void testSendAndConsumeDelayMessage() throws Throwable {
+  void testSendAndConsumeDelayMessage() throws ClientException {
     String[] keys = new String[] {"yourMessageKey-0", "yourMessageKey-1"};
     byte[] body = "foobar".getBytes(UTF_8);
     long deliveryTimestamp = System.currentTimeMillis();
@@ -303,7 +305,8 @@ void testSendAndConsumeDelayMessage() throws Throwable {
     SendReceipt sendReceipt =
         testing()
             .runWithSpan(
-                "parent", (ThrowingSupplier<SendReceipt, Throwable>) () -> producer.send(message));
+                "parent",
+                (ThrowingSupplier<SendReceipt, ClientException>) () -> producer.send(message));
     AtomicReference<SpanData> sendSpanData = new AtomicReference<>();
     testing()
         .waitAndAssertSortedTraces(
@@ -340,7 +343,7 @@ void testSendAndConsumeDelayMessage() throws Throwable {
   }
 
   @Test
-  void testCapturedMessageHeaders() throws Throwable {
+  void testCapturedMessageHeaders() throws ClientException {
     String[] keys = new String[] {"yourMessageKey-0", "yourMessageKey-1"};
     byte[] body = "foobar".getBytes(UTF_8);
     Message message =
@@ -356,7 +359,8 @@ void testCapturedMessageHeaders() throws Throwable {
     SendReceipt sendReceipt =
         testing()
             .runWithSpan(
-                "parent", (ThrowingSupplier<SendReceipt, Throwable>) () -> producer.send(message));
+                "parent",
+                (ThrowingSupplier<SendReceipt, ClientException>) () -> producer.send(message));
     AtomicReference<SpanData> sendSpanData = new AtomicReference<>();
     testing()
         .waitAndAssertSortedTraces(

instrumentation/rocketmq/rocketmq-client-5.0/metadata.yaml

@@ -7,12 +7,14 @@ semantic_conventions:
 library_link: https://rocketmq.apache.org/
 configurations:
   - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
+    declarative_name: java.common.messaging.receive_telemetry/development.enabled
     description: >
       Enables experimental receive telemetry, which will cause consumers to start a new trace, with
       only a span link connecting it to the producer trace.
     type: boolean
     default: false
   - name: otel.instrumentation.messaging.experimental.capture-headers
+    declarative_name: java.common.messaging.capture_headers/development
     description: >
       Enables capturing messaging headers as span attributes. Provide a comma-separated list of
       header names to capture.

instrumentation/runtime-telemetry/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarDetails.java

@@ -161,13 +161,15 @@ String packageDescription() {
 
     Attributes mainAttributes = manifest.getMainAttributes();
     String name = mainAttributes.getValue(Attributes.Name.IMPLEMENTATION_TITLE);
-    String description = mainAttributes.getValue(Attributes.Name.IMPLEMENTATION_VENDOR);
+    String vendor = mainAttributes.getValue(Attributes.Name.IMPLEMENTATION_VENDOR);
 
-    String packageDescription = name;
-    if (description != null && !description.isEmpty()) {
-      packageDescription += " by " + description;
+    if (name == null || name.isEmpty()) {
+      return vendor == null || vendor.isEmpty() ? null : vendor;
     }
-    return packageDescription;
+    if (vendor == null || vendor.isEmpty()) {
+      return name;
+    }
+    return name + " by " + vendor;
   }
 
   /** Returns the SHA1 hash of this file, e.g. {@code 30d16ec2aef6d8094c5e2dce1d95034ca8b6cb42}. */
@@ -181,7 +183,7 @@ private String computeDigest(MessageDigest md) throws IOException {
       byte[] buffer = new byte[8192];
       while (dis.read(buffer) != -1) {}
       byte[] digest = md.digest();
-      return new BigInteger(1, digest).toString(16);
+      return String.format(Locale.ROOT, "%040x", new BigInteger(1, digest));
     }
   }
 

instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarAnalyzerInstallerTest.java

@@ -48,7 +48,8 @@ void jarAnalyzerEnabled() {
                     .containsEntry("package.type", "jar")
                     .containsEntry("package.checksum_algorithm", "SHA1")
                     .hasEntrySatisfying(
-                        stringKey("package.checksum"), value -> assertThat(value).isNotNull())
+                        stringKey("package.checksum"),
+                        value -> assertThat(value).matches("[0-9a-f]{40}"))
                     .hasEntrySatisfying(
                         stringKey("package.path"), value -> assertThat(value).isNotNull())
                     .satisfies(

instrumentation/runtime-telemetry/testing/build.gradle.kts

@@ -11,7 +11,6 @@ dependencies {
 
   // Bring in various archives to test introspection logic
   testImplementation("io.opentelemetry:opentelemetry-api")
-  testImplementation("io.opentelemetry:opentelemetry-api-incubator")
   testImplementation("org.springframework:spring-webmvc:3.1.0.RELEASE")
   testImplementation("com.google.guava:guava")
 }

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingObserver.java

@@ -111,7 +111,7 @@ private static Field getQueueDisposableField() {
     return queueDisposableField;
   }
 
-  public static boolean canEnable() {
+  static boolean canEnable() {
     return queueDisposableField != null;
   }
 }

instrumentation/rxjava/rxjava-2.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategyTest.java

@@ -45,8 +45,8 @@
 class RxJava2AsyncOperationEndStrategyTest {
   private static final AttributeKey<Boolean> CANCELED_ATTRIBUTE_KEY =
       AttributeKey.booleanKey("rxjava.canceled");
-  @Mock Instrumenter<String, String> instrumenter;
-  @Mock Span span;
+  @Mock private Instrumenter<String, String> instrumenter;
+  @Mock private Span span;
   private final AsyncOperationEndStrategy underTest = RxJava2AsyncOperationEndStrategy.create();
   private final RxJava2AsyncOperationEndStrategy underTestWithExperimentalAttributes =
       RxJava2AsyncOperationEndStrategy.builder().setCaptureExperimentalSpanAttributes(true).build();

instrumentation/rxjava/rxjava-2.0/library/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2SubscriptionTest.java

@@ -12,9 +12,9 @@
 
 class RxJava2SubscriptionTest extends AbstractRxJava2SubscriptionTest {
   @RegisterExtension
-  static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
+  private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
 
-  static final TracingAssembly tracingAssembly = TracingAssembly.create();
+  private static final TracingAssembly tracingAssembly = TracingAssembly.create();
 
   @Override
   protected InstrumentationExtension testing() {