Skip to content

Commit cd86d60

Browse files
patpatpat123patpatpat123
authored
Merge branch 'main' into main
2 parents 70c9f7f + 5d3d12e commit cd86d60

File tree

41 files changed

+674
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+674
-313
lines changed

‎benchmark-overhead/Dockerfile.petclinic‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
1313
RUN ./mvnw package -Dmaven.test.skip=true
1414
RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
1515

16-
FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
16+
FROM bellsoft/liberica-openjdk-alpine:25@sha256:2ef36da2e7dbde0730121d6a5d018d318adaecc1a420bd170031c1453dbf4b6d
1717
COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
1818
WORKDIR /app
1919
EXPOSE 9966

‎conventions/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ dependencies {
5656
// When updating, update above in plugins too
5757
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
5858
implementation("com.google.guava:guava:33.5.0-jre")
59-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
59+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.1")
6060
implementation("org.apache.httpcomponents:httpclient:4.5.14")
6161
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2")
62-
implementation("org.owasp:dependency-check-gradle:12.1.5")
62+
implementation("org.owasp:dependency-check-gradle:12.1.6")
6363
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
6464
implementation("org.spdx:spdx-gradle-plugin:0.9.0")
6565
// When updating, also update dependencyManagement/build.gradle.kts

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
3737

3838
val autoServiceVersion = "1.1.1"
3939
val autoValueVersion = "1.11.0"
40-
val errorProneVersion = "2.41.0"
40+
val errorProneVersion = "2.42.0"
4141
val byteBuddyVersion = "1.17.7"
4242
val asmVersion = "9.8"
4343
val jmhVersion = "1.37"

‎examples/distro/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414
dependencies {
1515
classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
16-
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.1.0"
16+
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.2.1"
1717
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.21.0-alpha-SNAPSHOT"
1818
}
1919
}

‎examples/extension/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
into a single jar.
1111
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
1212
*/
13-
id "com.gradleup.shadow" version "9.1.0"
13+
id "com.gradleup.shadow" version "9.2.1"
1414
id "com.diffplug.spotless" version "7.2.1"
1515

1616
id "io.opentelemetry.instrumentation.muzzle-generation" version "2.21.0-alpha-SNAPSHOT"
@@ -95,7 +95,7 @@ dependencies {
9595
Only dependencies added to `implementation` configuration will be picked up by Shadow plugin
9696
and added to the resulting jar for our extension's distribution.
9797
*/
98-
implementation 'org.apache.commons:commons-lang3:3.18.0'
98+
implementation 'org.apache.commons:commons-lang3:3.19.0'
9999

100100
//All dependencies below are only for tests
101101
testImplementation("org.testcontainers:testcontainers:1.21.3")

‎gradle-plugins/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
4141
implementation("org.apache.maven:maven-aether-provider:3.3.9")
4242

43-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
43+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.1")
4444

4545
testImplementation("org.assertj:assertj-core:3.27.6")
4646

@@ -57,13 +57,13 @@ tasks {
5757

5858
withType<JavaCompile>().configureEach {
5959
with(options) {
60-
release.set(11)
60+
release.set(17)
6161
}
6262
}
6363

6464
withType(KotlinJvmCompile::class).configureEach {
6565
compilerOptions {
66-
jvmTarget = JvmTarget.JVM_11
66+
jvmTarget = JvmTarget.JVM_17
6767
}
6868
}
6969
}
@@ -87,7 +87,7 @@ gradlePlugin {
8787

8888
java {
8989
toolchain {
90-
languageVersion.set(JavaLanguageVersion.of(11))
90+
languageVersion.set(JavaLanguageVersion.of(17))
9191
}
9292
withJavadocJar()
9393
withSourcesJar()

‎instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ testing {
4040
}
4141

4242
tasks.withType<Test>().configureEach {
43+
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
4344
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
4445
// to suppress non-fatal errors on jdk17
4546
jvmArgs("--add-opens=java.base/java.math=ALL-UNNAMED")

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java‎

Lines changed: 38 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.net.InetAddress;
3030
import java.util.concurrent.CompletableFuture;
3131
import java.util.concurrent.ExecutionException;
32+
import java.util.function.Consumer;
3233
import org.apache.dubbo.common.utils.NetUtils;
3334
import org.apache.dubbo.config.ApplicationConfig;
3435
import org.apache.dubbo.config.ProtocolConfig;
@@ -38,6 +39,7 @@
3839
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
3940
import org.apache.dubbo.rpc.service.GenericService;
4041
import org.assertj.core.api.AbstractAssert;
42+
import org.assertj.core.api.AbstractStringAssert;
4143
import org.junit.jupiter.api.AfterAll;
4244
import org.junit.jupiter.api.BeforeAll;
4345
import org.junit.jupiter.api.Test;
@@ -143,23 +145,11 @@ void testApacheDubboBase() throws ReflectiveOperationException {
143145
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
144146
satisfies(
145147
NETWORK_PEER_ADDRESS,
146-
k ->
147-
k.satisfiesAnyOf(
148-
val -> assertThat(val).isNull(),
149-
val -> assertThat(val).isInstanceOf(String.class))),
148+
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
150149
satisfies(
151150
NETWORK_PEER_PORT,
152-
k ->
153-
k.satisfiesAnyOf(
154-
val -> assertThat(val).isNull(),
155-
val -> assertThat(val).isInstanceOf(Long.class))),
156-
satisfies(
157-
NETWORK_TYPE,
158-
k ->
159-
k.satisfiesAnyOf(
160-
val -> assertThat(val).isNull(),
161-
val -> assertThat(val).isEqualTo("ipv4"),
162-
val -> assertThat(val).isEqualTo("ipv6")))),
151+
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
152+
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
163153
span ->
164154
span.hasName(
165155
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService/hello")
@@ -174,8 +164,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
174164
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
175165
equalTo(RPC_METHOD, "hello"),
176166
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
177-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
178-
satisfies(NETWORK_TYPE, AbstractAssert::isNull))));
167+
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)))));
179168

