diff --git a/build-bin/docker-compose-zipkin-gcp.yml b/build-bin/docker-compose-zipkin-gcp.yml index 7d9e2b6..5dab505 100644 --- a/build-bin/docker-compose-zipkin-gcp.yml +++ b/build-bin/docker-compose-zipkin-gcp.yml @@ -3,14 +3,14 @@ volumes: gcp-service-account: services: extract-service-account: - image: ghcr.io/openzipkin/alpine:3.19.0 + image: ghcr.io/openzipkin/alpine:3.19.1 volumes: - gcp-service-account:/credentials:rw command: -c 'echo $GOOGLE_APPLICATION_CREDENTIALS_BASE64 | base64 -d > /credentials/service-account-key.json' environment: - GOOGLE_APPLICATION_CREDENTIALS_BASE64 show-service-account: - image: ghcr.io/openzipkin/alpine:3.19.0 + image: ghcr.io/openzipkin/alpine:3.19.1 volumes: - gcp-service-account:/credentials:ro # Show that the file exists as a sanity check in logs. diff --git a/docker/Dockerfile b/docker/Dockerfile index 0871d01..c043270 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,7 +13,7 @@ # # zipkin version should match zipkin.version in /pom.xml -ARG zipkin_version=3.0.5 +ARG zipkin_version=3.0.6 # java_version is used during the installation process to build or download the module jar. # diff --git a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java index 0169e8e..ce595cc 100644 --- a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java +++ b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java @@ -16,14 +16,12 @@ import brave.Span; import brave.Tag; import brave.handler.MutableSpan; -import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; import com.google.devtools.cloudtrace.v2.AttributeValue; import com.google.devtools.cloudtrace.v2.Span.Attributes; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; -import java.net.InetSocketAddress; import java.util.Map; import static zipkin2.reporter.stackdriver.brave.SpanUtil.toTruncatableString; diff --git a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java index 044ba52..66662b0 100644 --- a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java +++ b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java @@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static zipkin2.reporter.stackdriver.brave.AttributesExtractor.toAttributeValue; -import static zipkin2.reporter.stackdriver.brave.SpanTranslator.createTimestamp; import static zipkin2.reporter.stackdriver.brave.SpanUtil.toTruncatableString; import static zipkin2.reporter.stackdriver.brave.TestObjects.clientSpan; diff --git a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java index 2b37734..d0f40ba 100644 --- a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java +++ b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java @@ -25,7 +25,6 @@ import com.linecorp.armeria.common.HttpMethod; import com.linecorp.armeria.common.RequestHeaders; import com.linecorp.armeria.common.logging.LogLevel; -import io.netty.handler.ssl.OpenSsl; import java.io.IOException; import java.util.Collections; import org.springframework.beans.factory.annotation.Autowired; @@ -94,11 +93,6 @@ StorageComponent storage( ClientFactory clientFactory, ZipkinStackdriverStorageProperties properties, Credentials credentials) { - if (!OpenSsl.isAvailable()) { - throw new IllegalStateException( - "OpenSsl is required. This usually requires netty-tcnative-boringssl-static"); - } - ClientOptionsBuilder options = ClientOptions.builder(); HttpLogging httpLogging = properties.getHttpLogging(); diff --git a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java index 37f6bcc..6618ca1 100644 --- a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java +++ b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors + * Copyright 2016-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 @@ -30,12 +30,10 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.BeforeAllCallback; -import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; diff --git a/pom.xml b/pom.xml index 4c2df5c..c4de3f3 100644 --- a/pom.xml +++ b/pom.xml @@ -74,12 +74,12 @@ io.zipkin.zipkin2 - 3.0.5 - 3.2.1 + 3.0.6 + 3.3.0 3.2.2 com.linecorp.armeria - 1.26.4 + 1.27.1 2.21.1 @@ -89,29 +89,29 @@ 6.0.0 - 1.60.0 + 1.61.1 - 3.24.0 - 32.0.1-android + 3.25.1 + 32.1.3 - 1.22.0 - 2.31.0 + 1.23.0 + 2.34.0 - 2.34.0 + 2.35.0 - 1.126.0 - 1.108.0 + 1.126.6 + 1.108.6 - 3.25.1 + 3.25.3 4.2.0 - 5.10.1 - 5.9.0 + 5.10.2 + 5.10.0 - 2.24.1 + 2.25.0 1.10.4 ${skipTests} diff --git a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java index e820a24..9780d75 100644 --- a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java +++ b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors + * Copyright 2016-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 @@ -14,7 +14,6 @@ package brave.propagation.stackdriver; import brave.propagation.B3Propagation; -import brave.propagation.Propagation; import brave.propagation.TraceContextOrSamplingFlags; import org.junit.jupiter.api.Test; diff --git a/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java b/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java index d09c80b..d9505ac 100644 --- a/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java +++ b/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java @@ -28,7 +28,6 @@ import com.google.cloud.pubsub.v1.stub.GrpcPublisherStub; import com.google.cloud.pubsub.v1.stub.PublisherStub; import com.google.cloud.pubsub.v1.stub.PublisherStubSettings; -import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.PublishRequest; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PublisherGrpc; diff --git a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java index 20fd481..f325959 100644 --- a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java +++ b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java @@ -41,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java index 115b089..a845025 100644 --- a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java +++ b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors + * Copyright 2016-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 @@ -15,7 +15,6 @@ import com.google.protobuf.Timestamp; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import zipkin2.Endpoint;