Skip to content

Commit a1ce740

Browse files
otelbot[bot]laurit
otelbot[bot]
and
laurit
authored
Update pinned latest dep versions (#18858)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
1 parent 70b2ed0 commit a1ce740

17 files changed

Lines changed: 220 additions & 75 deletions

File tree

‎.github/config/latest-dep-versions.json‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"com.github.etaty:rediscala_2.11#+": "1.9.0",
4242
"com.github.etaty:rediscala_2.12#+": "1.9.0",
4343
"com.github.etaty:rediscala_2.13#+": "1.9.0",
44-
"com.github.oshi:oshi-core#+": "7.2.0",
44+
"com.github.oshi:oshi-core#+": "7.2.1",
4545
"com.google.guava:guava#+": "33.6.0-jre",
4646
"com.google.gwt:gwt-servlet#+": "2.10.0",
4747
"com.google.http-client:google-http-client#+": "2.1.0",
@@ -119,7 +119,7 @@
119119
"com.typesafe.play:play_2.11#2.7.+": "2.7.9",
120120
"com.typesafe.play:play_2.12#+": "2.8.22",
121121
"com.typesafe.play:play_2.13#+": "2.9.11",
122-
"com.vaadin:flow-server#+": "25.1.6",
122+
"com.vaadin:flow-server#+": "25.1.7",
123123
"com.vaadin:vaadin-spring-boot-starter#14.11.+": "14.11.14",
124124
"com.xuxueli:xxl-job-core#+": "3.4.0",
125125
"com.xuxueli:xxl-job-core#2.2.+": "2.2.0",
@@ -140,7 +140,7 @@
140140
"io.avaje:avaje-jex#+": "3.5",
141141
"io.awspring.cloud:spring-cloud-aws-sqs#+": "4.0.2",
142142
"io.awspring.cloud:spring-cloud-aws-starter-sqs#+": "4.0.2",
143-
"io.dropwizard.metrics:metrics-core#+": "4.2.38",
143+
"io.dropwizard.metrics:metrics-core#+": "4.2.39",
144144
"io.dropwizard:dropwizard-client#+": "5.0.1",
145145
"io.dropwizard:dropwizard-views#+": "5.0.1",
146146
"io.github.rediscala:rediscala_2.13#+": "1.17.0",
@@ -206,36 +206,40 @@
206206
"io.reactivex:rxjava#+": "1.3.8",
207207
"io.undertow:undertow-core#+": "2.4.1.Final",
208208
"io.undertow:undertow-servlet-jakarta#+": "2.2.20.Final",
209-
"io.vertx:vertx-circuit-breaker#+": "5.0.12",
209+
"io.vertx:vertx-circuit-breaker#+": "5.1.0",
210210
"io.vertx:vertx-circuit-breaker#3.+": "3.9.16",
211211
"io.vertx:vertx-circuit-breaker#4.+": "4.5.27",
212-
"io.vertx:vertx-codegen#+": "5.0.12",
212+
"io.vertx:vertx-codegen#+": "5.1.0",
213213
"io.vertx:vertx-codegen#3.+": "3.9.16",
214214
"io.vertx:vertx-codegen#4.+": "4.5.27",
215-
"io.vertx:vertx-core#+": "5.0.12",
215+
"io.vertx:vertx-codegen#5.0.+": "5.0.12",
216+
"io.vertx:vertx-core#+": "5.1.0",
216217
"io.vertx:vertx-core#3.+": "3.9.16",
217218
"io.vertx:vertx-core#4.+": "4.5.27",
218219
"io.vertx:vertx-docgen#+": "3.5.1",
219220
"io.vertx:vertx-docgen#3.+": "3.5.1",
220-
"io.vertx:vertx-jdbc-client#+": "5.0.12",
221+
"io.vertx:vertx-jdbc-client#+": "5.1.0",
221222
"io.vertx:vertx-jdbc-client#3.+": "3.9.16",
222223
"io.vertx:vertx-jdbc-client#4.+": "4.5.27",
223-
"io.vertx:vertx-kafka-client#+": "5.0.12",
224+
"io.vertx:vertx-jdbc-client#5.0.+": "5.0.12",
225+
"io.vertx:vertx-kafka-client#+": "5.1.0",
224226
"io.vertx:vertx-kafka-client#3.+": "3.9.16",
225227
"io.vertx:vertx-kafka-client#4.+": "4.5.27",
226-
"io.vertx:vertx-lang-kotlin-coroutines#+": "5.0.12",
227-
"io.vertx:vertx-pg-client#+": "5.0.12",
228+
"io.vertx:vertx-lang-kotlin-coroutines#+": "5.1.0",
229+
"io.vertx:vertx-pg-client#+": "5.1.0",
228230
"io.vertx:vertx-pg-client#4.+": "4.5.27",
229-
"io.vertx:vertx-redis-client#+": "5.0.12",
230-
"io.vertx:vertx-rx-java2#+": "5.0.12",
231+
"io.vertx:vertx-pg-client#5.0.+": "5.0.12",
232+
"io.vertx:vertx-redis-client#+": "5.1.0",
233+
"io.vertx:vertx-rx-java2#+": "5.1.0",
231234
"io.vertx:vertx-rx-java2#3.+": "3.9.16",
232235
"io.vertx:vertx-rx-java2#4.+": "4.5.27",
233-
"io.vertx:vertx-sql-client#+": "5.0.12",
236+
"io.vertx:vertx-sql-client#+": "5.1.0",
234237
"io.vertx:vertx-sql-client#4.+": "4.5.27",
235-
"io.vertx:vertx-web#+": "5.0.12",
238+
"io.vertx:vertx-sql-client#5.0.+": "5.0.12",
239+
"io.vertx:vertx-web#+": "5.1.0",
236240
"io.vertx:vertx-web#3.+": "3.9.16",
237241
"io.vertx:vertx-web#4.+": "4.5.27",
238-
"io.vertx:vertx-web-client#+": "5.0.12",
242+
"io.vertx:vertx-web-client#+": "5.1.0",
239243
"io.vertx:vertx-web-client#3.+": "3.9.16",
240244
"io.vertx:vertx-web-client#4.+": "4.5.27",
241245
"jakarta.el:jakarta.el-api#4.+": "4.0.0",
@@ -258,11 +262,11 @@
258262
"log4j:log4j#+": "1.2.17",
259263
"net.logstash.logback:logstash-logback-encoder#+": "9.0",
260264
"net.spy:spymemcached#+": "2.12.3",
261-
"org.apache.axis2:axis2-jaxws#+": "2.0.0",
265+
"org.apache.axis2:axis2-jaxws#+": "2.0.1",
262266
"org.apache.axis2:axis2-jaxws#1.+": "1.8.2",
263-
"org.apache.axis2:axis2-transport-http#+": "2.0.0",
267+
"org.apache.axis2:axis2-transport-http#+": "2.0.1",
264268
"org.apache.axis2:axis2-transport-http#1.+": "1.8.2",
265-
"org.apache.axis2:axis2-transport-local#+": "2.0.0",
269+
"org.apache.axis2:axis2-transport-local#+": "2.0.1",
266270
"org.apache.axis2:axis2-transport-local#1.+": "1.8.2",
267271
"org.apache.camel:camel-aws#2.+": "2.25.4",
268272
"org.apache.camel:camel-cassandraql#2.+": "2.25.4",
@@ -393,11 +397,13 @@
393397
"org.gwtproject:gwt-dev#+": "2.13.0",
394398
"org.gwtproject:gwt-servlet#+": "2.13.0",
395399
"org.gwtproject:gwt-user#+": "2.13.0",
396-
"org.hibernate.orm:hibernate-core#+": "7.3.6.Final",
400+
"org.hibernate.orm:hibernate-core#+": "7.4.0.Final",
401+
"org.hibernate.orm:hibernate-core#6.+": "6.6.51.Final",
402+
"org.hibernate.orm:hibernate-core#7.+": "7.4.0.Final",
397403
"org.hibernate.reactive:hibernate-reactive-core#+": "4.3.5.Final",
398404
"org.hibernate.reactive:hibernate-reactive-core#1.+": "1.1.9.Final",
399405
"org.hibernate.reactive:hibernate-reactive-core#3.+": "3.3.7.Final",
400-
"org.hibernate:hibernate-core#+": "7.3.6.Final",
406+
"org.hibernate:hibernate-core#+": "7.4.0.Final",
401407
"org.hibernate:hibernate-core#3.+": "3.6.10.Final",
402408
"org.hibernate:hibernate-core#5.+": "5.6.15.Final",
403409
"org.hibernate:hibernate-core#6.+": "6.6.51.Final",
@@ -544,21 +550,21 @@
544550
"redis.clients:jedis#+": "7.5.0",
545551
"redis.clients:jedis#2.+": "2.10.2",
546552
"redis.clients:jedis#3.+": "3.10.0",
547-
"software.amazon.awssdk.crt:aws-crt#+": "0.46.0",
548-
"software.amazon.awssdk:aws-core#+": "2.44.12",
549-
"software.amazon.awssdk:aws-json-protocol#+": "2.44.12",
550-
"software.amazon.awssdk:bedrockruntime#+": "2.44.12",
551-
"software.amazon.awssdk:dynamodb#+": "2.44.12",
552-
"software.amazon.awssdk:ec2#+": "2.44.12",
553-
"software.amazon.awssdk:kinesis#+": "2.44.12",
554-
"software.amazon.awssdk:lambda#+": "2.44.12",
555-
"software.amazon.awssdk:rds#+": "2.44.12",
556-
"software.amazon.awssdk:s3#+": "2.44.12",
557-
"software.amazon.awssdk:secretsmanager#+": "2.44.12",
558-
"software.amazon.awssdk:ses#+": "2.44.12",
559-
"software.amazon.awssdk:sfn#+": "2.44.12",
560-
"software.amazon.awssdk:sns#+": "2.44.12",
561-
"software.amazon.awssdk:sqs#+": "2.44.12",
553+
"software.amazon.awssdk.crt:aws-crt#+": "0.46.1",
554+
"software.amazon.awssdk:aws-core#+": "2.44.13",
555+
"software.amazon.awssdk:aws-json-protocol#+": "2.44.13",
556+
"software.amazon.awssdk:bedrockruntime#+": "2.44.13",
557+
"software.amazon.awssdk:dynamodb#+": "2.44.13",
558+
"software.amazon.awssdk:ec2#+": "2.44.13",
559+
"software.amazon.awssdk:kinesis#+": "2.44.13",
560+
"software.amazon.awssdk:lambda#+": "2.44.13",
561+
"software.amazon.awssdk:rds#+": "2.44.13",
562+
"software.amazon.awssdk:s3#+": "2.44.13",
563+
"software.amazon.awssdk:secretsmanager#+": "2.44.13",
564+
"software.amazon.awssdk:ses#+": "2.44.13",
565+
"software.amazon.awssdk:sfn#+": "2.44.13",
566+
"software.amazon.awssdk:sns#+": "2.44.13",
567+
"software.amazon.awssdk:sqs#+": "2.44.13",
562568
"tech.powerjob:powerjob-official-processors#+": "5.1.2",
563569
"tech.powerjob:powerjob-worker#+": "5.1.2"
564570
}

