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 merge conflict on the main branch (#2882)

This commit is contained in:
Mateusz Rzeszutek 2021-04-28 18:39:50 +02:00 committed by GitHub
parent 5c15f5e29f
commit 5810e4c0b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
instrumentation/guava-10.0/javaagent/src/test/groovy/GuavaWithSpanInstrumentationTest.groovy
View File

@ -6,6 +6,7 @@
import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.SettableFuture import com.google.common.util.concurrent.SettableFuture
import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.SpanKind
import io.opentelemetry.api.trace.StatusCode
import io.opentelemetry.instrumentation.guava.TracedWithSpan import io.opentelemetry.instrumentation.guava.TracedWithSpan
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
@ -22,7 +23,6 @@ class GuavaWithSpanInstrumentationTest extends AgentInstrumentationSpecification
name "TracedWithSpan.listenableFuture" name "TracedWithSpan.listenableFuture"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -42,7 +42,7 @@ class GuavaWithSpanInstrumentationTest extends AgentInstrumentationSpecification
name "TracedWithSpan.listenableFuture" name "TracedWithSpan.listenableFuture"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }
@ -68,7 +68,6 @@ class GuavaWithSpanInstrumentationTest extends AgentInstrumentationSpecification
name "TracedWithSpan.listenableFuture" name "TracedWithSpan.listenableFuture"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored false
attributes { attributes {
} }
} }
@ -94,7 +93,7 @@ class GuavaWithSpanInstrumentationTest extends AgentInstrumentationSpecification
name "TracedWithSpan.listenableFuture" name "TracedWithSpan.listenableFuture"
kind SpanKind.INTERNAL kind SpanKind.INTERNAL
hasNoParent() hasNoParent()
errored true status StatusCode.ERROR
errorEvent(IllegalArgumentException, "Boom") errorEvent(IllegalArgumentException, "Boom")
attributes { attributes {
} }