[Spring Starter] Spring boot 4 support #15459

jaydeluca · 2025-11-26T13:16:43Z

Related to #14906

Notes:

it seems that native graal spring boot 4 apps only work with java 25, so I've limited the graal smoke tests to 25+

I tried to avoid as much duplication as I could, If anyone has suggestions on areas to revisit, I can try again

George-C-Odes · 2025-11-26T13:41:58Z

Would that resolve the missing metrics going to mimir on spring boot 4 setup using the java agent @jaydeluca ?
Do you have an ETA?

jaydeluca · 2025-11-26T13:43:16Z

@George-C-Odes there is no ETA, im working on this as I can.

jaydeluca · 2025-11-26T13:50:14Z

my goal is to get this all completed before the next release 🤞. This is just the spring boot starter, there are still other javaagent instrumentations that need to be fixed too

…entelemetry-java-instrumentation into spring-boot-4-autoconfigure

zeitlinger

great to see that the code size is getting smaller now 😄

zeitlinger · 2025-12-01T09:55:33Z

...spring/autoconfigure/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java

 @ConditionalOnBean({DataSource.class})
-@ConditionalOnMissingClass(
-    "org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration") // Spring Boot 4+
+@ConditionalOnClass(DataSourceAutoConfiguration.class)


can you add a comment back? e.g. "removed in Spring Boot 4"

...utoconfigure/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java

zeitlinger · 2025-12-01T09:57:38Z

...configure/internal/instrumentation/jdbc/JdbcInstrumentationSpringBoot4AutoConfiguration.java

 @Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingClass(
-    "org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration") // Spring Boot 2 & 3
+@ConditionalOnClass(DataSourceAutoConfiguration.class)


condition looks identical to boot 3

zeitlinger · 2025-12-01T09:57:59Z

...nfigure/internal/instrumentation/kafka/KafkaInstrumentationSpringBoot4AutoConfiguration.java

  DefaultKafkaProducerFactoryCustomizer.class
 })
 @ConditionalOnMissingBean(name = "otelKafkaProducerFactoryCustomizer")
-@ConditionalOnMissingClass(


why not needed anymore?

...e/internal/instrumentation/mongo/MongoClientInstrumentationSpringBoot4AutoConfiguration.java

zeitlinger · 2025-12-01T09:59:38Z

...mmon/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

-  @Autowired private RestTemplateBuilder restTemplateBuilder;
  @Autowired private JdbcTemplate jdbcTemplate;

+  abstract void makeClientCall();


laurit · 2025-12-01T12:29:38Z

...configure/internal/instrumentation/jdbc/JdbcInstrumentationSpringBoot4AutoConfiguration.java

+  public JdbcInstrumentationSpringBoot4AutoConfiguration() {}
+
+  @Bean
+  // static to avoid "is not eligible for getting processed by all BeanPostProcessors" warning


Not really for this PR but I suspect that (proxyBeanMethods = false) has the same effect as making the method static. If I remember correctly the warning was triggered by proxying the configuration class methods.

I think you're right - that would be a nice follow-up PR

laurit · 2025-12-01T12:35:21Z

...nfigure/internal/instrumentation/kafka/KafkaInstrumentationSpringBoot4AutoConfiguration.java

+  @Bean
+  DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
+      OpenTelemetry openTelemetry) {
+    KafkaTelemetry kafkaTelemetry = KafkaTelemetry.create(openTelemetry);
+    return producerFactory -> producerFactory.addPostProcessor(kafkaTelemetry::wrap);
+  }


actually only this bean is different for spring boot 4. Wondering whether it would make sense to move this bean into separate (maybe nested?) configuration class so that the other beans wouldn't need to be copy-pasted. Or is that too much effort?

the imports are also different for the others

...ng/autoconfigure/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfigurationTest.java

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

...ring-boot-4/src/test/java/io/opentelemetry/spring/smoketest/KafkaSpringStarterSmokeTest.java

...pring-boot-4/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

…sertions

laurit · 2025-12-03T08:42:00Z

...ring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java

        () -> getTelemetry(openTelemetryProvider, configProvider));
  }
+
+  @ConditionalOnClass(DefaultKafkaProducerFactoryCustomizer.class)


Do you also need to add @ConditionalOnEnabledInstrumentation(module = "kafka") here or is it somehow automatically inherited from the outer class?
Imo the way it is now pushing this into a nested configuration class doesn't make sense. If you'd remove DefaultKafkaProducerFactoryCustomizer condition from the outer class and only leave it on the inner class then the outer class could also be used for spring boot 4 and you'd only need to provide a spring boot 4 version of what the inner class does.

is it somehow automatically inherited from the outer class?

yes

Imo the way it is now pushing this into a nested configuration class doesn't make sense

agree - does it work if you inline the bean method?

laurit · 2025-12-03T08:42:17Z

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.22.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against 


is this correct?

i'm still trying to figure this out. the build is failing for this

Run # need to "git add" in case any generated files did not already exist
Diff detected - did you run './gradlew jApiCmp'?
docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
index 7e15cee7..9dfa3287 100644
--- a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
+++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.22.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against
No changes.
\ No newline at end of file

