Skip to content

Commit 7f1160c

Browse files
authored
Fix spring-jms for 4.0 update (#15434)
1 parent 59761d3 commit 7f1160c

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ dependencies {
2727

2828
testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
2929
testLibrary("org.springframework.boot:spring-boot-starter:3.0.0")
30-
31-
// tests don't work with spring boot 4 yet
32-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
33-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
3430
}
3531

3632
// spring 6 requires java 17

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/AbstractSpringJmsListenerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ abstract class AbstractSpringJmsListenerTest {
4545
@BeforeAll
4646
static void setUp() {
4747
broker =
48-
new GenericContainer<>("quay.io/artemiscloud/activemq-artemis-broker:artemis.2.27.0")
49-
.withEnv("AMQ_USER", "test")
50-
.withEnv("AMQ_PASSWORD", "test")
48+
new GenericContainer<>("apache/activemq-artemis:2.44.0")
49+
.withEnv("ARTEMIS_USER", "test")
50+
.withEnv("ARTEMIS_PASSWORD", "test")
5151
.withEnv("JAVA_TOOL_OPTIONS", "-Dbrokerconfig.maxDiskUsage=-1")
5252
.withExposedPorts(61616, 8161)
53-
.waitingFor(Wait.forLogMessage(".*Server is now live.*", 1))
53+
.waitingFor(Wait.forLogMessage(".*Server is now active.*", 1))
5454
.withStartupTimeout(Duration.ofMinutes(2))
5555
.withLogConsumer(new Slf4jLogConsumer(logger));
5656
broker.start();

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public void configure(IgnoredTypesBuilder builder) {
112112
.allowClass(
113113
"org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
114114
.allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")
115+
.allowClass(
116+
"org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializingApplicationListener$")
115117
.allowClass(
116118
"org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration$$Lambda")
117119
.allowClass("org.springframework.boot.autoconfigure.condition.OnClassCondition$")

0 commit comments

Comments
 (0)