[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

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

...t-4/src/test/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java

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

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?

zeitlinger · 2025-12-01T09:58:16Z

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

 */
 @ConditionalOnClass({MongoClientSettings.class, MongoClientSettingsBuilderCustomizer.class})
 @ConditionalOnEnabledInstrumentation(module = "mongo")
-@ConditionalOnMissingClass(


why is this not needed anymore?

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

laurit · 2025-12-01T12:39:33Z

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

+                  JdbcInstrumentationSpringBoot4AutoConfiguration.class,
+                  DataSourceAutoConfiguration.class))


since only there 2 lines are different perhaps it would make sense to introduce a testing module and share code for these tests? idk maybe other tests required more changes.

yeah - I think that could work

laurit · 2025-12-01T12:45:33Z

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

+
+    // Exclude Spring Boot specific tests from compilation when testLatestDeps is true
+    // These tests are covered by testSpring4 suite
+    if (latestDepTest) {


Sometimes when we have a separate suite for new version we limit the latest dep in base version to 1.+ and in version 2 suite either set the version to 2.0 or latest.release depending on the latest dep flag. Would that also work here? Or maybe it would help if these tests were moved to a separate suite and the main test directory would only contain tests that work on all versions?

zeitlinger · 2025-12-01T13:07:25Z

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

+import org.testcontainers.utility.DockerImageName;
+
+@DisabledInNativeImage // See GraalVmNativeKafkaSpringStarterSmokeTest for the GraalVM native test
+class KafkaSpringStarterSmokeTest extends AbstractKafkaSpringStarterSmokeTest {


should be able to extend AbstractJvmKafkaSpringStarterSmokeTest if the auto config class is passed to ctor or can be overridden

(same for mongo)

zeitlinger · 2025-12-01T13:09:59Z

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

+
+    // JFR based metrics
+    for (String metric :
+        List.of(


I think we can also extract a superclass here to avoid the duplication

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

jaydeluca added 2 commits November 28, 2025 14:34

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

9ce1a80

fix comment line breaks

d17fed1

jaydeluca marked this pull request as ready for review November 28, 2025 20:24

jaydeluca requested a review from a team as a code owner November 28, 2025 20:24

jaydeluca commented Nov 28, 2025

View reviewed changes

...configure/internal/instrumentation/jdbc/JdbcInstrumentationSpringBoot4AutoConfiguration.java Show resolved Hide resolved

...t-4/src/test/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java Outdated Show resolved Hide resolved

jaydeluca changed the title ~~[Spring Starter] Spring boot 4 support (WIP)~~ [Spring Starter] Spring boot 4 support Nov 28, 2025

zeitlinger reviewed Nov 28, 2025

View reviewed changes

...configure/internal/instrumentation/jdbc/JdbcInstrumentationSpringBoot4AutoConfiguration.java Outdated Show resolved Hide resolved

jaydeluca added 2 commits November 29, 2025 08:02

switch to using conditionalOnClass

36c991a

abstract incompatible class

10fef8c

zeitlinger reviewed Dec 1, 2025

View reviewed changes

laurit reviewed Dec 1, 2025

View reviewed changes

zeitlinger reviewed Dec 1, 2025

View reviewed changes

		JdbcInstrumentationSpringBoot4AutoConfiguration.class,
		DataSourceAutoConfiguration.class))

[Spring Starter] Spring boot 4 support #15459

Are you sure you want to change the base?

[Spring Starter] Spring boot 4 support #15459

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!

Uh oh!

Uh oh!

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!

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!

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!

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