Skip to content

Fix latest dep tests #12596

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 3 commits into from
Nov 9, 2024
Merged

Fix latest dep tests #12596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15cfe44
Fix latest dep tests
laurit Nov 8, 2024
8439c01
fix vertx latest dep tests
laurit Nov 9, 2024
e322d37
fix hibernate-reactive latest dep tests
laurit Nov 9, 2024
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: 3 additions & 3 deletions instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ testing {
implementation("org.testcontainers:testcontainers")
if (latestDepTest) {
implementation("org.hibernate.reactive:hibernate-reactive-core:1.+")
implementation("io.vertx:vertx-pg-client:+")
implementation("io.vertx:vertx-pg-client:4.+")
} else {
implementation("org.hibernate.reactive:hibernate-reactive-core:1.0.0.Final")
implementation("io.vertx:vertx-pg-client:4.1.5")
Expand All @@ -46,8 +46,8 @@ testing {
dependencies {
implementation("org.testcontainers:testcontainers")
if (latestDepTest) {
implementation("org.hibernate.reactive:hibernate-reactive-core:2.+")
implementation("io.vertx:vertx-pg-client:+")
implementation("org.hibernate.reactive:hibernate-reactive-core:latest.release")
implementation("io.vertx:vertx-pg-client:latest.release")
} else {
implementation("org.hibernate.reactive:hibernate-reactive-core:2.0.0.Final")
implementation("io.vertx:vertx-pg-client:4.4.2")
Expand Down
9 changes: 8 additions & 1 deletion instrumentation/spring/spring-cloud-aws-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@ muzzle {
}

dependencies {
library("io.awspring.cloud:spring-cloud-aws-starter-sqs:3.0.0")
// current latest release 3.3.0-M1 has parent that is from central because of that we can't use
// library here and have to use compileOnly + testImplementation to avoid resolving the broken
// version
compileOnly("io.awspring.cloud:spring-cloud-aws-starter-sqs:3.0.0")
Comment on lines -15 to +18
Copy link
Member

@trask trask Nov 8, 2024

Choose a reason for hiding this comment

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

I thought only adding latestDepTestLibrary was enough to resolve this kind of issue?

Copy link
Contributor Author

@laurit laurit Nov 8, 2024

Choose a reason for hiding this comment

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

So did I. I also would have thought that we ignore versions like 3.3.0-M1. My guess is that the problem here is that what is missing is not a random dependency but one of the parent poms. Perhaps this breaks it more thoroughly than usual.

implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))

testInstrumentation(project(":instrumentation:aws-sdk:aws-sdk-2.2:javaagent"))

testImplementation("org.elasticmq:elasticmq-rest-sqs_2.13")

testImplementation("io.awspring.cloud:spring-cloud-aws-starter-sqs:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter-web:3.0.0")

// current latest release 3.3.0-M1 has parent that is from central
latestDepTestLibrary("io.awspring.cloud:spring-cloud-aws-starter-sqs:3.2.1")
}

otelJava {
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/vertx/vertx-kafka-client-3.6/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ testing {

// the "library" configuration is not recognized by the test suite plugin
if (latestDepTest) {
implementation("io.vertx:vertx-kafka-client:+")
implementation("io.vertx:vertx-codegen:+")
implementation("io.vertx:vertx-kafka-client:latest.release")
implementation("io.vertx:vertx-codegen:latest.release")
Copy link
Member

@trask trask Nov 9, 2024

Choose a reason for hiding this comment

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

was it picking up SNAPSHOT version? could you tell from where?

Copy link
Contributor Author

@laurit laurit Nov 9, 2024

Choose a reason for hiding this comment

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

no it was picking up 5.0.0.CR1, latest.release is also used by the usual latest dep magic and works with

opentelemetry-java-instrumentation/conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

Line 34 in 29da88e

abstract class TestLatestDepsRule : ComponentMetadataRule {

} else {
implementation("io.vertx:vertx-kafka-client:3.6.0")
implementation("io.vertx:vertx-codegen:3.6.0")
Expand Down
10 changes: 5 additions & 5 deletions instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ testing {
dependencies {
implementation("org.hsqldb:hsqldb:2.3.4")

implementation("io.vertx:vertx-web:+")
implementation("io.vertx:vertx-rx-java2:+")
implementation("io.vertx:vertx-web-client:+")
implementation("io.vertx:vertx-jdbc-client:+")
implementation("io.vertx:vertx-circuit-breaker:+")
implementation("io.vertx:vertx-web:latest.release")
implementation("io.vertx:vertx-rx-java2:latest.release")
implementation("io.vertx:vertx-web-client:latest.release")
implementation("io.vertx:vertx-jdbc-client:latest.release")
implementation("io.vertx:vertx-circuit-breaker:latest.release")
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ testing {
dependencies {
implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))

implementation("io.vertx:vertx-web:+")
implementation("io.vertx:vertx-jdbc-client:+")
implementation("io.vertx:vertx-codegen:+")
implementation("io.vertx:vertx-web:latest.release")
implementation("io.vertx:vertx-jdbc-client:latest.release")
implementation("io.vertx:vertx-codegen:latest.release")
}
}
}
Expand Down
Loading