Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #4519

Merged
merged 2 commits into from
Jun 10, 2022
Merged

Update dependencies #4519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9478b6
Update dependencies
jack-berg Jun 9, 2022
58448ff
revert jqf-fuzz to 1.7
jack-berg Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ val dependencyVersions = hashMapOf<String, String>()
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"
)

Expand All @@ -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",
Expand All @@ -65,7 +65,7 @@ val DEPENDENCY_SETS = listOf(
),
DependencySet(
"org.mockito",
"4.4.0",
"4.6.1",
listOf("mockito-core", "mockito-junit-jupiter")
),
DependencySet(
Expand All @@ -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",
"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",
)

Expand Down
10 changes: 10 additions & 0 deletions docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure-spi.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...rc/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public static JaegerRemoteSamplerBuilder builder() {
}

@Override
@SuppressWarnings("Interruption")
public void close() {
pollFuture.cancel(true);
pollExecutor.shutdownNow();
Expand Down
4 changes: 2 additions & 2 deletions sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> SPAN_PROCESSOR_TYPE_LABEL =
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ void stringRepresentation() {

@Test
@Timeout(5)
@SuppressLogger(BatchSpanProcessor.class)
void exporterThrowsNonRuntimeException() {
when(mockSpanExporter.export(anyList()))
.thenAnswer(
Expand Down