From 733ad17b9e11154a08839e21213a505e4de08880 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Mon, 4 Oct 2021 17:06:54 -0700 Subject: [PATCH] tests clean up --- .../instrumentation/reactor/ReactorCoreTest.groovy | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy b/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy index 82c8a2cde602..484ce49e3aae 100644 --- a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy +++ b/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.reactor import io.opentelemetry.api.GlobalOpenTelemetry import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind +import io.opentelemetry.api.trace.StatusCode +import io.opentelemetry.context.Context import io.opentelemetry.instrumentation.test.LibraryTestTrait import reactor.core.publisher.Flux import reactor.core.publisher.Mono @@ -126,7 +128,7 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai .doOnEach({ signal -> if (signal.isOnError()) { // reactor 3.1 does not support getting context here yet - Span.current().setStatus(status) + Span.current().setStatus(StatusCode.ERROR) Span.current().end() } else if (signal.isOnComplete()) { Span.current().end() @@ -134,10 +136,9 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai }) .subscriberContext({ ctx -> - io.opentelemetry.context.Context parent = - TracingOperator.fromContextOrDefault(ctx, io.opentelemetry.context.Context.current()) + def parent = TracingOperator.fromContextOrDefault(ctx, Context.current()) - Span innerSpan = GlobalOpenTelemetry.getTracer("test") + def innerSpan = GlobalOpenTelemetry.getTracer("test") .spanBuilder(spanName) .setParent(parent) .startSpan() @@ -152,7 +153,7 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai } else if (publisher instanceof Flux) { return Flux.just("") } else { - throw new IllegalStateException("Unknown publisher: " + publisher) + throw new IllegalStateException("Unknown publisher") } } }