Merge branch '1.1.x'

micrometer-metrics · Jun 14, 2023 · 378df2b · 378df2b
2 parents fbffe86 + b4d5a95
commit 378df2b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -40,7 +40,7 @@ def PLATFORM_VERSIONS = [
 	// opentelemetry-instrumentation-api dependency above with this
 	'io.opentelemetry:opentelemetry-bom:1.25.+',
 	'io.opentelemetry:opentelemetry-bom-alpha:1.25.+',
-	'io.projectreactor:reactor-bom:2022.0.7', // latest release for tests
+	'io.projectreactor:reactor-bom:2022.0.8',
 	'org.junit:junit-bom:5.9.+'
 ]
 

diff --git a/...ridge-brave/src/test/java/io/micrometer/tracing/brave/contextpropagation/ScopesTests.java b/...ridge-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/...-bridge-otel/src/test/java/io/micrometer/tracing/otel/contextpropagation/ScopesTests.java b/...-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);