Skip to content

Fix spring-jms for 4.0 update #15434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −8
Open

Fix spring-jms for 4.0 update #15434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ dependencies {

testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter:3.0.0")

// tests don't work with spring boot 4 yet
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
}

// spring 6 requires java 17
Expand Down
8 changes: 4 additions & 4 deletions ...pentelemetry/javaagent/instrumentation/spring/jms/v6_0/AbstractSpringJmsListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ abstract class AbstractSpringJmsListenerTest {
@BeforeAll
static void setUp() {
broker =
new GenericContainer<>("quay.io/artemiscloud/activemq-artemis-broker:artemis.2.27.0")
.withEnv("AMQ_USER", "test")
.withEnv("AMQ_PASSWORD", "test")
new GenericContainer<>("apache/activemq-artemis:2.44.0")
Copy link
Member Author

@jaydeluca jaydeluca Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i had issues running the other container, but this one worked well. If we'd prefer to keep it as is, I can revert

.withEnv("ARTEMIS_USER", "test")
.withEnv("ARTEMIS_PASSWORD", "test")
.withEnv("JAVA_TOOL_OPTIONS", "-Dbrokerconfig.maxDiskUsage=-1")
.withExposedPorts(61616, 8161)
.waitingFor(Wait.forLogMessage(".*Server is now live.*", 1))
.waitingFor(Wait.forLogMessage(".*Server is now active.*", 1))
.withStartupTimeout(Duration.ofMinutes(2))
.withLogConsumer(new Slf4jLogConsumer(logger));
broker.start();
Expand Down
2 changes: 2 additions & 0 deletions ...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ public void configure(IgnoredTypesBuilder builder) {
.allowClass(
"org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
.allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")
.allowClass(
"org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializingApplicationListener$")
.allowClass(
"org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration$$Lambda")
.allowClass("org.springframework.boot.autoconfigure.condition.OnClassCondition$")
Expand Down
Loading