Fix autoconfigure for spring boot 3 (#7784)

See #7312
open-telemetry · Feb 13, 2023 · 54d7241 · 54d7241
1 parent 13d5246
commit 54d7241
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
@@ -19,6 +19,8 @@ dependencies {
   implementation(project(":instrumentation:spring:spring-kafka-2.7:library"))
   implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
   implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library"))
+  implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library"))
+  compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
   implementation(project(":instrumentation:spring:spring-webflux-5.0:library"))
   implementation(project(":instrumentation:micrometer:micrometer-1.5:library"))
 

diff --git a/...ntelemetry/instrumentation/spring/autoconfigure/webmvc/WebMvcFilterAutoConfiguration.java b/...ntelemetry/instrumentation/spring/autoconfigure/webmvc/WebMvcFilterAutoConfiguration.java
@@ -21,7 +21,7 @@
 @Configuration
 @EnableConfigurationProperties(WebMvcProperties.class)
 @ConditionalOnProperty(prefix = "otel.springboot.web", name = "enabled", matchIfMissing = true)
-@ConditionalOnClass({OncePerRequestFilter.class, DispatcherServlet.class})
+@ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
 @ConditionalOnBean(OpenTelemetry.class)
 public class WebMvcFilterAutoConfiguration {
 

diff --git a/...try/instrumentation/spring/autoconfigure/webmvc/WebMvcFilterAutoConfigurationSpring6.java b/...try/instrumentation/spring/autoconfigure/webmvc/WebMvcFilterAutoConfigurationSpring6.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.webmvc;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.webmvc.v6_0.SpringWebMvcTelemetry;
+import jakarta.servlet.Filter;
+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.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.servlet.DispatcherServlet;
+
+/** Configures {@link SpringWebMvcTelemetry} for tracing. */
+@Configuration
+@EnableConfigurationProperties(WebMvcProperties.class)
+@ConditionalOnProperty(prefix = "otel.springboot.web", name = "enabled", matchIfMissing = true)
+@ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
+@ConditionalOnBean(OpenTelemetry.class)
+public class WebMvcFilterAutoConfigurationSpring6 {
+
+  @Bean
+  public Filter otelWebMvcInstrumentationFilter(OpenTelemetry openTelemetry) {
+    return SpringWebMvcTelemetry.create(openTelemetry).createServletFilter();
+  }
+}