From 60e6359d844c2d212923ed3eaef19c6f0600e6c7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 14 Jun 2023 12:25:59 +0200 Subject: [PATCH] Upgraded reactor to 2022.0.8; fixes gh-287 --- dependencies.gradle | 2 +- .../micrometer-tracing-bridge-brave/gradle.lockfile | 4 ++-- .../tracing/brave/contextpropagation/ScopesTests.java | 3 --- .../micrometer-tracing-bridge-otel/gradle.lockfile | 4 ++-- .../tracing/otel/contextpropagation/ScopesTests.java | 3 --- .../micrometer-tracing-reporter-wavefront/gradle.lockfile | 2 +- .../micrometer-tracing-integration-test/gradle.lockfile | 2 +- .../micrometer-tracing-test/gradle.lockfile | 2 +- micrometer-tracing/gradle.lockfile | 2 +- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c5ce6bb4..d771cfa8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,7 +36,7 @@ def PLATFORM_VERSIONS = [ // opentelemetry-instrumentation-api dependency above with this 'io.opentelemetry:opentelemetry-bom:1.19.+', 'io.opentelemetry:opentelemetry-bom-alpha:1.19.+', - 'io.projectreactor:reactor-bom:2022.0.7', + 'io.projectreactor:reactor-bom:2022.0.8', 'org.junit:junit-bom:5.9.+' ] diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile index 1bf9e098..a2b27b10 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile @@ -34,8 +34,8 @@ io.micrometer:micrometer-observation-test:1.10.8=testCompileClasspath,testRuntim io.micrometer:micrometer-observation:1.10.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.5.6=testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.5.7=testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java index 2a1ec6ca..ff481aed 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java @@ -34,7 +34,6 @@ import io.micrometer.tracing.brave.bridge.BraveTracer; import io.micrometer.tracing.handler.DefaultTracingObservationHandler; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import reactor.core.publisher.Hooks; import reactor.core.publisher.Mono; @@ -44,8 +43,6 @@ import static org.assertj.core.api.BDDAssertions.then; -// TODO re-enable after upgrading to reactor 2020.0.8 -@Disabled("See gh-287") class ScopesTests { private static final InternalLogger logger = InternalLoggerFactory.getInstance(ScopesTests.class); diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile index 700ac306..89d4984f 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile @@ -45,8 +45,8 @@ io.opentelemetry:opentelemetry-sdk-trace:1.19.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-semconv:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.5.6=testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.5.7=testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/contextpropagation/ScopesTests.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/contextpropagation/ScopesTests.java index e2837a37..36a4674e 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/contextpropagation/ScopesTests.java +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/contextpropagation/ScopesTests.java @@ -33,7 +33,6 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import reactor.core.publisher.Hooks; import reactor.core.publisher.Mono; @@ -44,8 +43,6 @@ import static org.assertj.core.api.BDDAssertions.then; -// TODO re-enable after upgrading to reactor 2020.0.8 -@Disabled("See gh-287") class ScopesTests { private static final InternalLogger logger = InternalLoggerFactory.getInstance(ScopesTests.class); diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile index 4ce73c1f..4c66d526 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile @@ -52,7 +52,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.19.0=compileClasspath,runtimeClassp io.opentelemetry:opentelemetry-sdk-trace:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-semconv:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile index a6ec949b..0c88f7ab 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile @@ -63,7 +63,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.19.0=compileClasspath,runtimeClassp io.opentelemetry:opentelemetry-sdk-trace:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-semconv:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp diff --git a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile index af5fa064..43232390 100644 --- a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile @@ -29,7 +29,7 @@ io.micrometer:micrometer-commons:1.10.8=compileClasspath,runtimeClasspath,testCo io.micrometer:micrometer-observation:1.10.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp diff --git a/micrometer-tracing/gradle.lockfile b/micrometer-tracing/gradle.lockfile index f3e34601..58cd30a8 100644 --- a/micrometer-tracing/gradle.lockfile +++ b/micrometer-tracing/gradle.lockfile @@ -30,7 +30,7 @@ io.micrometer:micrometer-core:1.10.8=compileClasspath,runtimeClasspath,testCompi io.micrometer:micrometer-observation:1.10.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-bom:2022.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-bom:2022.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle io.spring.javaformat:spring-javaformat-config:0.0.39=checkstyle io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp