diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9a6a19f0f66..3dfbd79879e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -33,13 +33,13 @@ repositories { } dependencies { - implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.3.0") + implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0") implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.4.5")) implementation("com.google.auto.value:auto-value-annotations:1.11.1") // When updating, update above in plugins too implementation("com.diffplug.spotless:spotless-plugin-gradle:8.9.0") implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.5.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1") + implementation("com.fasterxml.jackson.core:jackson-databind:2.22.2") implementation("com.squareup:javapoet:1.13.0") implementation("com.squareup.wire:wire-compiler") implementation("com.squareup.wire:wire-gradle-plugin") diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 9f907ad2080..ebb7164c234 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -44,7 +44,7 @@ java { checkstyle { configDirectory.set(file("$rootDir/buildscripts/")) - toolVersion = "13.9.0" + toolVersion = "13.11.0" isIgnoreFailures = false configProperties["rootDir"] = rootDir } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index bf414902e86..fe4c413e3e9 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -16,10 +16,10 @@ val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.18" val opencensusVersion = "0.31.1" val prometheusServerVersion = "1.8.0" -val armeriaVersion = "1.40.0" +val armeriaVersion = "1.41.0" val junitVersion = "5.14.4" val junitPlatformVersion = "1.14.4" -val okhttpVersion = "5.4.0" +val okhttpVersion = "5.5.0" val DEPENDENCY_BOMS = listOf( // for some reason boms show up as runtime dependencies in license and vulnerability scans @@ -27,13 +27,13 @@ val DEPENDENCY_BOMS = listOf( // (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged // by FOSSA for containing EPL-licensed) - "com.fasterxml.jackson:jackson-bom:2.22.1", - "com.google.guava:guava-bom:33.6.0-jre", + "com.fasterxml.jackson:jackson-bom:2.22.2", + "com.google.guava:guava-bom:33.7.1-jre", "com.google.protobuf:protobuf-bom:4.35.1", "com.squareup.okhttp3:okhttp-bom:$okhttpVersion", "com.squareup.okio:okio-bom:3.18.1", // applies to transitive dependencies of okhttp "io.grpc:grpc-bom:1.83.1", - "io.netty:netty-bom:4.2.16.Final", + "io.netty:netty-bom:4.2.17.Final", "org.assertj:assertj-bom:3.27.7", "org.osgi:org.osgi.test.bom:1.3.0", "org.testcontainers:testcontainers-bom:2.0.5", @@ -97,7 +97,7 @@ val DEPENDENCIES = listOf( "org.apache.felix:org.apache.felix.framework:7.0.5", "org.awaitility:awaitility:4.3.0", "org.codehaus.mojo:animal-sniffer-annotations:1.27", - "org.jctools:jctools-core:4.0.6", + "org.jctools:jctools-core:4.0.7", "org.junit-pioneer:junit-pioneer:1.9.1", "org.mock-server:mockserver-netty:5.15.0:shaded", "org.osgi:osgi.core:8.0.0", diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java index d069065ddcd..cef76c5b022 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java @@ -60,7 +60,7 @@ class CollectorIntegrationTest { private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"; + "otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"; private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b44..eddabd2eef8 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbe66e1d665..84c5a9c661a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index ba25a3a7b9f..6bb98089223 100644 --- a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java @@ -114,7 +114,7 @@ abstract class OtlpExporterIntegrationTest { private static final AttributeKey SERVICE_NAME = AttributeKey.stringKey("service.name"); private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"; + "otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"; private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317; private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318; diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java index 86ecbcf9df6..72d4ac78138 100644 --- a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java +++ b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java @@ -70,7 +70,7 @@ public class OtlpPipelineStressTest { public static final GenericContainer collectorContainer = new GenericContainer<>( DockerImageName.parse( - "otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6")) + "otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc")) .withImagePullPolicy(PullPolicy.alwaysPull()) .withNetwork(network) .withNetworkAliases("otel-collector") diff --git a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java index 2f7882d3b80..bf901d3e7d2 100644 --- a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java +++ b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java @@ -37,7 +37,7 @@ private ExporterBenchmark() {} public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = DockerImageName.parse( - "otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"); + "otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"); protected static final int OTLP_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; protected SdkSpanBuilder sdkSpanBuilder; diff --git a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java index 00e99286280..11d8b7a9997 100644 --- a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java +++ b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java @@ -39,7 +39,7 @@ private SpanPipelineBenchmark() {} public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = DockerImageName.parse( - "otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"); + "otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"); private static final int EXPOSED_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; private Tracer tracer; diff --git a/settings.gradle.kts b/settings.gradle.kts index 593d6e29cb4..821aa980e20 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,7 @@ pluginManagement { id("com.gradle.develocity") version "4.5.0" id("de.undercouch.download") version "5.7.0" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("org.graalvm.buildtools.native") version "1.1.7" + id("org.graalvm.buildtools.native") version "1.1.9" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } }