open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing tests on the main branch (merge conflict) (#2826)

This commit is contained in:
Mateusz Rzeszutek 2021-04-20 18:06:37 +02:00 committed by GitHub
parent c7e431404e
commit 48d9e49cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
instrumentation/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy
View File

@ -4,8 +4,9 @@
*/ */
import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.SpanKind
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.api.trace.StatusCode
import io.opentelemetry.instrumentation.reactor.TracedWithSpan import io.opentelemetry.instrumentation.reactor.TracedWithSpan
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
import reactor.core.publisher.Flux import reactor.core.publisher.Flux
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
import reactor.core.publisher.UnicastProcessor import reactor.core.publisher.UnicastProcessor
@ -30,7 +31,6 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.mono" name "TracedWithSpan.mono"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -63,7 +63,6 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.mono" name "TracedWithSpan.mono"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -88,7 +87,7 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.mono" name "TracedWithSpan.mono"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }
@ -122,7 +121,7 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.mono" name "TracedWithSpan.mono"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }
@ -148,7 +147,6 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.flux" name "TracedWithSpan.flux"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -180,7 +178,6 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.flux" name "TracedWithSpan.flux"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -205,7 +202,7 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.flux" name "TracedWithSpan.flux"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }
@ -237,7 +234,7 @@ class ReactorWithSpanInstrumentationTest extends AgentInstrumentationSpecificati
name "TracedWithSpan.flux" name "TracedWithSpan.flux"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }