open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update dependency org.assertj:assertj-core to v3.26.0 (main) (#11458) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2024-05-27 16:17:51 +03:00 committed by GitHub
parent a0de9c453e
commit 373224c4c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conventions/build.gradle.kts
View File

@ -74,5 +74,5 @@ dependencies {
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
testImplementation("org.junit.jupiter:junit-jupiter-api")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testImplementation("org.assertj:assertj-core:3.25.3")
testImplementation("org.assertj:assertj-core:3.26.0")
}

2
dependencyManagement/build.gradle.kts
View File

@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
"io.opentelemetry.proto:opentelemetry-proto:1.3.1-alpha",
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
"org.assertj:assertj-core:3.25.3",
"org.assertj:assertj-core:3.26.0",
"org.awaitility:awaitility:4.2.1",
"com.google.code.findbugs:annotations:3.0.1u2",
"com.google.code.findbugs:jsr305:3.0.2",

2
examples/distro/gradle/instrumentation.gradle
View File

@ -25,7 +25,7 @@ dependencies {
// test dependencies
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
testImplementation("org.assertj:assertj-core:3.25.3")
testImplementation("org.assertj:assertj-core:3.26.0")
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")

2
gradle-plugins/build.gradle.kts
View File

@ -41,7 +41,7 @@ dependencies {
implementation("com.github.johnrengelman:shadow:8.1.1")
testImplementation("org.assertj:assertj-core:3.25.3")
testImplementation("org.assertj:assertj-core:3.26.0")
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
testImplementation("org.junit.jupiter:junit-jupiter-api")

7
instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java
View File

@ -34,7 +34,6 @@ class RmiTest {
public static final AgentInstrumentationExtension testing =
AgentInstrumentationExtension.create();
private static int registryPort;
private static Registry serverRegistry;
private static Registry clientRegistry;
@ -42,7 +41,7 @@ class RmiTest {
@BeforeAll
static void setUp() throws Exception {
registryPort = PortUtils.findOpenPort();
int registryPort = PortUtils.findOpenPort();
serverRegistry = LocateRegistry.createRegistry(registryPort);
clientRegistry = LocateRegistry.getRegistry("localhost", registryPort);
}
@ -120,14 +119,14 @@ class RmiTest {
Throwable thrown =
catchThrowableOfType(
IllegalStateException.class,
() ->
testing.runWithSpan(
"parent",
() -> {
Greeter client = (Greeter) clientRegistry.lookup(Server.RMI_ID);
client.exceptional();
}),
IllegalStateException.class);
}));
assertThat(testing.waitForTraces(1))
.satisfiesExactly(