From 9e9951bc406cc0152e6b8ed0c46664b42b144c55 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Fri, 22 Nov 2019 10:56:31 -0800 Subject: [PATCH 1/7] update samples and package versions --- .../CHANGELOG.md | 8 ++++ .../azure-core-tracing-opencensus/README.md | 19 +++++---- .../src/samples/AsyncListKeyVaultSecrets.md | 4 +- .../AsyncQueueClientEnqueueMessages.md | 4 +- .../src/samples/ListeKeyVaultSecrets.md | 4 +- .../src/samples/PublishEvents.md | 38 ++++++++++-------- .../src/samples/QueueClientEnqueueMessages.md | 4 +- .../CHANGELOG.md | 11 +++++- .../README.md | 14 +++++-- .../samples/AsyncListKeyVaultSecretsSample.md | 6 +-- ...CreateConfigurationSettingTracingSample.md | 4 +- .../ListKeyVaultSecretsTracingSample.md | 6 +-- .../src/samples/PublishEventsTracingSample.md | 39 ++++++++++++------- 13 files changed, 103 insertions(+), 58 deletions(-) diff --git a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md index 7e9f54f15c0f..79f75dd6b48b 100644 --- a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md @@ -1,4 +1,12 @@ # Release History +## Version 1.0.0-beta.5 (2019-11-25) +For details on the Azure SDK for Java (December 2019 Preview) release refer to the [release announcement](https://aka.ms/azure-sdk-preview6-java). +Version 1.0.0-beta.5 extended support for 0.24.0 opencensus-api package version. + +This package's +[documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opencensus_1.0.0-beta.5/sdk/core/azure-core-tracing-opencensus/README.md) +and +[samples](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opencensus_1.0.0-beta.5/sdk/core/azure-core-tracing-opencensus/src/samples). ## Version 1.0.0-preview.4 (2019-10-31) diff --git a/sdk/core/azure-core-tracing-opencensus/README.md b/sdk/core/azure-core-tracing-opencensus/README.md index abdc816c6205..f5c87194e4b5 100644 --- a/sdk/core/azure-core-tracing-opencensus/README.md +++ b/sdk/core/azure-core-tracing-opencensus/README.md @@ -19,7 +19,7 @@ documentation][api_documentation] | [Samples][samples] com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) @@ -38,7 +38,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 com.azure @@ -54,7 +54,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-http-okhttp - 1.0.0 + 1.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -137,10 +137,15 @@ private static final Tracer TRACER; .buildProducer(); try (Scope scope = TRACER.spanBuilder("tracing-user-span").startScopedSpan()) { - Context tracingContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - // Create an event to send - final EventData eventData = new EventData("Hello world!".getBytes(UTF_8), traceContext); - producer.send(eventData); + EventData event1 = new EventData("1".getBytes(UTF_8)); + event1.addContext(PARENT_SPAN_KEY, span); + + EventDataBatch eventDataBatch = producer.createBatch(); + + if (!eventDataBatch.tryAdd(eventData)) { + producer.send(eventDataBatch); + eventDataBatch = producer.createBatch(); + } } finally { Tracing.getExportComponent().shutdown(); } diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md index 01aa2ddd62fd..90759410b3d0 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md @@ -12,7 +12,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-security-keyvault-secrets - 4.0.0 + 4.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -22,7 +22,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md index b8aaf0a1fb9c..8481c64bf0f1 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-storage-queue - 12.0.0 + 12.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -23,7 +23,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md b/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md index 6e1339b6d01b..3f3a2e7f0a06 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md @@ -12,7 +12,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-security-keyvault-secrets - 4.0.0 + 4.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -22,7 +22,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md index fb48bd0bd601..9e1d65e57f45 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-messaging-eventhubs - 5.0.0-beta.5 + 5.0.0-beta.6 ``` [//]: # ({x-version-update-end}) @@ -66,25 +66,31 @@ public class PublishEvents { } public static void main(String[] args) { - final int count = 2; - final byte[] body = "Hello World!".getBytes(UTF_8); + EventHubProducerClient producer = new EventHubClientBuilder() + .connectionString(connectionString) + .buildProducerClient(); try(Scope scope = TRACER.spanBuilder("user-parent-span").startScopedSpan()) { + final EventData event1 = new EventData("1".getBytes(UTF_8)); + event1.addContext(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); + + final EventData event2 = new EventData("2".getBytes(UTF_8)); + event2.addContext(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - Context traceContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - - EventHubProducerClient producer = new EventHubClientBuilder() - .connectionString(CONNECTION_STRING) - .buildProducer(); + final List telemetryEvents = Arrays.asList(event1, event2); + final CreateBatchOptions options = new CreateBatchOptions() + .setPartitionKey("telemetry") + .setMaximumSizeInBytes(256); + + EventDataBatch currentBatch = producer.createBatch(options); - final Context traceContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - final Flux testData = Flux.range(0, count) - .flatMap(number -> { - final EventData data = new EventData(body, traceContext); - return Flux.just(data); - }); - - producer.send(testData.toIterable(1)); + // For each telemetry event, we try to add it to the current batch. + for (EventData event : telemetryEvents) { + if (!currentBatch.tryAdd(event)) { + producer.send(currentBatch); + currentBatch = producer.createBatch(options); + } + } } finally { producer.close(); Tracing.getExportComponent().shutdown(); diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md b/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md index 8420f1e8e250..e85fb6668396 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-storage-queue - 12.0.0 + 12.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -23,7 +23,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index 4239c9da32e7..9a44e2ec7468 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -1,5 +1,14 @@ # Release History -## Version 1.0.0-beta.1 (-12-) +## Version 1.0.0-beta.1 (2019-11-25) For details on the Azure SDK for Java (Decemeber 2019 Preview) release refer to the [release announcement](https://aka.ms/azure-sdk-preview5-java). +Version 1.0.0-beta.1 is the first preview of our efforts to provide low level interfaces and helper methods to support tracing for Java client libraries. +This library includes [OpenTelemetry](https://opentelemetry.io/) implementation of the interface. +This library added tracing instrumentation for AMQP and HTTP Java SDK client libraries across different languages and platforms. + +This package's +[documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opentelemetry_1.0.0-beta.1/sdk/core/azure-core-tracing-opentelemetry/README.md) +and +[samples](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opentelemetry_1.0.0-beta.1/sdk/core/azure-core-tracing-opentelemetry/src/samples). + diff --git a/sdk/core/azure-core-tracing-opentelemetry/README.md b/sdk/core/azure-core-tracing-opentelemetry/README.md index 11ecbb277759..807b1e8245fd 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/README.md +++ b/sdk/core/azure-core-tracing-opentelemetry/README.md @@ -53,7 +53,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-http-okhttp - 1.0.0 + 1.1.0-beta.1 ``` [//]: # ({x-version-update-end}) @@ -140,9 +140,15 @@ private static final TracerSdkFactory TRACER_SDK_FACTORY; Span span = TRACER.spanBuilder("user-parent-span").startSpan(); try (Scope scope = TRACER.withSpan(span)) { - Context traceContext = new Context(PARENT_SPAN_KEY, span); - EventData eventData = new EventData("Hello world!".getBytes(UTF_8), traceContext); - producer.send(eventData); + EventData event1 = new EventData("1".getBytes(UTF_8)); + event1.addContext(PARENT_SPAN_KEY, span); + + EventDataBatch eventDataBatch = producer.createBatch(); + + if (!eventDataBatch.tryAdd(eventData)) { + producer.send(eventDataBatch); + eventDataBatch = producer.createBatch(); + } } finally { span.end(); } diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md index 93fcda73a2c4..229fab212fc5 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0-SNAPSHOT + 0.2.0 com.azure azure-security-keyvault-secrets - 4.0.0 + 4.1.0-beta.1 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0-SNAPSHOT + 0.2.0 ``` diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md index 17e8ae375d8d..a37ca0127df9 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md @@ -10,7 +10,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0-SNAPSHOT + 0.2.0 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0-SNAPSHOT + 0.2.0 diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md index e06422cc0542..40c689588d98 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0-SNAPSHOT + 0.2.0 com.azure azure-security-keyvault-secrets - 4.0.0 + 4.1.0-beta.1 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0-SNAPSHOT + 0.2.0 ``` diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md index d1953f3f277c..2917f57a9121 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** io.opentelemetry opentelemetry-sdk - 0.2.0-SNAPSHOT + 0.2.0 com.azure azure-messaging-eventhubs - 5.0.0-beta.5 + 5.0.0-beta.6 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** io.opentelemetry opentelemetry-exporters-logging - 0.2.0-SNAPSHOT + 0.2.0 @@ -74,20 +74,31 @@ public class Sample { private static void doClientWork() { EventHubProducerClient producer = new EventHubClientBuilder() - .connectionString(CONNECTION_STRING) - .buildProducer(); - - final int count = 2; - final byte[] body = "Hello World!".getBytes(UTF_8); + .connectionString(connectionString) + .buildProducerClient(); Span span = TRACER.spanBuilder("user-parent-span").startSpan(); try (final Scope scope = TRACER.withSpan(span)) { - final Context traceContext = new Context(PARENT_SPAN_KEY, span); - final Flux testData = Flux.range(0, count).flatMap(number -> { - final EventData data = new EventData(body, traceContext); - return Flux.just(data); - }); - producer.send(testData.toIterable(1)); + final EventData event1 = new EventData("1".getBytes(UTF_8)); + event1.addContext(PARENT_SPAN_KEY, span); + + final EventData event2 = new EventData("2".getBytes(UTF_8)); + event2.addContext(PARENT_SPAN_KEY, span); + + final List telemetryEvents = Arrays.asList(event1, event2); + final CreateBatchOptions options = new CreateBatchOptions() + .setPartitionKey("telemetry") + .setMaximumSizeInBytes(256); + + EventDataBatch currentBatch = producer.createBatch(options); + + // For each telemetry event, we try to add it to the current batch. + for (EventData event : telemetryEvents) { + if (!currentBatch.tryAdd(event)) { + producer.send(currentBatch); + currentBatch = producer.createBatch(options); + } + } } finally { span.end(); producer.close(); From c07f9cc5690fc7d149a23c91ba6cd0187234f5f2 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Fri, 22 Nov 2019 11:01:11 -0800 Subject: [PATCH 2/7] Revert "update samples and package versions" This reverts commit 9e9951bc406cc0152e6b8ed0c46664b42b144c55. --- .../CHANGELOG.md | 8 ---- .../azure-core-tracing-opencensus/README.md | 19 ++++----- .../src/samples/AsyncListKeyVaultSecrets.md | 4 +- .../AsyncQueueClientEnqueueMessages.md | 4 +- .../src/samples/ListeKeyVaultSecrets.md | 4 +- .../src/samples/PublishEvents.md | 38 ++++++++---------- .../src/samples/QueueClientEnqueueMessages.md | 4 +- .../CHANGELOG.md | 11 +----- .../README.md | 14 ++----- .../samples/AsyncListKeyVaultSecretsSample.md | 6 +-- ...CreateConfigurationSettingTracingSample.md | 4 +- .../ListKeyVaultSecretsTracingSample.md | 6 +-- .../src/samples/PublishEventsTracingSample.md | 39 +++++++------------ 13 files changed, 58 insertions(+), 103 deletions(-) diff --git a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md index 79f75dd6b48b..7e9f54f15c0f 100644 --- a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md @@ -1,12 +1,4 @@ # Release History -## Version 1.0.0-beta.5 (2019-11-25) -For details on the Azure SDK for Java (December 2019 Preview) release refer to the [release announcement](https://aka.ms/azure-sdk-preview6-java). -Version 1.0.0-beta.5 extended support for 0.24.0 opencensus-api package version. - -This package's -[documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opencensus_1.0.0-beta.5/sdk/core/azure-core-tracing-opencensus/README.md) -and -[samples](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opencensus_1.0.0-beta.5/sdk/core/azure-core-tracing-opencensus/src/samples). ## Version 1.0.0-preview.4 (2019-10-31) diff --git a/sdk/core/azure-core-tracing-opencensus/README.md b/sdk/core/azure-core-tracing-opencensus/README.md index f5c87194e4b5..abdc816c6205 100644 --- a/sdk/core/azure-core-tracing-opencensus/README.md +++ b/sdk/core/azure-core-tracing-opencensus/README.md @@ -19,7 +19,7 @@ documentation][api_documentation] | [Samples][samples] com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 ``` [//]: # ({x-version-update-end}) @@ -38,7 +38,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 com.azure @@ -54,7 +54,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-http-okhttp - 1.1.0-beta.1 + 1.0.0 ``` [//]: # ({x-version-update-end}) @@ -137,15 +137,10 @@ private static final Tracer TRACER; .buildProducer(); try (Scope scope = TRACER.spanBuilder("tracing-user-span").startScopedSpan()) { - EventData event1 = new EventData("1".getBytes(UTF_8)); - event1.addContext(PARENT_SPAN_KEY, span); - - EventDataBatch eventDataBatch = producer.createBatch(); - - if (!eventDataBatch.tryAdd(eventData)) { - producer.send(eventDataBatch); - eventDataBatch = producer.createBatch(); - } + Context tracingContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); + // Create an event to send + final EventData eventData = new EventData("Hello world!".getBytes(UTF_8), traceContext); + producer.send(eventData); } finally { Tracing.getExportComponent().shutdown(); } diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md index 90759410b3d0..01aa2ddd62fd 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncListKeyVaultSecrets.md @@ -12,7 +12,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-security-keyvault-secrets - 4.1.0-beta.1 + 4.0.0 ``` [//]: # ({x-version-update-end}) @@ -22,7 +22,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md index 8481c64bf0f1..b8aaf0a1fb9c 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/AsyncQueueClientEnqueueMessages.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-storage-queue - 12.1.0-beta.1 + 12.0.0 ``` [//]: # ({x-version-update-end}) @@ -23,7 +23,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md b/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md index 3f3a2e7f0a06..6e1339b6d01b 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/ListeKeyVaultSecrets.md @@ -12,7 +12,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-security-keyvault-secrets - 4.1.0-beta.1 + 4.0.0 ``` [//]: # ({x-version-update-end}) @@ -22,7 +22,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md index 9e1d65e57f45..fb48bd0bd601 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-messaging-eventhubs - 5.0.0-beta.6 + 5.0.0-beta.5 ``` [//]: # ({x-version-update-end}) @@ -66,31 +66,25 @@ public class PublishEvents { } public static void main(String[] args) { - EventHubProducerClient producer = new EventHubClientBuilder() - .connectionString(connectionString) - .buildProducerClient(); + final int count = 2; + final byte[] body = "Hello World!".getBytes(UTF_8); try(Scope scope = TRACER.spanBuilder("user-parent-span").startScopedSpan()) { - final EventData event1 = new EventData("1".getBytes(UTF_8)); - event1.addContext(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - - final EventData event2 = new EventData("2".getBytes(UTF_8)); - event2.addContext(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); - final List telemetryEvents = Arrays.asList(event1, event2); - final CreateBatchOptions options = new CreateBatchOptions() - .setPartitionKey("telemetry") - .setMaximumSizeInBytes(256); - - EventDataBatch currentBatch = producer.createBatch(options); + Context traceContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); + + EventHubProducerClient producer = new EventHubClientBuilder() + .connectionString(CONNECTION_STRING) + .buildProducer(); - // For each telemetry event, we try to add it to the current batch. - for (EventData event : telemetryEvents) { - if (!currentBatch.tryAdd(event)) { - producer.send(currentBatch); - currentBatch = producer.createBatch(options); - } - } + final Context traceContext = new Context(PARENT_SPAN_KEY, TRACER.getCurrentSpan()); + final Flux testData = Flux.range(0, count) + .flatMap(number -> { + final EventData data = new EventData(body, traceContext); + return Flux.just(data); + }); + + producer.send(testData.toIterable(1)); } finally { producer.close(); Tracing.getExportComponent().shutdown(); diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md b/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md index e85fb6668396..8420f1e8e250 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/QueueClientEnqueueMessages.md @@ -13,7 +13,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-storage-queue - 12.1.0-beta.1 + 12.0.0 ``` [//]: # ({x-version-update-end}) @@ -23,7 +23,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-core-tracing-opencensus - 1.0.0-beta.5 + 1.0.0-beta.4 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index 9a44e2ec7468..4239c9da32e7 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -1,14 +1,5 @@ # Release History -## Version 1.0.0-beta.1 (2019-11-25) +## Version 1.0.0-beta.1 (-12-) For details on the Azure SDK for Java (Decemeber 2019 Preview) release refer to the [release announcement](https://aka.ms/azure-sdk-preview5-java). -Version 1.0.0-beta.1 is the first preview of our efforts to provide low level interfaces and helper methods to support tracing for Java client libraries. -This library includes [OpenTelemetry](https://opentelemetry.io/) implementation of the interface. -This library added tracing instrumentation for AMQP and HTTP Java SDK client libraries across different languages and platforms. - -This package's -[documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opentelemetry_1.0.0-beta.1/sdk/core/azure-core-tracing-opentelemetry/README.md) -and -[samples](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-tracing-opentelemetry_1.0.0-beta.1/sdk/core/azure-core-tracing-opentelemetry/src/samples). - diff --git a/sdk/core/azure-core-tracing-opentelemetry/README.md b/sdk/core/azure-core-tracing-opentelemetry/README.md index 807b1e8245fd..11ecbb277759 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/README.md +++ b/sdk/core/azure-core-tracing-opentelemetry/README.md @@ -53,7 +53,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-core-http-okhttp - 1.1.0-beta.1 + 1.0.0 ``` [//]: # ({x-version-update-end}) @@ -140,15 +140,9 @@ private static final TracerSdkFactory TRACER_SDK_FACTORY; Span span = TRACER.spanBuilder("user-parent-span").startSpan(); try (Scope scope = TRACER.withSpan(span)) { - EventData event1 = new EventData("1".getBytes(UTF_8)); - event1.addContext(PARENT_SPAN_KEY, span); - - EventDataBatch eventDataBatch = producer.createBatch(); - - if (!eventDataBatch.tryAdd(eventData)) { - producer.send(eventDataBatch); - eventDataBatch = producer.createBatch(); - } + Context traceContext = new Context(PARENT_SPAN_KEY, span); + EventData eventData = new EventData("Hello world!".getBytes(UTF_8), traceContext); + producer.send(eventData); } finally { span.end(); } diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md index 229fab212fc5..93fcda73a2c4 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/AsyncListKeyVaultSecretsSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0 + 0.2.0-SNAPSHOT com.azure azure-security-keyvault-secrets - 4.1.0-beta.1 + 4.0.0 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0 + 0.2.0-SNAPSHOT ``` diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md index a37ca0127df9..17e8ae375d8d 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md @@ -10,7 +10,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0 + 0.2.0-SNAPSHOT com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0 + 0.2.0-SNAPSHOT diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md index 40c689588d98..e06422cc0542 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/ListKeyVaultSecretsTracingSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-sdk - 0.2.0 + 0.2.0-SNAPSHOT com.azure azure-security-keyvault-secrets - 4.1.0-beta.1 + 4.0.0 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package io.opentelemetry opentelemetry-exporters-logging - 0.2.0 + 0.2.0-SNAPSHOT ``` diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md index 2917f57a9121..d1953f3f277c 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md @@ -10,12 +10,12 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** io.opentelemetry opentelemetry-sdk - 0.2.0 + 0.2.0-SNAPSHOT com.azure azure-messaging-eventhubs - 5.0.0-beta.6 + 5.0.0-beta.5 com.azure @@ -25,7 +25,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** io.opentelemetry opentelemetry-exporters-logging - 0.2.0 + 0.2.0-SNAPSHOT @@ -74,31 +74,20 @@ public class Sample { private static void doClientWork() { EventHubProducerClient producer = new EventHubClientBuilder() - .connectionString(connectionString) - .buildProducerClient(); + .connectionString(CONNECTION_STRING) + .buildProducer(); + + final int count = 2; + final byte[] body = "Hello World!".getBytes(UTF_8); Span span = TRACER.spanBuilder("user-parent-span").startSpan(); try (final Scope scope = TRACER.withSpan(span)) { - final EventData event1 = new EventData("1".getBytes(UTF_8)); - event1.addContext(PARENT_SPAN_KEY, span); - - final EventData event2 = new EventData("2".getBytes(UTF_8)); - event2.addContext(PARENT_SPAN_KEY, span); - - final List telemetryEvents = Arrays.asList(event1, event2); - final CreateBatchOptions options = new CreateBatchOptions() - .setPartitionKey("telemetry") - .setMaximumSizeInBytes(256); - - EventDataBatch currentBatch = producer.createBatch(options); - - // For each telemetry event, we try to add it to the current batch. - for (EventData event : telemetryEvents) { - if (!currentBatch.tryAdd(event)) { - producer.send(currentBatch); - currentBatch = producer.createBatch(options); - } - } + final Context traceContext = new Context(PARENT_SPAN_KEY, span); + final Flux testData = Flux.range(0, count).flatMap(number -> { + final EventData data = new EventData(body, traceContext); + return Flux.just(data); + }); + producer.send(testData.toIterable(1)); } finally { span.end(); producer.close(); From 991890eff791cc69006ec510bed6459adde83c10 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 12 Dec 2019 14:04:05 -0800 Subject: [PATCH 3/7] remove Azure prefix from span names --- .../amqp/implementation/TracerProvider.java | 2 +- .../implementation/TracerProviderTest.java | 2 +- .../opencensus/OpenCensusTracerTest.java | 2 +- .../opentelemetry/OpenTelemetryTracer.java | 7 +++---- .../opentelemetry/OpenTelemetryTracerTest.java | 4 ++-- .../com/azure/core/http/rest/RestProxy.java | 2 +- .../EventHubProducerAsyncClientTest.java | 18 +++++++++--------- .../eventhubs/EventHubProducerClientTest.java | 18 +++++++++--------- .../eventhubs/EventProcessorClientTest.java | 12 ++++++------ 9 files changed, 33 insertions(+), 34 deletions(-) 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..5d77d6993b8b 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..7036c06b7992 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/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..f5570cb72ff5 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,7 +36,7 @@ * 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"; 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..fd4aaf95492d 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..0fa420524772 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..ac07540131c3 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/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..8471393a0104 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..16e5d598d611 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..d5e7ec91191e 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()); } From 70a6bff1d16a82fc4d87afa395ba5f82f3c190ed Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 12 Dec 2019 14:15:09 -0800 Subject: [PATCH 4/7] update naming for http --- .../src/main/java/com/azure/core/http/rest/RestProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ac07540131c3..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("%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); } From 3cc5f60cc6354e6bc34ccee3b709bf3b2ee22a4e Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 12 Dec 2019 14:19:52 -0800 Subject: [PATCH 5/7] update changelog --- sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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) From 25cae4a53b9a6155b6eb1096b8574f3dac1c4ec9 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 12 Dec 2019 15:50:04 -0800 Subject: [PATCH 6/7] update amqp core dependency version --- eng/versioning/version_client.txt | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 From 8ada58065b57c11c02f90942fcd26373eb7846a4 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 12 Dec 2019 17:24:08 -0800 Subject: [PATCH 7/7] update for EventHubs --- .../amqp/implementation/TracerProvider.java | 2 +- .../implementation/TracerProviderTest.java | 2 +- .../tracing/opencensus/OpenCensusTracer.java | 5 ++--- .../opencensus/OpenCensusTracerTest.java | 4 ++-- .../opentelemetry/OpenTelemetryTracer.java | 2 +- .../opentelemetry/OpenTelemetryTracerTest.java | 4 ++-- .../EventHubProducerAsyncClientTest.java | 18 +++++++++--------- .../eventhubs/EventHubProducerClientTest.java | 18 +++++++++--------- .../eventhubs/EventProcessorClientTest.java | 12 ++++++------ 9 files changed, 33 insertions(+), 34 deletions(-) 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 5d77d6993b8b..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 = "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 7036c06b7992..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 = "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 f5570cb72ff5..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 = "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/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 fd4aaf95492d..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,7 +247,7 @@ 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 = "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) { 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 0fa420524772..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 = "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/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 8471393a0104..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("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("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("Eventhubs.send"), any(), eq(ProcessKind.SEND)); + .start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); verify(tracer1, times(2)) - .start(eq("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("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("Eventhubs.send"), any(), eq(ProcessKind.SEND)); - verify(tracer1, never()).start(eq("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("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("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 16e5d598d611..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("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("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("Eventhubs.send"), any(), eq(ProcessKind.SEND)); + .start(eq("EventHubs.send"), any(), eq(ProcessKind.SEND)); verify(tracer1, times(1)) - .start(eq("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("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("Eventhubs.send"), any(), eq(ProcessKind.SEND)); - verify(tracer1, never()).start(eq("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("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("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 d5e7ec91191e..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("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("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("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("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("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("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()); }