180169
testing()
181170
.waitAndAssertMetrics(
@@ -227,14 +216,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
227216
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
228217
satisfies(
229218
NETWORK_TYPE,
230-
k ->
231-
k.satisfiesAnyOf(
232-
val -> assertThat(val).isNull(),
233-
val ->
234-
assertThat(val).isEqualTo("ipv4"),
235-
val ->
236-
assertThat(val)
237-
.isEqualTo("ipv6"))))))));
219+
AbstractDubboTest::assertNetworkType))))));
238220
}
239221

240222
@Test
@@ -294,23 +276,11 @@ void testApacheDubboTest()
294276
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
295277
satisfies(
296278
NETWORK_PEER_ADDRESS,
297-
k ->
298-
k.satisfiesAnyOf(
299-
val -> assertThat(val).isNull(),
300-
val -> assertThat(val).isInstanceOf(String.class))),
279+
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
301280
satisfies(
302281
NETWORK_PEER_PORT,
303-
k ->
304-
k.satisfiesAnyOf(
305-
val -> assertThat(val).isNull(),
306-
val -> assertThat(val).isInstanceOf(Long.class))),
307-
satisfies(
308-
NETWORK_TYPE,
309-
k ->
310-
k.satisfiesAnyOf(
311-
val -> assertThat(val).isNull(),
312-
val -> assertThat(val).isEqualTo("ipv4"),
313-
val -> assertThat(val).isEqualTo("ipv6")))),
282+
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
283+
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
314284
span ->
315285
span.hasName(
316286
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService/hello")
@@ -326,13 +296,18 @@ void testApacheDubboTest()
326296
equalTo(RPC_METHOD, "hello"),
327297
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
328298
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
299+
// this attribute is not filled reliably, it is either null or
300+
// "ipv4"/"ipv6"
329301
satisfies(
330302
NETWORK_TYPE,
331303
k ->
332-
k.satisfiesAnyOf(
333-
val -> assertThat(val).isNull(),
334-
val -> assertThat(val).isEqualTo("ipv4"),
335-
val -> assertThat(val).isEqualTo("ipv6"))))));
304+
assertLatestDeps(
305+
k,
306+
a ->
307+
a.satisfiesAnyOf(
308+
val -> assertThat(val).isNull(),
309+
val -> assertThat(val).isEqualTo("ipv4"),
310+
val -> assertThat(val).isEqualTo("ipv6")))))));
336311

337312
testing()
338313
.waitAndAssertMetrics(
@@ -384,13 +359,24 @@ void testApacheDubboTest()
384359
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
385360
satisfies(
386361
NETWORK_TYPE,
387-
k ->
388-
k.satisfiesAnyOf(
389-
val -> assertThat(val).isNull(),
390-
val ->
391-
assertThat(val).isEqualTo("ipv4"),
392-
val ->
393-
assertThat(val)
394-
.isEqualTo("ipv6"))))))));
362+
AbstractDubboTest::assertNetworkType))))));
363+
}
364+
365+
static void assertNetworkType(AbstractStringAssert<?> stringAssert) {
366+
assertLatestDeps(
367+
stringAssert,
368+
a ->
369+
a.satisfiesAnyOf(
370+
val -> assertThat(val).isEqualTo("ipv4"),
371+
val -> assertThat(val).isEqualTo("ipv6")));
372+
}
373+
374+
static void assertLatestDeps(
375+
AbstractAssert<?, ?> assertion, Consumer<AbstractAssert<?, ?>> action) {
376+
if (Boolean.getBoolean("testLatestDeps")) {
377+
action.accept(assertion);
378+
} else {
379+
assertion.isNull();
380+
}
395381
}
396382
}

0 commit comments

Comments
 (0)