Spring rest client

instrumentation/spring/spring-boot-autoconfigure-3/README.md

@@ -0,0 +1,7 @@
+# Why do we need a separate module for Spring Boot 3 auto-configuration?
+
+`RestClientInstrumentationAutoConfiguration` imports `RestClientCustomizer`,
+which is part of Spring Boot 3 (rather than Spring framework).
+
+If we were to include this in the `spring-boot-autoconfigure` module, we would have to
+bump the Spring Boot version to 3, which would break compatibility with Spring Boot 2.

instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+  id("otel.library-instrumentation")
+}
+
+// Name the Spring Boot modules in accordance with https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.developing-auto-configuration.custom-starter
+base.archivesName.set("opentelemetry-spring-boot-3")
+group = "io.opentelemetry.instrumentation"
+
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+}
+
+dependencies {
+  val springBootVersion = "3.2.4"
+  library("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+  compileOnly(project(":instrumentation:spring:spring-boot-autoconfigure"))
+  implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
+
+  testLibrary("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
+    exclude("org.junit.vintage", "junit-vintage-engine")
+  }
+}

instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestClientBeanPostProcessor.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.web.client.RestClient;
+
+public final class RestClientBeanPostProcessor implements BeanPostProcessor {
+
+  private final ObjectProvider<OpenTelemetry> openTelemetryProvider;
+
+  public RestClientBeanPostProcessor(ObjectProvider<OpenTelemetry> openTelemetryProvider) {
+    this.openTelemetryProvider = openTelemetryProvider;
+  }
+
+  @Override
+  public Object postProcessAfterInitialization(Object bean, String beanName) {
+    if (bean instanceof RestClient restClient) {
+      return addRestClientInterceptorIfNotPresent(restClient, openTelemetryProvider.getObject());
+    }
+    return bean;
+  }
+
+  private static RestClient addRestClientInterceptorIfNotPresent(
+      RestClient restClient, OpenTelemetry openTelemetry) {
+    ClientHttpRequestInterceptor instrumentationInterceptor =
+        SpringWebTelemetry.create(openTelemetry).newInterceptor();
+
+    return restClient
+        .mutate()
+        .requestInterceptors(
+            interceptors -> {
+              if (interceptors.stream()
+                  .noneMatch(
+                      interceptor ->
+                          interceptor.getClass() == instrumentationInterceptor.getClass())) {
+                interceptors.add(0, instrumentationInterceptor);
+              }
+            })
+        .build();
+  }
+}

instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestClientInstrumentationAutoConfiguration.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
+import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
+import org.springframework.boot.web.client.RestClientCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestClient;
+
+/**
+ * Configures {@link RestClient} for tracing.
+ *
+ * <p>Adds Open Telemetry instrumentation to {@link RestClient} beans after initialization
+ */
+@ConditionalOnBean(OpenTelemetry.class)
+@ConditionalOnProperty(name = "otel.instrumentation.spring-web.enabled", matchIfMissing = true)
+@ConditionalOnClass(RestClient.class)
+@Conditional(SdkEnabled.class)
+@AutoConfiguration(after = RestClientAutoConfiguration.class)
+@Configuration
+public class RestClientInstrumentationAutoConfiguration {
+
+  @Bean
+  RestClientBeanPostProcessor otelRestClientBeanPostProcessor(
+      ObjectProvider<OpenTelemetry> openTelemetryProvider) {
+    return new RestClientBeanPostProcessor(openTelemetryProvider);
+  }
+
+  @Bean
+  RestClientCustomizer otelRestClientCustomizer(
+      ObjectProvider<OpenTelemetry> openTelemetryProvider) {
+    return builder ->
+        builder.requestInterceptor(
+            SpringWebTelemetry.create(openTelemetryProvider.getObject()).newInterceptor());
+  }
+}

instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web.RestClientInstrumentationAutoConfiguration

instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web.RestClientInstrumentationAutoConfiguration

instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.OpenTelemetry;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.web.client.RestClient;
+
+class RestClientInstrumentationAutoConfigurationTest {
+
+  private final ApplicationContextRunner contextRunner =
+      new ApplicationContextRunner()
+          .withBean(OpenTelemetry.class, OpenTelemetry::noop)
+          .withBean(RestClient.class, RestClient::create)
+          .withConfiguration(
+              AutoConfigurations.of(RestClientInstrumentationAutoConfiguration.class));
+
+  /**
+   * Tests the case that users create a {@link RestClient} bean themselves.
+   *
+   * <pre>{@code
+   * @Bean public RestClient restClient() {
+   *     return new RestClient();
+   * }
+   * }</pre>
+   */
+  @Test
+  void instrumentationEnabled() {
+    contextRunner
+        .withPropertyValues("otel.instrumentation.spring-web.enabled=true")
+        .run(
+            context -> {
+              assertThat(
+                      context.getBean(
+                          "otelRestClientBeanPostProcessor", RestClientBeanPostProcessor.class))
+                  .isNotNull();
+
+              context
+                  .getBean(RestClient.class)
+                  .mutate()
+                  .requestInterceptors(
+                      interceptors -> {
+                        long count =
+                            interceptors.stream()
+                                .filter(
+                                    rti ->
+                                        rti.getClass()
+                                            .getName()
+                                            .startsWith("io.opentelemetry.instrumentation"))
+                                .count();
+                        assertThat(count).isEqualTo(1);
+                      });
+            });
+  }
+
+  @Test
+  void instrumentationDisabled() {
+    contextRunner
+        .withPropertyValues("otel.instrumentation.spring-web.enabled=false")
+        .run(
+            context ->
+                assertThat(context.containsBean("otelRestClientBeanPostProcessor")).isFalse());
+  }
+
+  @Test
+  void defaultConfiguration() {
+    contextRunner.run(
+        context ->
+            assertThat(
+                    context.getBean(
+                        "otelRestClientBeanPostProcessor", RestClientBeanPostProcessor.class))
+                .isNotNull());
+  }
+}

instrumentation/spring/starters/spring-boot-starter/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
   api("org.springframework.boot:spring-boot-starter:$springBootVersion")
   api("org.springframework.boot:spring-boot-starter-aop:$springBootVersion")
   api(project(":instrumentation:spring:spring-boot-autoconfigure"))
+  api(project(":instrumentation:spring:spring-boot-autoconfigure-3"))
   api(project(":instrumentation-annotations"))
   implementation(project(":instrumentation:resources:library"))
   implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")

settings.gradle.kts

@@ -513,6 +513,7 @@ include(":instrumentation:spark-2.3:javaagent")
 include(":instrumentation:spring:spring-batch-3.0:javaagent")
 include(":instrumentation:spring:spring-boot-actuator-autoconfigure-2.0:javaagent")
 include(":instrumentation:spring:spring-boot-autoconfigure")
+include(":instrumentation:spring:spring-boot-autoconfigure-3")
 include(":instrumentation:spring:spring-boot-resources:javaagent")
 include(":instrumentation:spring:spring-boot-resources:javaagent-unit-tests")
 include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.0:javaagent")

smoke-tests-otel-starter/src/main/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTestController.java

@@ -13,29 +13,30 @@
 import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestTemplate;
 
 @RestController
 public class OtelSpringStarterSmokeTestController {
 
   public static final String PING = "/ping";
+  public static final String REST_CLIENT = "/rest-client";
   public static final String REST_TEMPLATE = "/rest-template";
   public static final String TEST_HISTOGRAM = "histogram-test-otel-spring-starter";
   private final LongHistogram histogram;
   private final Optional<RestTemplate> restTemplate;
+  private final Optional<RestClient> restClient;
 
   public OtelSpringStarterSmokeTestController(
       OpenTelemetry openTelemetry,
+      RestClient.Builder restClientBuilder,
       RestTemplateBuilder restTemplateBuilder,
       Optional<ServletWebServerApplicationContext> server) {
     Meter meter = openTelemetry.getMeter(OtelSpringStarterSmokeTestApplication.class.getName());
     histogram = meter.histogramBuilder(TEST_HISTOGRAM).ofLongs().build();
-    restTemplate =
-        server.map(
-            s ->
-                restTemplateBuilder
-                    .rootUri("http://localhost:" + s.getWebServer().getPort())
-                    .build());
+    Optional<String> rootUri = server.map(s -> "http://localhost:" + s.getWebServer().getPort());
+    restClient = rootUri.map(uri -> restClientBuilder.baseUrl(uri).build());
+    restTemplate = rootUri.map(uri -> restTemplateBuilder.rootUri(uri).build());
   }
 
   @GetMapping(PING)
@@ -44,10 +45,17 @@ public String ping() {
     return "pong";
   }
 
+  @GetMapping(REST_CLIENT)
+  public String restClient() {
+    return restClient
+        .map(c -> c.get().uri(PING).retrieve().body(String.class))
+        .orElseThrow(() -> new IllegalStateException("RestClient not available"));
+  }
+
   @GetMapping(REST_TEMPLATE)
   public String restTemplate() {
     return restTemplate
-        .map(t -> t.getForObject("/ping", String.class))
+        .map(t -> t.getForObject(PING, String.class))
         .orElseThrow(() -> new IllegalStateException("RestTemplate not available"));
   }
 }

smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java

@@ -259,10 +259,19 @@ void shouldSendTelemetry() {
 
   @Test
   @org.junit.jupiter.api.Order(2)
-  void restTemplateClient() {
+  void restTemplate() {
+    assertClient(OtelSpringStarterSmokeTestController.REST_TEMPLATE);
+  }
+
+  @Test
+  void restClient() {
+    assertClient(OtelSpringStarterSmokeTestController.REST_CLIENT);
+  }
+
+  private void assertClient(String url) {
     resetExporters(); // ignore the telemetry from application startup
 
-    testRestTemplate.getForObject(OtelSpringStarterSmokeTestController.REST_TEMPLATE, String.class);
+    testRestTemplate.getForObject(url, String.class);
 
     TracesAssert.assertThat(expectSpans(4))
         .hasTracesSatisfyingExactly(
@@ -272,13 +281,11 @@ void restTemplateClient() {
                         clientSpan
                             .hasKind(SpanKind.CLIENT)
                             .hasAttributesSatisfying(
-                                a ->
-                                    assertThat(a.get(UrlAttributes.URL_FULL))
-                                        .endsWith("/rest-template")),
+                                a -> assertThat(a.get(UrlAttributes.URL_FULL)).endsWith(url)),
                     serverSpan ->
                         serverSpan
                             .hasKind(SpanKind.SERVER)
-                            .hasAttribute(HttpAttributes.HTTP_ROUTE, "/rest-template"),
+                            .hasAttribute(HttpAttributes.HTTP_ROUTE, url),
                     nestedClientSpan ->
                         nestedClientSpan
                             .hasKind(SpanKind.CLIENT)