Merge branch 'main' into fix-doc-audit

Author: jaydeluca

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.21.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.22.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.21.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-javaagent.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.20.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.21.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.20.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.21.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

@@ -31,5 +31,7 @@ tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.rabbitmq.experimental-span-attributes=true")
   jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
 
+  systemProperty("testLatestDeps", findProperty("testLatestDeps") ?: "false")
+
   usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 }

instrumentation/rabbitmq-2.7/javaagent/build.gradle.kts

@@ -5,25 +5,32 @@
 
 package io.opentelemetry.javaagent.instrumentation.rabbitmq;
 
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.RABBITMQ;
+import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import reactor.rabbitmq.ExchangeSpecification;
 import reactor.rabbitmq.RabbitFlux;
 import reactor.rabbitmq.Sender;
 import reactor.rabbitmq.SenderOptions;
 
+@DisabledIfSystemProperty(
+    named = "testLatestDeps",
+    matches = "true",
+    disabledReason =
+        "reactor-rabbitmq 1.5.6 (and earlier) still calls `void useNio()` which was removed in 5.27.0")
 class ReactorRabbitMqTest extends AbstractRabbitMqTest {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
@@ -33,33 +40,24 @@ void testShouldNotFailDeclaringExchange() {
     Sender sender =
         RabbitFlux.createSender(new SenderOptions().connectionFactory(connectionFactory));
 
-    try {
-      sender.declareExchange(ExchangeSpecification.exchange("testExchange")).block();
-    } catch (RuntimeException e) {
-      Assertions.fail("Should not fail declaring exchange", e);
-    }
+    sender.declareExchange(ExchangeSpecification.exchange("testExchange")).block();
 
     testing.waitAndAssertTraces(
         trace ->
             trace.hasSpansSatisfyingExactly(
-                span -> {
-                  span.hasName("exchange.declare")
-                      .hasKind(SpanKind.CLIENT)
-                      .hasAttribute(MESSAGING_SYSTEM, "rabbitmq")
-                      .hasAttribute(AttributeKey.stringKey("rabbitmq.command"), "exchange.declare")
-                      .hasAttributesSatisfying(
-                          attributes ->
-                              assertThat(attributes)
-                                  .satisfies(
-                                      attrs -> {
-                                        String peerAddr = attrs.get(NETWORK_PEER_ADDRESS);
-                                        assertThat(peerAddr).isIn(rabbitMqIp, null);
-
-                                        String networkType = attrs.get(NETWORK_TYPE);
-                                        assertThat(networkType).isIn("ipv4", "ipv6", null);
-
-                                        assertNotNull(attrs.get(NETWORK_PEER_PORT));
-                                      }));
-                }));
+                span ->
+                    span.hasName("exchange.declare")
+                        .hasKind(SpanKind.CLIENT)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(MESSAGING_SYSTEM, RABBITMQ),
+                            equalTo(stringKey("rabbitmq.command"), "exchange.declare"),
+                            satisfies(
+                                NETWORK_PEER_ADDRESS,
+                                addr -> addr.satisfies(a -> assertThat(a).isIn(rabbitMqIp, null))),
+                            satisfies(
+                                NETWORK_TYPE,
+                                type ->
+                                    type.satisfies(t -> assertThat(t).isIn("ipv4", "ipv6", null))),
+                            satisfies(NETWORK_PEER_PORT, port -> assertThat(port).isNotNull()))));
   }
 }

instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java

@@ -14,5 +14,9 @@ muzzle {
 }
 
 dependencies {
-  compileOnly("org.springframework:spring-web:3.1.0.RELEASE")
+  library("org.springframework:spring-web:3.1.0.RELEASE")
+
+  testInstrumentation(project(":instrumentation:http-url-connection:javaagent"))
+
+  latestDepTestLibrary("org.springframework:spring-web:5.+") // see spring-web-6.0 module
 }

instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.web;
+package io.opentelemetry.javaagent.instrumentation.springweb.v3_1;
 
 import static java.util.Collections.singletonList;
 
@@ -23,7 +23,7 @@
 import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
 
-public class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<String>> {
+class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<String>> {
 
   @RegisterExtension
   static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();