From 96395691a7ca3eb71d65371d507459fd614afc28 Mon Sep 17 00:00:00 2001 From: Srikanta Date: Tue, 15 Dec 2020 11:31:10 -0800 Subject: [PATCH 1/4] Add setter to configure ClientOptions on processor builder --- .../eventhubs/EventProcessorClientBuilder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java index a837989ae16a..301e910c4750 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java @@ -10,6 +10,7 @@ import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.credential.TokenCredential; import com.azure.core.exception.AzureException; +import com.azure.core.util.ClientOptions; import com.azure.core.util.Configuration; import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.tracing.Tracer; @@ -212,6 +213,17 @@ public EventProcessorClientBuilder retry(AmqpRetryOptions retryOptions) { return this; } + /** + * Sets the client options for the processor client. + * + * @param clientOptions The client options. + * @return The updated {@link EventProcessorClientBuilder} object. + */ + public EventProcessorClientBuilder clientOptions(ClientOptions clientOptions) { + eventHubClientBuilder.clientOptions(clientOptions); + return this; + } + /** * Sets the consumer group name from which the {@link EventProcessorClient} should consume events. * From 103222d2150069fd769b58fbe65fa218bc51fb2c Mon Sep 17 00:00:00 2001 From: Srikanta Date: Thu, 14 Jan 2021 12:17:55 -0800 Subject: [PATCH 2/4] Update javadoc --- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 9 +++++++++ .../messaging/eventhubs/EventProcessorClientBuilder.java | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index 8d4849ad8a52..a312a87388f9 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -2,6 +2,15 @@ ## 5.4.0-beta.2 (Unreleased) +### New features +- Add `clientOptions` to `EventProcessorClientBuilder` to support setting user's application id used in user-agent + property of the amqp connection. + +### Dependency Updates +- Update `azure-core` dependency to `1.12.0`. +- Update `azure-core-amqp` dependency to `2.0.1`. +- Update `azure-identity` dependency to `1.2.2`. + ## 5.4.0-beta.1 (2020-11-12) ### Breaking changes - Removed `ObjectBatch` and related `createBatch()` and `send()` operations in favor of diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java index 301e910c4750..3099ad7c87e0 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventProcessorClientBuilder.java @@ -214,7 +214,9 @@ public EventProcessorClientBuilder retry(AmqpRetryOptions retryOptions) { } /** - * Sets the client options for the processor client. + * Sets the client options for the processor client. The application id set on the client options will be used + * for tracing. The headers set on {@code ClientOptions} are currently not used but can be used in later releases + * to add to AMQP message. * * @param clientOptions The client options. * @return The updated {@link EventProcessorClientBuilder} object. From f1df0743f87a5e715775cb259d4a36b7baf47cdd Mon Sep 17 00:00:00 2001 From: Srikanta Date: Thu, 14 Jan 2021 12:27:57 -0800 Subject: [PATCH 3/4] Prepare for release --- eng/jacoco-test-coverage/pom.xml | 4 ++-- eng/versioning/version_client.txt | 4 ++-- .../CHANGELOG.md | 4 +++- .../azure-messaging-eventhubs-checkpointstore-blob/README.md | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 3 +-- sdk/eventhubs/azure-messaging-eventhubs/README.md | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/eventhubs/pom.xml | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index a5e994905dba..332fd3ebf473 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -194,12 +194,12 @@ com.azure azure-messaging-eventhubs - 5.4.0-beta.2 + 5.3.2 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.4.0-beta.2 + 1.3.2 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 462774241347..041d82d185b4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -76,8 +76,8 @@ com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-identity;1.2.2;1.3.0-beta.1 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-eventgrid;2.0.0-beta.3;2.0.0-beta.4 -com.azure:azure-messaging-eventhubs;5.3.1;5.4.0-beta.2 -com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.3.1;1.4.0-beta.2 +com.azure:azure-messaging-eventhubs;5.3.1;5.3.2 +com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.3.1;1.3.2 com.azure:azure-messaging-servicebus;7.0.0;7.1.0-beta.1 com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1 diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md index 5f9cb55ee03c..d7bc4313dfb4 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.4.0-beta.2 (Unreleased) +## 1.3.2 (2021-01-14) +### Dependency Updates +- Update `azure-messaging-eventhubs` dependency to `5.3.2`. ## 1.4.0-beta.1 (2020-11-12) ### Dependency Updates diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md index 115b028e62a0..8f0512bc56ec 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md @@ -27,7 +27,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.3.1 + 1.3.2 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index 8ffb0be96c14..55ab81fac436 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -17,7 +17,7 @@ com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.4.0-beta.2 + 1.3.2 Microsoft Azure client library for storing checkpoints in Storage Blobs Library for using storing checkpoints in Storage Blobs @@ -40,7 +40,7 @@ com.azure azure-messaging-eventhubs - 5.4.0-beta.2 + 5.3.2 com.azure diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index a312a87388f9..7066a2eb3f98 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -1,7 +1,6 @@ # Release History -## 5.4.0-beta.2 (Unreleased) - +## 5.3.2 (2021-01-14) ### New features - Add `clientOptions` to `EventProcessorClientBuilder` to support setting user's application id used in user-agent property of the amqp connection. diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md index 899bd526e03e..0bdcd7583e99 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md @@ -57,7 +57,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs - 5.3.1 + 5.3.2 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 7990fa4fc27e..83abb7564f8d 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -14,7 +14,7 @@ com.azure azure-messaging-eventhubs - 5.4.0-beta.2 + 5.3.2 Microsoft Azure client library for Event Hubs Libraries built on Microsoft Azure Event Hubs diff --git a/sdk/eventhubs/pom.xml b/sdk/eventhubs/pom.xml index fc867488239a..00ff830ff4e2 100644 --- a/sdk/eventhubs/pom.xml +++ b/sdk/eventhubs/pom.xml @@ -20,12 +20,12 @@ com.azure azure-messaging-eventhubs - 5.4.0-beta.2 + 5.3.2 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.4.0-beta.2 + 1.3.2 From cd8d44066f285cec7dc211cd8594d5bb388c7313 Mon Sep 17 00:00:00 2001 From: Srikanta Date: Thu, 14 Jan 2021 13:00:12 -0800 Subject: [PATCH 4/4] Prepare for release --- eng/jacoco-test-coverage/pom.xml | 4 ++-- eng/versioning/version_client.txt | 4 ++-- .../CHANGELOG.md | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/README.md | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 2 +- sdk/eventhubs/azure-messaging-eventhubs/README.md | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/eventhubs/pom.xml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 332fd3ebf473..10c57036e818 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -194,12 +194,12 @@ com.azure azure-messaging-eventhubs - 5.3.2 + 5.4.0 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.3.2 + 1.4.0 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 041d82d185b4..f254069fe699 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -76,8 +76,8 @@ com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-identity;1.2.2;1.3.0-beta.1 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-eventgrid;2.0.0-beta.3;2.0.0-beta.4 -com.azure:azure-messaging-eventhubs;5.3.1;5.3.2 -com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.3.1;1.3.2 +com.azure:azure-messaging-eventhubs;5.3.1;5.4.0 +com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.3.1;1.4.0 com.azure:azure-messaging-servicebus;7.0.0;7.1.0-beta.1 com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1 diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md index d7bc4313dfb4..2c10868f509e 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.3.2 (2021-01-14) +## 1.4.0 (2021-01-14) ### Dependency Updates - Update `azure-messaging-eventhubs` dependency to `5.3.2`. diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md index 8f0512bc56ec..379a9bc1e2a8 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md @@ -27,7 +27,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.3.2 + 1.4.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index 55ab81fac436..accc9e96624c 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -17,7 +17,7 @@ com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.3.2 + 1.4.0 Microsoft Azure client library for storing checkpoints in Storage Blobs Library for using storing checkpoints in Storage Blobs @@ -40,7 +40,7 @@ com.azure azure-messaging-eventhubs - 5.3.2 + 5.4.0 com.azure diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index 7066a2eb3f98..13ccf295f38a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 5.3.2 (2021-01-14) +## 5.4.0 (2021-01-14) ### New features - Add `clientOptions` to `EventProcessorClientBuilder` to support setting user's application id used in user-agent property of the amqp connection. diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md index 0bdcd7583e99..a6e6df2fcb00 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md @@ -57,7 +57,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs - 5.3.2 + 5.4.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 83abb7564f8d..0bac95ea9419 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -14,7 +14,7 @@ com.azure azure-messaging-eventhubs - 5.3.2 + 5.4.0 Microsoft Azure client library for Event Hubs Libraries built on Microsoft Azure Event Hubs diff --git a/sdk/eventhubs/pom.xml b/sdk/eventhubs/pom.xml index 00ff830ff4e2..499dd078c355 100644 --- a/sdk/eventhubs/pom.xml +++ b/sdk/eventhubs/pom.xml @@ -20,12 +20,12 @@ com.azure azure-messaging-eventhubs - 5.3.2 + 5.4.0 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.3.2 + 1.4.0