diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 3bb12b15a3..0478004690 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -26,7 +26,7 @@ jobs: distribution: 'zulu' # zulu as it supports a wide version range java-version: '11' # earliest LTS and last that can compile the 1.6 release profile. - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d5bb4a2af5..a2ede0777f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: distribution: 'zulu' # zulu as it supports a wide version range java-version: '11' # earliest LTS and last that can compile the 1.6 release profile. - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91f3a00395..055dfcfb0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: distribution: 'zulu' # zulu as it supports a wide version range java-version: '11' # earliest LTS and last that can compile the 1.6 release profile. - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-jdk-11-maven-${{ hashFiles('**/pom.xml') }} @@ -60,7 +60,7 @@ jobs: distribution: 'zulu' # zulu as it supports a wide version range java-version: ${{ matrix.java_version }} - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-jdk-${{ matrix.java_version }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/brave/pom.xml b/brave/pom.xml index 635e037422..28ee51147f 100644 --- a/brave/pom.xml +++ b/brave/pom.xml @@ -77,7 +77,7 @@ io.micrometer micrometer-core - 1.12.1 + 1.12.3 test diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml index c839706141..a985e7a4a7 100644 --- a/instrumentation/benchmarks/pom.xml +++ b/instrumentation/benchmarks/pom.xml @@ -28,7 +28,7 @@ ${project.basedir}/../.. 1.37 - 2.2.28.Final + 2.2.30.Final @@ -55,7 +55,7 @@ com.amazonaws aws-xray-recorder-sdk-core - 2.15.0 + 2.15.1 @@ -112,6 +112,12 @@ resteasy-client-okhttp3 1.1 + + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + ${project.groupId} diff --git a/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java index a88df7b0f8..ff8793299f 100644 --- a/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java @@ -30,6 +30,7 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.ProducerFencedException; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -131,6 +132,10 @@ public Future send(ProducerRecord record, Callba return null; } + @Override public Uuid clientInstanceId(Duration duration) { + return null; + } + @Override public void close() { } diff --git a/instrumentation/httpclient5/pom.xml b/instrumentation/httpclient5/pom.xml index 13da50735f..9a31fb1697 100644 --- a/instrumentation/httpclient5/pom.xml +++ b/instrumentation/httpclient5/pom.xml @@ -33,7 +33,7 @@ ${project.basedir}/../.. - 5.3 + 5.3.1 diff --git a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingConsumer.java b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingConsumer.java index 1f4e9257c3..a7092c6320 100644 --- a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingConsumer.java +++ b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -42,6 +42,7 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.Uuid; /** * Kafka Consumer decorator. Read records headers to create and complete a child of the incoming @@ -254,6 +255,11 @@ public Map committed( return delegate.committed(partitions, timeout); } + // Do not use @Override annotation to avoid compatibility issue version < 3.7 + public Uuid clientInstanceId(Duration duration) { + return delegate.clientInstanceId(duration); + } + @Override public Map metrics() { return delegate.metrics(); } diff --git a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java index 82a38ea032..a4919c3da1 100644 --- a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java +++ b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java @@ -38,6 +38,7 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.ProducerFencedException; final class TracingProducer implements Producer { @@ -149,6 +150,11 @@ public Future send(ProducerRecord record, @Nullable Callba return delegate.metrics(); } + // Do not use @Override annotation to avoid compatibility issue version < 3.7 + public Uuid clientInstanceId(Duration duration) { + return delegate.clientInstanceId(duration); + } + @Override public void close() { delegate.close(); } diff --git a/instrumentation/mysql8/pom.xml b/instrumentation/mysql8/pom.xml index ead214cb65..7ec8fd6de0 100644 --- a/instrumentation/mysql8/pom.xml +++ b/instrumentation/mysql8/pom.xml @@ -40,7 +40,7 @@ com.mysql mysql-connector-j - 8.2.0 + 8.3.0 provided diff --git a/pom.xml b/pom.xml index b56fb938e6..5c5952eb2b 100755 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ - 2.24.1 + 2.25.0 1.3.2 @@ -96,17 +96,17 @@ 3.2.18.RELEASE - 9.4.53.v20231009 + 9.4.54.v20240208 7.6.21.v20160908 3.15.6.Final - 11.0.19 + 11.0.20 5.0.0 - 3.6.1 + 3.7.0 5.18.3 - 2.31.2 + 2.32.0 2.3.6 @@ -123,8 +123,8 @@ https://github.com/grpc/grpc-java/commit/a589eacc8f83c80bb44c8fae0b0b173b5ff51e61 --> 1.57.2 3.22.3 - - 4.1.93.Final + + 4.1.107.Final 4.1.5 @@ -133,7 +133,7 @@ 3.25.3 5.10.0 2.41 - 1.19.3 + 1.19.6 ${skipTests} @@ -155,7 +155,7 @@ 3.6.3 3.3.0 3.0.1 - 3.5.1 + 3.5.2 3.3.0 3.2.5 1.6.13