diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 74bd601d6e05..2cad87aa76af 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -5,7 +5,7 @@ com.azure:azure-sdk-all;1.0.0;1.0.0 com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-core;1.2.0-beta.1;1.2.0-beta.1 -com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.9 +com.azure:azure-core-amqp;1.0.0-beta.9;1.0.0-beta.9 com.azure:azure-core-http-netty;1.1.0;1.2.0-beta.1 com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1 com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8 diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/TracerProvider.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/TracerProvider.java index e9b1569471a8..f39076bf10e7 100644 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/TracerProvider.java +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/TracerProvider.java @@ -115,7 +115,7 @@ private void end(String statusMessage, Throwable throwable, Context context) { } private String getSpanName(ProcessKind processKind) { - String spanName = "Azure.eventhubs."; + String spanName = "EventHubs."; switch (processKind) { case SEND: spanName += "send"; diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/TracerProviderTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/TracerProviderTest.java index e0b423589278..1c48c1c00181 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/TracerProviderTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/TracerProviderTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; public class TracerProviderTest { - private static final String METHOD_NAME = "Azure.eventhubs.send"; + private static final String METHOD_NAME = "EventHubs.send"; @Mock private Tracer tracer; diff --git a/sdk/core/azure-core-tracing-opencensus/src/main/java/com/azure/core/tracing/opencensus/OpenCensusTracer.java b/sdk/core/azure-core-tracing-opencensus/src/main/java/com/azure/core/tracing/opencensus/OpenCensusTracer.java index 055406152644..c786fdfdbfe7 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/main/java/com/azure/core/tracing/opencensus/OpenCensusTracer.java +++ b/sdk/core/azure-core-tracing-opencensus/src/main/java/com/azure/core/tracing/opencensus/OpenCensusTracer.java @@ -256,10 +256,9 @@ private void addSpanRequestAttributes(Span span, Context context, String spanNam */ private static String parseComponentValue(String spanName) { if (spanName != null && spanName.length() > 0) { - int componentNameStartIndex = spanName.indexOf("."); int componentNameEndIndex = spanName.lastIndexOf("."); - if (componentNameStartIndex != -1 && componentNameEndIndex != -1) { - return spanName.substring(componentNameStartIndex + 1, componentNameEndIndex); + if (componentNameEndIndex != -1) { + return spanName.substring(0, componentNameEndIndex); } } return ""; diff --git a/sdk/core/azure-core-tracing-opencensus/src/test/java/com/azure/core/tracing/opencensus/OpenCensusTracerTest.java b/sdk/core/azure-core-tracing-opencensus/src/test/java/com/azure/core/tracing/opencensus/OpenCensusTracerTest.java index e562b5013687..76923ef78af1 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/test/java/com/azure/core/tracing/opencensus/OpenCensusTracerTest.java +++ b/sdk/core/azure-core-tracing-opencensus/src/test/java/com/azure/core/tracing/opencensus/OpenCensusTracerTest.java @@ -36,10 +36,10 @@ * Tests OpenCensus tracing package using opencensus-impl */ public class OpenCensusTracerTest { - private static final String METHOD_NAME = "Azure.eventhubs.send"; + private static final String METHOD_NAME = "EventHubs.send"; private static final String HOSTNAME_VALUE = "testEventDataNameSpace.servicebus.windows.net"; private static final String ENTITY_PATH_VALUE = "test"; - private static final String COMPONENT_VALUE = "eventhubs"; + private static final String COMPONENT_VALUE = "EventHubs"; private OpenCensusTracer openCensusTracer; private Tracer tracer; private Context tracingContext; diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index ae635dfcba54..780d77ac2ad6 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -1,6 +1,7 @@ # Release History ## Version 1.0.0-beta.2 (2020-01-03) - Add eventhub properties to attributes of processing spans. +- Remove `Azure` prefix from convenience layer span names. This package's [documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opentelemetry_1.0.0-beta.2/sdk/core/azure-core-tracing-opentelemetry/README.md) 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 f12babc1f72d..d0040fcf23fc 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 @@ -247,15 +247,14 @@ private void addSpanRequestAttributes(Span span, Context context, String spanNam /** * Extracts the component name from the given span name. * - * @param spanName The spanName containing the component name i.e spanName = "Azure.eventhubs.send" + * @param spanName The spanName containing the component name i.e spanName = "EventHubs.send" * @return The component name contained in the context i.e "eventhubs" */ private static String parseComponentValue(String spanName) { if (spanName != null && !spanName.isEmpty()) { - int componentNameStartIndex = spanName.indexOf("."); int componentNameEndIndex = spanName.lastIndexOf("."); - if (componentNameStartIndex != -1 && componentNameEndIndex != -1) { - return spanName.substring(componentNameStartIndex + 1, componentNameEndIndex); + if (componentNameEndIndex != -1) { + return spanName.substring(0, componentNameEndIndex); } } return ""; 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 810712c757f3..dfb362de9756 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 @@ -41,10 +41,10 @@ * Tests Azure-OpenTelemetry tracing package using opentelemetry-sdk */ public class OpenTelemetryTracerTest { - private static final String METHOD_NAME = "Azure.eventhubs.send"; + private static final String METHOD_NAME = "EventHubs.send"; private static final String HOSTNAME_VALUE = "testEventDataNameSpace.servicebus.windows.net"; private static final String ENTITY_PATH_VALUE = "test"; - private static final String COMPONENT_VALUE = "eventhubs"; + private static final String COMPONENT_VALUE = "EventHubs"; private OpenTelemetryTracer openTelemetryTracer; private Tracer tracer; private Context tracingContext; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java index f9f03d253d7c..a23a4bc1cf9a 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java @@ -196,7 +196,7 @@ private Method determineResumeMethod(Method method, String resumeMethodName) { * @return The updated context containing the span context. */ private Context startTracingSpan(Method method, Context context) { - String spanName = String.format("Azure.%s/%s", interfaceParser.getServiceName(), method.getName()); + String spanName = String.format("%s.%s", interfaceParser.getServiceName(), method.getName()); context = TracerProxy.setSpanName(spanName, context); return TracerProxy.start(spanName, context); } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index c4faf82fded4..25907cddd2a7 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -42,7 +42,7 @@ com.azure azure-core-amqp - 1.0.0-beta.8 + 1.0.0-beta.9 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java index bd69306be76d..0676d5f1145f 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java @@ -230,14 +230,14 @@ public void sendStartSpanSingleMessage() { .thenReturn(Mono.just(sendLink)); when(sendLink.send(anyList())).thenReturn(Mono.empty()); - when(tracer1.start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( + when(tracer1.start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( + when(tracer1.start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value").addData(DIAGNOSTIC_ID_KEY, "value2"); @@ -250,9 +250,9 @@ public void sendStartSpanSingleMessage() { // Assert verify(tracer1, times(1)) - .start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND)); + .start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); verify(tracer1, times(2)) - .start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + .start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, times(3)).end(eq("success"), isNull(), any()); } @@ -287,7 +287,7 @@ public void sendMessageRetrySpanTest() { .thenReturn(Mono.just(sendLink)); when(sendLink.send(anyList())).thenReturn(Mono.empty()); - when(tracer1.start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( + when(tracer1.start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value"); @@ -299,8 +299,8 @@ public void sendMessageRetrySpanTest() { //Assert verify(tracer1, times(1)) - .start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND)); - verify(tracer1, never()).start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + .start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); + verify(tracer1, never()).start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, never()).addLink(any()); verify(tracer1, times(1)).end(eq("success"), isNull(), any()); } @@ -404,7 +404,7 @@ public void startMessageSpansOnCreateBatch() { eq(retryOptions.getTryTimeout()), any())) .thenReturn(Mono.just(link)); - when(tracer1.start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( + when(tracer1.start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value").addData(DIAGNOSTIC_ID_KEY, "value2"); @@ -419,7 +419,7 @@ public void startMessageSpansOnCreateBatch() { .verifyComplete(); verify(tracer1, times(1)) - .start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + .start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, times(1)).end(eq("success"), isNull(), any()); } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java index c26330c72cf4..b06267314e79 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java @@ -156,13 +156,13 @@ public void sendStartSpanSingleMessage() { eq(retryOptions.getTryTimeout()), any())) .thenReturn(Mono.just(sendLink)); - when(tracer1.start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( + when(tracer1.start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( + when(tracer1.start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value").addData(DIAGNOSTIC_ID_KEY, "value2"); @@ -173,9 +173,9 @@ public void sendStartSpanSingleMessage() { //Assert verify(tracer1, times(1)) - .start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND)); + .start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); verify(tracer1, times(1)) - .start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + .start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, times(2)).end(eq("success"), isNull(), any()); } @@ -202,7 +202,7 @@ public void sendMessageRetrySpanTest() { final EventData eventData = new EventData("hello-world".getBytes(UTF_8)) .addContext(SPAN_CONTEXT_KEY, Context.NONE); - when(tracer1.start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( + when(tracer1.start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value"); @@ -213,8 +213,8 @@ public void sendMessageRetrySpanTest() { producer.send(eventData); //Assert - verify(tracer1, times(1)).start(eq("Azure.eventhubs.send"), any(), eq(ProcessKind.SEND)); - verify(tracer1, never()).start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + verify(tracer1, times(1)).start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); + verify(tracer1, never()).start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, never()).addLink(any()); verify(tracer1, times(1)).end(eq("success"), isNull(), any()); } @@ -317,7 +317,7 @@ public void startsMessageSpanOnEventBatch() { eq(retryOptions.getTryTimeout()), any())) .thenReturn(Mono.just(link)); - when(tracer1.start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( + when(tracer1.start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(PARENT_SPAN_KEY, "value").addData(DIAGNOSTIC_ID_KEY, "value2"); @@ -330,7 +330,7 @@ public void startsMessageSpanOnEventBatch() { Assertions.assertTrue(batch.tryAdd(new EventData("Test World".getBytes(UTF_8)))); verify(tracer1, times(2)) - .start(eq("Azure.eventhubs.message"), any(), eq(ProcessKind.MESSAGE)); + .start(eq("EventHubs.message"), any(), eq(ProcessKind.MESSAGE)); verify(tracer1, times(2)).end(eq("success"), isNull(), any()); } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientTest.java index eaecfa90e3e0..d21a3d870b4e 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientTest.java @@ -128,7 +128,7 @@ public void testWithSimplePartitionProcessor() throws Exception { return passed.addData(SPAN_CONTEXT_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( + when(tracer1.start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(SPAN_CONTEXT_KEY, "value1") @@ -200,7 +200,7 @@ public void testWithFaultyPartitionProcessor() throws Exception { return passed.addData(SPAN_CONTEXT_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( + when(tracer1.start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(SPAN_CONTEXT_KEY, "value1") @@ -256,7 +256,7 @@ public void testErrorProcessSpans() throws Exception { return passed.addData(SPAN_CONTEXT_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( + when(tracer1.start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(SPAN_CONTEXT_KEY, "value1") @@ -277,7 +277,7 @@ public void testErrorProcessSpans() throws Exception { //Assert verify(tracer1, times(1)).extractContext(eq(diagnosticId), any()); - verify(tracer1, times(1)).start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS)); + verify(tracer1, times(1)).start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS)); verify(tracer1, times(1)).end(eq(""), any(IllegalStateException.class), any()); } @@ -316,7 +316,7 @@ public void testProcessSpans() throws Exception { return passed.addData(SPAN_CONTEXT_KEY, "value"); } ); - when(tracer1.start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( + when(tracer1.start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS))).thenAnswer( invocation -> { Context passed = invocation.getArgument(1, Context.class); return passed.addData(SPAN_CONTEXT_KEY, "value1").addData("scope", (Closeable) () -> { @@ -337,7 +337,7 @@ public void testProcessSpans() throws Exception { //Assert verify(tracer1, times(1)).extractContext(eq(diagnosticId), any()); - verify(tracer1, times(1)).start(eq("Azure.eventhubs.process"), any(), eq(ProcessKind.PROCESS)); + verify(tracer1, times(1)).start(eq("EventHubs.process"), any(), eq(ProcessKind.PROCESS)); verify(tracer1, times(1)).end(eq("success"), isNull(), any()); }