‎instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ plugins {
44

55
muzzle {
66
pass {
7-
group.set("org.hibernate")
7+
group.set("org.hibernate.orm")
88
module.set("hibernate-core")
99
versions.set("[6.0.0.Final,)")
1010
assertInverse.set(true)
1111
}
1212
}
1313

1414
dependencies {
15-
library("org.hibernate:hibernate-core:6.0.0.Final")
15+
library("org.hibernate.orm:hibernate-core:6.0.0.Final")
1616

1717
implementation(project(":instrumentation:hibernate:hibernate-common-3.3:javaagent"))
1818

@@ -49,7 +49,7 @@ testing {
4949
implementation("com.h2database:h2:1.4.197")
5050
implementation("org.hsqldb:hsqldb:2.0.0")
5151
implementation(project(":instrumentation:hibernate:testing"))
52-
implementation("org.hibernate:hibernate-core:${baseVersion("6.0.0.Final").orLatest("6.+")}")
52+
implementation("org.hibernate.orm:hibernate-core:${baseVersion("6.0.0.Final").orLatest("6.+")}")
5353
}
5454
}
5555

@@ -64,7 +64,7 @@ testing {
6464
implementation("com.h2database:h2:1.4.197")
6565
implementation("org.hsqldb:hsqldb:2.0.0")
6666
implementation(project(":instrumentation:hibernate:testing"))
67-
implementation("org.hibernate:hibernate-core:${baseVersion("7.0.0.Final").orLatest("7.+")}")
67+
implementation("org.hibernate.orm:hibernate-core:${baseVersion("7.0.0.Final").orLatest("7.+")}")
6868
}
6969
}
7070
}

