Skip to content

Commit 570924b

Browse files
author
Anuraag Agrawal
authored
Fix post-merge conflict in OpenTelemetryRule. (#2014)
1 parent f01456b commit 570924b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit4/OpenTelemetryRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.api.trace.propagation.HttpTraceContext;
1010
import io.opentelemetry.context.propagation.DefaultContextPropagators;
11-
import io.opentelemetry.exporter.inmemory.InMemorySpanExporter;
1211
import io.opentelemetry.sdk.OpenTelemetrySdk;
12+
import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
1313
import io.opentelemetry.sdk.trace.TracerSdkManagement;
1414
import io.opentelemetry.sdk.trace.TracerSdkProvider;
1515
import io.opentelemetry.sdk.trace.data.SpanData;

0 commit comments

Comments
 (0)