Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EventHubs distributed tracing update span kind #7913

Merged
merged 2 commits into from
Feb 4, 2020
Merged

EventHubs distributed tracing update span kind #7913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c5d66
update span kind for Otel
samvaity Feb 3, 2020
5aff0f1
update send span kind to client
samvaity Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ public Context start(String spanName, Context context, ProcessKind processKind)
if (spanBuilder == null) {
return Context.NONE;
}
span = spanBuilder.setSpanKind(Span.Kind.PRODUCER).startSpan();
span = spanBuilder.setSpanKind(Span.Kind.CLIENT).startSpan();
if (span.isRecording()) {
// If span is sampled in, add additional request attributes
addSpanRequestAttributes(span, context, spanName);
}
return context.addData(PARENT_SPAN_KEY, span);
case MESSAGE:
spanBuilder = getSpanBuilder(spanName, context);
span = spanBuilder.startSpan();
span = spanBuilder.setSpanKind(Span.Kind.PRODUCER).startSpan();
samvaity marked this conversation as resolved.
Show resolved Hide resolved
// Add diagnostic Id and trace-headers to Context
context = setContextData(span);
return context.addData(PARENT_SPAN_KEY, span);
Expand Down Expand Up @@ -206,7 +206,7 @@ private Context startScopedSpan(String spanName, Context context) {
span = startSpanWithRemoteParent(spanName, spanContext);
} else {
Builder spanBuilder = getSpanBuilder(spanName, context);
span = spanBuilder.setSpanKind(Span.Kind.SERVER).startSpan();
span = spanBuilder.setSpanKind(Span.Kind.CONSUMER).startSpan();
}
if (span.isRecording()) {
// If span is sampled in, add additional request attributes
Expand All @@ -225,7 +225,7 @@ private Context startScopedSpan(String spanName, Context context) {
*/
private static Span startSpanWithRemoteParent(String spanName, SpanContext spanContext) {
Builder spanBuilder = TRACER.spanBuilder(spanName).setParent(spanContext);
spanBuilder.setSpanKind(Span.Kind.SERVER);
spanBuilder.setSpanKind(Span.Kind.CONSUMER);
return spanBuilder.startSpan();
}

Expand Down
8 changes: 4 additions & 4 deletions ...telemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void startSpanProcessKindSend() {
assertSpanWithExplicitParent(updatedContext, parentSpanId);
final ReadableSpan recordEventsSpan =
(ReadableSpan) updatedContext.getData(PARENT_SPAN_KEY).get();
assertEquals(Span.Kind.PRODUCER, recordEventsSpan.toSpanData().getKind());
assertEquals(Span.Kind.CLIENT, recordEventsSpan.toSpanData().getKind());

// verify span attributes
final Map<String, AttributeValue> attributeMap = recordEventsSpan.toSpanData().getAttributes();
Expand All @@ -163,7 +163,7 @@ public void startSpanProcessKindMessage() {
// verify no kind set on Span for message
final ReadableSpan recordEventsSpan =
(ReadableSpan) updatedContext.getData(PARENT_SPAN_KEY).get();
assertEquals(Span.Kind.INTERNAL, recordEventsSpan.toSpanData().getKind());
assertEquals(Span.Kind.PRODUCER, recordEventsSpan.toSpanData().getKind());
// verify diagnostic id and span context returned
assertNotNull(updatedContext.getData(SPAN_CONTEXT_KEY).get());
assertNotNull(updatedContext.getData(DIAGNOSTIC_ID_KEY).get());
Expand All @@ -188,7 +188,7 @@ public void startSpanProcessKindProcess() {
assertNotNull(updatedContext.getData(SCOPE_KEY).get());
final ReadableSpan recordEventsSpan =
(ReadableSpan) updatedContext.getData(PARENT_SPAN_KEY).get();
assertEquals(Span.Kind.SERVER, recordEventsSpan.toSpanData().getKind());
assertEquals(Span.Kind.CONSUMER, recordEventsSpan.toSpanData().getKind());
// verify span attributes
final Map<String, AttributeValue> attributeMap = recordEventsSpan.toSpanData().getAttributes();
verifySpanAttributes(attributeMap);
Expand Down Expand Up @@ -438,7 +438,7 @@ private static void assertSpanWithRemoteParent(Context updatedContext, SpanId pa
final ReadableSpan recordEventsSpan =
(ReadableSpan) updatedContext.getData(PARENT_SPAN_KEY).get();
assertEquals(METHOD_NAME, recordEventsSpan.getName());
assertEquals(Span.Kind.SERVER, recordEventsSpan.toSpanData().getKind());
assertEquals(Span.Kind.CONSUMER, recordEventsSpan.toSpanData().getKind());

// verify span started with remote parent
assertTrue(recordEventsSpan.toSpanData().getHasRemoteParent());
Expand Down