‎instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
val springAgent by configurations.creating
66

77
dependencies {
8-
library("org.hibernate:hibernate-core:6.0.0.Final")
8+
library("org.hibernate.orm:hibernate-core:6.0.0.Final")
99

1010
testInstrumentation(project(":instrumentation:hibernate:hibernate-6.0:javaagent"))
1111
testInstrumentation(project(":instrumentation:jdbc:javaagent"))

‎instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v4_0/VertxClientInstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
2828
// removed in 4.0
2929
return not(hasClassesNamed("io.vertx.core.Starter"))
3030
// added in 5.0
31-
.and(not(hasClassesNamed("io.vertx.core.http.impl.HttpClientConnectionInternal")));
31+
.and(not(hasClassesNamed("io.vertx.core.http.HttpClientConnection")));
3232
}
3333

3434
@Override

instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/ResourceManagerInstrumentation.java renamed to instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/HttpClientImplInstrumentation.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.returns;
10+
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1011

1112
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -16,23 +17,24 @@
1617
import net.bytebuddy.description.type.TypeDescription;
1718
import net.bytebuddy.matcher.ElementMatcher;
1819

19-
/** Propagate context to connection established callback. */
20-
class ResourceManagerInstrumentation implements TypeInstrumentation {
20+
class HttpClientImplInstrumentation implements TypeInstrumentation {
2121

2222
@Override
2323
public ElementMatcher<TypeDescription> typeMatcher() {
24-
return named("io.vertx.core.internal.resource.ResourceManager");
24+
return named("io.vertx.core.http.impl.HttpClientImpl");
2525
}
2626

2727
@Override
2828
public void transform(TypeTransformer transformer) {
2929
transformer.applyAdviceToMethod(
30-
named("withResourceAsync").and(returns(named("io.vertx.core.Future"))),
31-
getClass().getName() + "$WithResourceAsyncAdvice");
30+
named("request")
31+
.and(takesArgument(0, named("io.vertx.core.http.RequestOptions")))
32+
.and(returns(named("io.vertx.core.Future"))),
33+
getClass().getName() + "$WrapFutureAdvice");
3234
}
3335

3436
@SuppressWarnings("unused")
35-
public static class WithResourceAsyncAdvice {
37+
public static class WrapFutureAdvice {
3638
@AssignReturned.ToReturned
3739
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
3840
public static Future<?> wrapFuture(@Advice.Return Future<?> future) {

‎instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/HttpClientResponseImplInstrumentation.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.instrumentation.vertx.httpclient.v5_0;
7+
8+
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
9+
import static net.bytebuddy.matcher.ElementMatchers.named;
10+
11+
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
12+
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
13+
import io.vertx.core.http.HttpClientResponse;
14+
import io.vertx.core.http.HttpConnection;
15+
import net.bytebuddy.asm.Advice;
16+
import net.bytebuddy.asm.Advice.AssignReturned;
17+
import net.bytebuddy.description.type.TypeDescription;
18+
import net.bytebuddy.matcher.ElementMatcher;
19+
20+
class HttpClientResponseImplInstrumentation implements TypeInstrumentation {
21+
22+
@Override
23+
public ElementMatcher<TypeDescription> typeMatcher() {
24+
return named("io.vertx.core.http.impl.HttpClientResponseImpl");
25+
}
26+
27+
@Override
28+
public void transform(TypeTransformer transformer) {
29+
transformer.applyAdviceToMethod(isConstructor(), getClass().getName() + "$ConstructorAdvice");
30+
}
31+
32+
@SuppressWarnings("unused")
33+
public static class ConstructorAdvice {
34+
@AssignReturned.ToReturned
35+
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
36+
public static void setConnection(
37+
@Advice.This HttpClientResponse response,
38+
@Advice.FieldValue("conn") HttpConnection connection) {
39+
VertxClientSingletons.setConnection(response, connection);
40+
}
41+
}
42+
}

‎instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/Vertx5HttpAttributesGetter.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.opentelemetry.javaagent.instrumentation.vertx.httpclient.common.v3_0.AbstractVertxHttpAttributesGetter;
99
import io.vertx.core.http.HttpClientRequest;
1010
import io.vertx.core.http.HttpClientResponse;
11+
import io.vertx.core.http.HttpConnection;
1112
import io.vertx.core.http.HttpVersion;
1213
import io.vertx.core.net.HostAndPort;
1314
import io.vertx.core.net.SocketAddress;
@@ -79,7 +80,11 @@ public String getNetworkPeerAddress(
7980
if (response == null) {
8081
return null;
8182
}
82-
SocketAddress socketAddress = response.netSocket().remoteAddress();
83+
HttpConnection connection = VertxClientSingletons.getConnection(response);
84+
if (connection == null) {
85+
return null;
86+
}
87+
SocketAddress socketAddress = connection.remoteAddress();
8388
return socketAddress == null ? null : socketAddress.hostAddress();
8489
}
8590

@@ -90,7 +95,11 @@ public Integer getNetworkPeerPort(
9095
if (response == null) {
9196
return null;
9297
}
93-
SocketAddress socketAddress = response.netSocket().remoteAddress();
98+
HttpConnection connection = VertxClientSingletons.getConnection(response);
99+
if (connection == null) {
100+
return null;
101+
}
102+
SocketAddress socketAddress = connection.remoteAddress();
94103
return socketAddress == null ? null : socketAddress.port();
95104
}
96105
}

‎instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/VertxClientInstrumentationModule.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@ public VertxClientInstrumentationModule() {
2525
@Override
2626
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
2727
// added in 5.0
28-
return hasClassesNamed("io.vertx.core.http.impl.HttpClientConnectionInternal");
28+
return hasClassesNamed("io.vertx.core.http.HttpClientConnection");
2929
}
3030

3131
@Override
3232
public List<TypeInstrumentation> typeInstrumentations() {
3333
return asList(
3434
new HttpRequestInstrumentation(),
3535
new HttpClientRequestBaseInstrumentation(),
36-
new ResourceManagerInstrumentation(),
36+
new HttpClientResponseImplInstrumentation(),
37+
new HttpClientImplInstrumentation(),
3738
new TaskQueueInstrumentation());
3839
}
3940
}

‎instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/httpclient/v5_0/VertxClientSingletons.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.vertx.core.Future;
1515
import io.vertx.core.http.HttpClientRequest;
1616
import io.vertx.core.http.HttpClientResponse;
17+
import io.vertx.core.http.HttpConnection;
1718
import io.vertx.core.net.HostAndPort;
1819
import java.util.concurrent.CompletableFuture;
1920
import javax.annotation.Nullable;
@@ -30,6 +31,9 @@ public class VertxClientSingletons {
3031
public static final VirtualField<HttpClientRequest, Contexts> CONTEXTS =
3132
VirtualField.find(HttpClientRequest.class, Contexts.class);
3233

34+
private static final VirtualField<HttpClientResponse, HttpConnection> CONNECTION_FIELD =
35+
VirtualField.find(HttpClientResponse.class, HttpConnection.class);
36+
3337
public static Instrumenter<HttpClientRequest, HttpClientResponse> instrumenter() {
3438
return instrumenter;
3539
}
@@ -43,6 +47,16 @@ public static HostAndPort getAuthority(HttpClientRequest request) {
4347
return AUTHORITY_FIELD.get(request);
4448
}
4549

50+
public static void setConnection(
51+
HttpClientResponse response, @Nullable HttpConnection connection) {
52+
CONNECTION_FIELD.set(response, connection);
53+
}
54+
55+
@Nullable
56+
public static HttpConnection getConnection(HttpClientResponse response) {
57+
return CONNECTION_FIELD.get(response);
58+
}
59+
4660
public static <T> Future<T> wrapFuture(Future<T> future) {
4761
Context context = Context.current();
4862
CompletableFuture<T> result = new CompletableFuture<>();

0 commit comments

Comments
 (0)