From 96c5d66e927a565ce0c42aab375af1aa28d929f7 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 3 Feb 2020 13:59:14 -0800 Subject: [PATCH 1/2] update span kind for Otel --- .../core/tracing/opentelemetry/OpenTelemetryTracer.java | 6 +++--- .../core/tracing/opentelemetry/OpenTelemetryTracerTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java index 04fdc9caab317..4cd632fee4abf 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java @@ -86,7 +86,7 @@ public Context start(String spanName, Context context, ProcessKind processKind) return context.addData(PARENT_SPAN_KEY, span); case MESSAGE: spanBuilder = getSpanBuilder(spanName, context); - span = spanBuilder.startSpan(); + span = spanBuilder.setSpanKind(Span.Kind.PRODUCER).startSpan(); // Add diagnostic Id and trace-headers to Context context = setContextData(span); return context.addData(PARENT_SPAN_KEY, span); @@ -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 @@ -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(); } diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java index c84861834abb0..5be6f59937673 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java @@ -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()); @@ -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 attributeMap = recordEventsSpan.toSpanData().getAttributes(); verifySpanAttributes(attributeMap); @@ -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()); From 5aff0f1758f4d26c8fd44780bb1ea9a0587201c7 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 3 Feb 2020 15:49:17 -0800 Subject: [PATCH 2/2] update send span kind to client --- .../azure/core/tracing/opentelemetry/OpenTelemetryTracer.java | 2 +- .../core/tracing/opentelemetry/OpenTelemetryTracerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java index 4cd632fee4abf..83a7cd211692c 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java @@ -78,7 +78,7 @@ 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); diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java index 5be6f59937673..75ce161b44ba5 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java @@ -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 attributeMap = recordEventsSpan.toSpanData().getAttributes();