From c9478b65d3757295a27944cf266b18312cf4655c Mon Sep 17 00:00:00 2001 From: jack-berg Date: Thu, 9 Jun 2022 11:30:01 -0500 Subject: [PATCH 1/2] Update dependencies --- dependencyManagement/build.gradle.kts | 32 +++++++++---------- ...emetry-sdk-extension-autoconfigure-spi.txt | 10 ++++++ .../jaeger/sampler/JaegerRemoteSampler.java | 1 + .../sdk/trace/export/BatchSpanProcessor.java | 4 +-- .../trace/export/BatchSpanProcessorTest.java | 1 + 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 47faffba64e..a7a6ad79193 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -12,17 +12,17 @@ val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions val DEPENDENCY_BOMS = listOf( - "com.fasterxml.jackson:jackson-bom:2.13.2.20220328", + "com.fasterxml.jackson:jackson-bom:2.13.3", "com.google.guava:guava-bom:31.1-jre", - "com.google.protobuf:protobuf-bom:3.20.0", - "com.linecorp.armeria:armeria-bom:1.15.0", + "com.google.protobuf:protobuf-bom:3.21.1", + "com.linecorp.armeria:armeria-bom:1.16.0", "com.squareup.okhttp3:okhttp-bom:4.9.3", - "io.grpc:grpc-bom:1.45.1", - "io.micrometer:micrometer-bom:1.8.4", - "io.zipkin.brave:brave-bom:5.13.8", + "io.grpc:grpc-bom:1.47.0", + "io.micrometer:micrometer-bom:1.9.0", + "io.zipkin.brave:brave-bom:5.13.9", "io.zipkin.reporter2:zipkin-reporter-bom:2.16.3", "org.junit:junit-bom:5.8.2", - "org.testcontainers:testcontainers-bom:1.16.3", + "org.testcontainers:testcontainers-bom:1.17.2", "org.yaml:snakeyaml:1.30" ) @@ -34,12 +34,12 @@ val DEPENDENCY_SETS = listOf( ), DependencySet( "com.google.errorprone", - "2.12.1", + "2.14.0", listOf("error_prone_annotations", "error_prone_core") ), DependencySet( "io.opencensus", - "0.31.0", + "0.31.1", listOf( "opencensus-api", "opencensus-impl-core", @@ -65,7 +65,7 @@ val DEPENDENCY_SETS = listOf( ), DependencySet( "org.mockito", - "4.4.0", + "4.6.1", listOf("mockito-core", "mockito-junit-jupiter") ), DependencySet( @@ -77,28 +77,28 @@ val DEPENDENCY_SETS = listOf( val DEPENDENCIES = listOf( "com.github.stefanbirkner:system-rules:1.19.0", - "com.google.api.grpc:proto-google-common-protos:2.8.0", + "com.google.api.grpc:proto-google-common-protos:2.8.3", "com.google.code.findbugs:jsr305:3.0.2", "com.google.guava:guava-beta-checker:1.0", "com.lmax:disruptor:3.4.4", "com.sun.net.httpserver:http:20070405", "com.tngtech.archunit:archunit-junit5:0.23.1", - "com.uber.nullaway:nullaway:0.9.6", + "com.uber.nullaway:nullaway:0.9.7", // TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172 - "edu.berkeley.cs.jqf:jqf-fuzz:1.7", - "eu.rekawek.toxiproxy:toxiproxy-java:2.1.5", + "edu.berkeley.cs.jqf:jqf-fuzz:1.9", + "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", "io.github.netmikey.logunit:logunit-jul:1.1.3", "io.jaegertracing:jaeger-client:1.8.0", "io.opentelemetry.proto:opentelemetry-proto:0.18.0-alpha", "io.opentracing:opentracing-api:0.33.0", "junit:junit:4.13.2", "nl.jqno.equalsverifier:equalsverifier:3.10", - "org.assertj:assertj-core:3.22.0", + "org.assertj:assertj-core:3.23.1", "org.awaitility:awaitility:4.2.0", "org.bouncycastle:bcpkix-jdk15on:1.70", "org.codehaus.mojo:animal-sniffer-annotations:1.21", "org.jctools:jctools-core:3.3.0", - "org.junit-pioneer:junit-pioneer:1.6.2", + "org.junit-pioneer:junit-pioneer:1.7.1", "org.skyscreamer:jsonassert:1.5.0", ) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure-spi.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure-spi.txt index 15e711a77fb..1da6fe3008a 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure-spi.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure-spi.txt @@ -1,4 +1,14 @@ Comparing source compatibility of against +***! MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++! NEW METHOD: PUBLIC(+) boolean getBoolean(java.lang.String, boolean) + +++! NEW METHOD: PUBLIC(+) double getDouble(java.lang.String, double) + +++! NEW METHOD: PUBLIC(+) java.time.Duration getDuration(java.lang.String, java.time.Duration) + +++! NEW METHOD: PUBLIC(+) int getInt(java.lang.String, int) + +++! NEW METHOD: PUBLIC(+) java.util.List getList(java.lang.String, java.util.List) + +++! NEW METHOD: PUBLIC(+) long getLong(java.lang.String, long) + +++! NEW METHOD: PUBLIC(+) java.util.Map getMap(java.lang.String, java.util.Map) + +++! NEW METHOD: PUBLIC(+) java.lang.String getString(java.lang.String, java.lang.String) +++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider (not serializable) +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. +++ NEW SUPERCLASS: java.lang.Object diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java index 7f175c51132..05f4c5e3f5d 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java +++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java @@ -123,6 +123,7 @@ public static JaegerRemoteSamplerBuilder builder() { } @Override + @SuppressWarnings("Interruption") public void close() { pollFuture.cancel(true); pollExecutor.shutdownNow(); diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java index ad805b4c1b1..8fe02033624 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java @@ -42,6 +42,8 @@ */ public final class BatchSpanProcessor implements SpanProcessor { + private static final Logger logger = Logger.getLogger(BatchSpanProcessor.class.getName()); + private static final String WORKER_THREAD_NAME = BatchSpanProcessor.class.getSimpleName() + "_WorkerThread"; private static final AttributeKey SPAN_PROCESSOR_TYPE_LABEL = @@ -145,8 +147,6 @@ public String toString() { // the data. private static final class Worker implements Runnable { - private static final Logger logger = Logger.getLogger(Worker.class.getName()); - private final LongCounter processedSpansCounter; private final Attributes droppedAttrs; private final Attributes exportedAttrs; diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java index de12f5973d3..058225ce429 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java @@ -507,6 +507,7 @@ void stringRepresentation() { @Test @Timeout(5) + @SuppressLogger(BatchSpanProcessor.class) void exporterThrowsNonRuntimeException() { when(mockSpanExporter.export(anyList())) .thenAnswer( From 58448ff01e0bc557c46954f8fa2324c51d0630d7 Mon Sep 17 00:00:00 2001 From: jack-berg Date: Thu, 9 Jun 2022 13:23:27 -0500 Subject: [PATCH 2/2] revert jqf-fuzz to 1.7 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index a7a6ad79193..b886d48fa5c 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -85,7 +85,7 @@ val DEPENDENCIES = listOf( "com.tngtech.archunit:archunit-junit5:0.23.1", "com.uber.nullaway:nullaway:0.9.7", // TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172 - "edu.berkeley.cs.jqf:jqf-fuzz:1.9", + "edu.berkeley.cs.jqf:jqf-fuzz:1.7", "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", "io.github.netmikey.logunit:logunit-jul:1.1.3", "io.jaegertracing:jaeger-client:1.8.0",