fix merge conflict

open-telemetry · Apr 19, 2022 · 6c82d64 · 6c82d64
1 parent 21ee219
commit 6c82d64
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpRouteHolderTest.java b/...test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpRouteHolderTest.java
@@ -31,7 +31,7 @@ void shouldSetRouteEvenIfSpanIsNotSampled() {
 
     Context context = Context.root();
     context = context.with(span);
-    context = SpanKey.SERVER.storeInContext(context, span);
+    context = SpanKey.HTTP_SERVER.storeInContext(context, span);
     context = HttpRouteHolder.get().start(context, null, Attributes.empty());
 
     assertNull(HttpRouteHolder.getRoute(context));