and when i run ./gradlew :instrumentation:spring:spring-boot-autoconfigure:jApiCmp or ./gradlew jApiCmp I get the same result.

did you try deleting the file and rebasing against main?

I'll fix it for you

laurit · 2025-12-05T14:07:52Z

...nfigure/internal/instrumentation/kafka/KafkaInstrumentationSpringBoot4AutoConfiguration.java

+    // Spring Boot 2 & 3
+    "org.springframework.boot.autoconfigure.kafka.DefaultKafkaProducerFactoryCustomizer")
+@Configuration
+public class KafkaInstrumentationSpringBoot4AutoConfiguration {


is this class still needed? Tests pass without it.

laurit · 2025-12-05T14:26:03Z

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

    exclude("ch.qos.logback", "logback-classic")
  }
+  // testSpring2: configure Spring Boot 3.x dependencies for latest dep testing
+  if (name == "testSpring2Implementation") {


since this does not involve any latest dep checks this will bump the version to latest spring 3 even in regular tests?

jaydeluca added 4 commits November 25, 2025 16:16

autoconfigure and smoke

5b1236d

progress

38d6dc4

kafka

ba32a8d

kafka working

6c13ecb

github-actions bot added the test native This label can be applied to PRs to trigger them to run native tests label Nov 26, 2025

most things working

330cd89

jaydeluca force-pushed the spring-boot-4-autoconfigure branch from 0949e97 to 330cd89 Compare November 26, 2025 13:18

jaydeluca added 12 commits November 26, 2025 09:14

fix more tests, exclude tests from latestdeps

f100658

micrometer fix

9c6f987

add kafka test

79629d2

native and another micrometer issue

30d0e2c

fix codeql

be14d94

fix test on java 25

6757a63

Merge branch 'main' into spring-boot-4-autoconfigure

25b980b

ignore transient kafka startup errors

6562745

Merge branch 'spring-boot-4-autoconfigure' of github.com:jaydeluca/op…

7e75966

…entelemetry-java-instrumentation into spring-boot-4-autoconfigure

Merge branch 'main' into spring-boot-4-autoconfigure

f37f691

register both mongo configs

a37c8a5

more smoke test changes

a406382

jaydeluca mentioned this pull request Nov 27, 2025

Support Spring boot 4 #14906

Open

jaydeluca added 7 commits November 27, 2025 09:37

test fix

3113936

missing mongo

f86e06e

avoid using common to fix dependency issues

bc3519d

add propagators and app file

fcf6bce

only run native tests on java 25+

cbc8b1e

cleanup

1a83d20

cleanup

c2d5230

zeitlinger reviewed Dec 1, 2025

View reviewed changes

laurit reviewed Dec 1, 2025

View reviewed changes

...ng/autoconfigure/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfigurationTest.java Outdated Show resolved Hide resolved

laurit reviewed Dec 1, 2025

View reviewed changes

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts Outdated Show resolved Hide resolved

zeitlinger reviewed Dec 1, 2025

View reviewed changes

...ring-boot-4/src/test/java/io/opentelemetry/spring/smoketest/KafkaSpringStarterSmokeTest.java Outdated Show resolved Hide resolved

...pring-boot-4/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java Outdated Show resolved Hide resolved

jaydeluca added 8 commits December 1, 2025 20:19

start refactoring common test module

103cecb

finish common testing module

153195e

create spring 2 suite to avoid exlusions

e6a8ae4

refactor smoke tests to avoid duplication for kafka and mongo, jfr as…

7ac8f91

…sertions

further reduce test duplication

59994b7

fix

c7d5de8

add dependency

0a5806f

japi cmp

c8516d7

laurit reviewed Dec 3, 2025

View reviewed changes

jaydeluca added 4 commits December 3, 2025 12:56

fix kafka separation of configs

d88ceef

Merge branch 'main' into spring-boot-4-autoconfigure

e375143

revert jApiCmd

8f75f72

fix conditionals

fc726fe

laurit added this to the v2.23.0 milestone Dec 4, 2025

jaydeluca and others added 4 commits December 4, 2025 16:40

extending wrong test classes

0c6e263

Merge branch 'main' into spring-boot-4-autoconfigure

088b920

fix jApiCmp

3b18b94

update fossa configuration

24aac9a

laurit reviewed Dec 5, 2025

View reviewed changes

laurit and others added 2 commits December 5, 2025 16:58

review

879cdde

fix graal tests

41879d3

laurit approved these changes Dec 5, 2025

View reviewed changes

		@@ -1,2 +1,2 @@
		Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.22.0.jar
		Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against

[Spring Starter] Spring boot 4 support #15459

Are you sure you want to change the base?

[Spring Starter] Spring boot 4 support #15459

Uh oh!

Conversation

jaydeluca commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

George-C-Odes commented Nov 26, 2025

Uh oh!

jaydeluca commented Nov 26, 2025

Uh oh!

jaydeluca commented Nov 26, 2025

Uh oh!

zeitlinger left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zeitlinger Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

laurit Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jaydeluca commented Nov 26, 2025 •

edited

Loading

zeitlinger Dec 1, 2025 •

edited

Loading

laurit Dec 3, 2025 •

edited

Loading