diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-embedded-metrics-sdk/src/test/java/co/elastic/apm/agent/embeddedotel/EmbeddedSdkManagerTest.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-embedded-metrics-sdk/src/test/java/co/elastic/apm/agent/embeddedotel/EmbeddedSdkManagerTest.java
index 0dca26b609..13e828559d 100644
--- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-embedded-metrics-sdk/src/test/java/co/elastic/apm/agent/embeddedotel/EmbeddedSdkManagerTest.java
+++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-embedded-metrics-sdk/src/test/java/co/elastic/apm/agent/embeddedotel/EmbeddedSdkManagerTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package co.elastic.apm.agent.embeddedotel;
import co.elastic.apm.agent.embeddedotel.proxy.ProxyMeter;
diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
index 11190aca4c..c9437a3bbb 100644
--- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
+++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
@@ -20,7 +20,7 @@
org.springframework.boot
spring-boot-dependencies
- 3.4.0
+ 3.4.1
pom
import
diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
index 415ee0ce9f..d643275ddd 100644
--- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
+++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
@@ -23,7 +23,7 @@
org.springframework.boot
spring-boot-dependencies
- 3.4.0
+ 3.4.1
pom
import
diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java
index e8573ff2b5..b30ca5b06f 100644
--- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java
+++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java
@@ -19,7 +19,6 @@
package co.elastic.apm.agent.springwebflux;
import co.elastic.apm.agent.testutils.Java17OnlyTest;
-import org.junit.jupiter.api.BeforeEach;
public class Spring6ServerAnnotatedInstrumentationTest extends Java17OnlyTest {
@@ -28,10 +27,5 @@ public Spring6ServerAnnotatedInstrumentationTest() {
}
public static class Impl extends ServerAnnotatedInstrumentationTest {
-
- @BeforeEach
- void setUp() {
- expectedFrameworkVersion = "6.2.0";
- }
}
}
diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java
index 552cdab016..c593194b20 100644
--- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java
+++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java
@@ -19,7 +19,6 @@
package co.elastic.apm.agent.springwebflux;
import co.elastic.apm.agent.testutils.Java17OnlyTest;
-import org.junit.jupiter.api.BeforeEach;
public class Spring6ServerFunctionalInstrumentationTest extends Java17OnlyTest {
@@ -28,9 +27,5 @@ public Spring6ServerFunctionalInstrumentationTest() {
}
public static class Impl extends ServerFunctionalInstrumentationTest {
- @BeforeEach
- void setUp() {
- expectedFrameworkVersion = "6.2.0";
- }
}
}
diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java
index bbb72e829b..a62c7a2e4b 100644
--- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java
+++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java
@@ -18,15 +18,9 @@
*/
package co.elastic.apm.agent.springwebflux;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
@EnabledForJreRange(min = JRE.JAVA_17)
public class Spring6ServletContainerTest extends ServletContainerTest {
-
- @BeforeEach
- void setUp() {
- expectedFrameworkVersion = "6.2.0";
- }
}
diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java
index fe5d641a1e..f4cacf4877 100644
--- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java
+++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java
@@ -38,6 +38,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
+import org.springframework.core.SpringVersion;
import org.springframework.http.codec.ServerSentEvent;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import reactor.core.publisher.Hooks;
@@ -58,7 +59,6 @@ public abstract class AbstractServerInstrumentationTest extends AbstractInstrume
private static final String BASIC_AUTH_HEADER_VALUE = "Basic ZWxhc3RpYzpjaGFuZ2VtZQ==";
protected static WebFluxApplication.App app;
- protected String expectedFrameworkVersion = "5.3.30";
protected GreetingWebClient client;
@BeforeAll
@@ -134,7 +134,7 @@ private void hello(boolean expectHeaders) {
assertThat(headersCount)
.describedAs("unexpected headers count")
- .isEqualTo(6);
+ .isGreaterThanOrEqualTo(6);
assertThat(headers.getFirst("random-value"))
.describedAs("non-standard request headers should be captured")
@@ -452,11 +452,7 @@ protected ErrorCaptureImpl getFirstError() {
return reporter.getFirstError(200);
}
- TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus) {
- return checkTransaction(transaction, expectedName, expectedMethod, expectedStatus, expectedFrameworkVersion);
- }
-
- static TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus, String expectedFrameworkVersion) {
+ static TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus) {
assertThat(transaction.getType()).isEqualTo("request");
assertThat(transaction.getNameAsString()).isEqualTo(expectedName);
@@ -473,7 +469,8 @@ static TransactionImpl checkTransaction(TransactionImpl transaction, String expe
.isEqualTo("Spring Webflux");
assertThat(transaction.getFrameworkVersion())
- .isEqualTo(expectedFrameworkVersion);
+ .isNotBlank()
+ .isEqualTo(SpringVersion.getVersion());
return transaction;
}
diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java
index 23cd8d9432..f1c1c75e9c 100644
--- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java
+++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java
@@ -34,7 +34,6 @@ public class ServletContainerTest extends AbstractInstrumentationTest {
protected static WebFluxApplication.App app;
protected static GreetingWebClient client;
- protected String expectedFrameworkVersion = "5.3.30";
@BeforeAll
static void startApp() {
@@ -75,7 +74,7 @@ void shouldOnlyCreateOneTransaction() throws InterruptedException {
TransactionImpl transaction = reporter.getFirstTransaction(200);
// transaction naming should be set by webflux instrumentation
- AbstractServerInstrumentationTest.checkTransaction(transaction, "GET /functional/with-parameters/{id}", "GET", 200, expectedFrameworkVersion);
+ AbstractServerInstrumentationTest.checkTransaction(transaction, "GET /functional/with-parameters/{id}", "GET", 200);
// transaction HTTP part should be provided by servlet instrumentation
AbstractServerInstrumentationTest.checkUrl(client, transaction, "/with-parameters/42");
diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index fb79d1aeb1..3a04364b7c 100644
--- a/apm-agent-plugins/apm-spring-webflux/pom.xml
+++ b/apm-agent-plugins/apm-spring-webflux/pom.xml
@@ -18,7 +18,7 @@
2.7.16
- 3.4.0
+ 3.4.1
diff --git a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
index 957d7c499f..3d30e90b58 100644
--- a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
@@ -22,7 +22,7 @@
org.springframework.boot
spring-boot-dependencies
- 3.4.0
+ 3.4.1
pom
import
diff --git a/apm-agent-plugins/apm-spring-webmvc/pom.xml b/apm-agent-plugins/apm-spring-webmvc/pom.xml
index cd6bb354ea..fbd24e6e95 100644
--- a/apm-agent-plugins/apm-spring-webmvc/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/pom.xml
@@ -29,7 +29,7 @@
org.springframework.boot
spring-boot-dependencies
- 3.4.0
+ 3.4.1
pom
import
diff --git a/integration-tests/spring-boot-3/pom.xml b/integration-tests/spring-boot-3/pom.xml
index 17417d1332..c39fd08fd1 100644
--- a/integration-tests/spring-boot-3/pom.xml
+++ b/integration-tests/spring-boot-3/pom.xml
@@ -30,7 +30,7 @@
org.springframework.boot
spring-boot-dependencies
- 3.4.0
+ 3.4.1
pom
import