Skip to content

Move spring-web-3.1 tests from separate :testing module to :javaagent #15023

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

Merged
merged 2 commits into from
Oct 20, 2025
Merged

Move spring-web-3.1 tests from separate :testing module to :javaagent #15023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5470c7
Move spring-web-3.1 tests from separate :testing module to :javaagent…
trask Oct 17, 2025
a3613e2
fix
trask Oct 17, 2025
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
6 changes: 5 additions & 1 deletion instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ muzzle {
}

dependencies {
compileOnly("org.springframework:spring-web:3.1.0.RELEASE")
library("org.springframework:spring-web:3.1.0.RELEASE")

testInstrumentation(project(":instrumentation:http-url-connection:javaagent"))

latestDepTestLibrary("org.springframework:spring-web:5.+") // see spring-web-6.0 module
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we were getting latest dep testing for this module previously

}
4 changes: 2 additions & 2 deletions ...on/spring/web/SpringRestTemplateTest.java → ...pringweb/v3_1/SpringRestTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.web;
package io.opentelemetry.javaagent.instrumentation.springweb.v3_1;

import static java.util.Collections.singletonList;

Expand All @@ -23,7 +23,7 @@
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;

public class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<String>> {
class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<String>> {

@RegisterExtension
static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
Expand Down
9 changes: 0 additions & 9 deletions instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ include(":instrumentation:spring:spring-security-config-6.0:javaagent")
include(":instrumentation:spring:spring-security-config-6.0:library")
include(":instrumentation:spring:spring-web:spring-web-3.1:javaagent")
include(":instrumentation:spring:spring-web:spring-web-3.1:library")
include(":instrumentation:spring:spring-web:spring-web-3.1:testing")
include(":instrumentation:spring:spring-web:spring-web-6.0:javaagent")
include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:javaagent")
include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:testing")
Expand Down
Loading