Merge pull request #1996 from cloudfoundry/dependabot/maven/assets/spring-sleuth/develop/org.springframework.boot-spring-boot-starter-parent-4.1.0

build(deps): bump org.springframework.boot:spring-boot-starter-parent from 3.4.5 to 4.1.0 in /assets/spring-sleuth

Author: jochenehret

.github/workflows/build-spring-sleuth-jar.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
           cache: maven
 
       - name: Build jar with Maven

assets/spring-sleuth/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.5</version>
+    <version>4.1.0</version>
     <relativePath/>
   </parent>
 
@@ -17,7 +17,7 @@
   <description>Modern tracing sample replacing legacy Spring Cloud Sleuth SpanAccessor usage</description>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
   </properties>
 
   <dependencies>
@@ -30,8 +30,8 @@
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-tracing-bridge-otel</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-micrometer-tracing-opentelemetry</artifactId>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
@@ -42,6 +42,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

assets/spring-sleuth/src/test/java/hello/HelloControllerTest.java

@@ -7,8 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
@@ -21,11 +21,10 @@ class HelloControllerTest {
     @Test
     void returnsTraceAndSpanDetailsAndParentFromTraceparent() throws Exception {
         mvc.perform(get("/")
-                .header("traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"))
-            .andExpect(status().isOk())
-            .andExpect(content().string(containsString("current span: [Trace:")))
-            .andExpect(content().string(containsString("Span:")))
-            .andExpect(content().string(containsString("parents: [00f067aa0ba902b7]")));
+                        .header("traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"))
+                .andExpect(status().isOk())
+                .andExpect(content().string(containsString("current span: [Trace:")))
+                .andExpect(content().string(containsString("Span:")))
+                .andExpect(content().string(containsString("parents: [00f067aa0ba902b7]")));
     }
-}
-
+}

assets/spring-sleuth/target/spring-sleuth-0.0.1.jar

@@ -214,7 +214,7 @@ func RoutingIsolationSegmentsDescribe(description string, callback func()) bool
 }
 
 func ZipkinDescribe(description string, callback func()) bool {
-	return Describe("[routing]", func() {
+	return Describe("[zipkin]", func() {
 		BeforeEach(func() {
 			if !Config.GetIncludeRouting() {
 				Skip(skip_messages.SkipRoutingMessage)

cats_suite_helpers/cats_suite_helpers.go

@@ -31,8 +31,16 @@ var _ = ZipkinDescribe("Zipkin Tracing", func() {
 			"-b", Config.GetJavaBuildpackName(),
 			"-m", "1024M",
 			"-p", assetPath,
+			"--no-start",
 			"-t", "120",
-		).Wait(CF_JAVA_TIMEOUT)).To(gexec.Exit(0))
+		).Wait(Config.CfPushTimeoutDuration())).To(gexec.Exit(0))
+
+		Expect(cf.Cf(
+			"set-env", appName,
+			"JBP_CONFIG_OPEN_JDK_JRE", `{ jre: { version: 21.+ } }`,
+		).Wait()).To(gexec.Exit(0))
+
+		Expect(cf.Cf("start", appName).Wait(CF_JAVA_TIMEOUT)).To(gexec.Exit(0))
 	})
 
 	AfterEach(func() {