Skip to content

[Event Hubs] Event Source Fixes #32882

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
jsquire merged 1 commit into from
Dec 5, 2022
Merged

[Event Hubs] Event Source Fixes #32882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/eventhub/Azure.Messaging.EventHubs.Processor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Corrected log message issue causing formatting to fail when developer code for processing events leaks an exception. This obscured the warning that was intended to be emitted to the error handler.

### Other Changes

## 5.7.5 (2022-11-22)
Expand Down
2 changes: 2 additions & 0 deletions sdk/eventhub/Azure.Messaging.EventHubs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Corrected log message issue causing formatting to fail when developer code for processing events leaks an exception. This obscured the warning that was intended to be emitted to the error handler.

### Other Changes

## 5.7.5 (2022-11-22)
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/Azure.Messaging.EventHubs/src/Diagnostics/EventHubsEventSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2601,7 +2601,7 @@ public virtual void EventProcessorProcessingHandlerError(string partitionId,
{
if (IsEnabled())
{
WriteEvent(125, partitionId ?? string.Empty, identifier ?? string.Empty, eventHubName ?? string.Empty, consumerGroup ?? string.Empty, errorMessage ?? string.Empty);
WriteEvent(125, partitionId ?? string.Empty, identifier ?? string.Empty, eventHubName ?? string.Empty, consumerGroup ?? string.Empty, operationId ?? string.Empty, errorMessage ?? string.Empty);
Comment thread
jsquire marked this conversation as resolved.
}
}

Expand Down
12 changes: 6 additions & 6 deletions sdk/eventhub/Azure.Messaging.EventHubs/tests/Primitives/EventProcessorTests.StartStop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ public async Task StartProcessingLogsNormalStartup(bool async)
using var cancellationSource = new CancellationTokenSource();
cancellationSource.CancelAfter(EventHubsTestEnvironment.Instance.TestExecutionTimeLimit);

var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockProcessor = new Mock<MinimalProcessorMock>(4, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), default(EventProcessorOptions)) { CallBase = true };

mockProcessor.Object.Logger = mockEventSource.Object;
Expand Down Expand Up @@ -533,7 +533,7 @@ public async Task StartProcessingLogsErrorDuringStartup(bool async)
using var cancellationSource = new CancellationTokenSource();
cancellationSource.CancelAfter(EventHubsTestEnvironment.Instance.TestExecutionTimeLimit);

var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockProcessor = new Mock<MinimalProcessorMock>(4, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), default(EventProcessorOptions)) { CallBase = true };

mockEventSource
Expand Down Expand Up @@ -1182,7 +1182,7 @@ public async Task StopProcessingLogsNormalShutdown(bool async)
using var cancellationSource = new CancellationTokenSource();
cancellationSource.CancelAfter(EventHubsTestEnvironment.Instance.TestExecutionTimeLimit);

var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockProcessor = new Mock<MinimalProcessorMock>(4, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), default(EventProcessorOptions)) { CallBase = true };

mockProcessor.Object.Logger = mockEventSource.Object;
Expand Down Expand Up @@ -1235,7 +1235,7 @@ public async Task StopProcessingLogsErrorDuringShutdown(bool async)
using var cancellationSource = new CancellationTokenSource();
cancellationSource.CancelAfter(EventHubsTestEnvironment.Instance.TestExecutionTimeLimit);

var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockProcessor = new Mock<MinimalProcessorMock>(4, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), default(EventProcessorOptions)) { CallBase = true };

mockEventSource
Expand Down Expand Up @@ -1305,7 +1305,7 @@ public async Task StopProcessingLogsFaultedTaskDuringShutdown(bool async)
cancellationSource.CancelAfter(EventHubsTestEnvironment.Instance.TestExecutionTimeLimit);

var expectedException = new DivideByZeroException("BOOM!");
var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockProcessor = new Mock<MinimalProcessorMock>(4, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), default(EventProcessorOptions)) { CallBase = true };

mockProcessor.Object.Logger = mockEventSource.Object;
Expand Down Expand Up @@ -1375,7 +1375,7 @@ public async Task StopProcessingIsSafeToCallInTheErrorHandler(bool async)
var startCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
var stopCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
var options = new EventProcessorOptions { LoadBalancingUpdateInterval = TimeSpan.FromMilliseconds(1) };
var mockEventSource = new Mock<EventHubsEventSource>() { CallBase = true };
var mockEventSource = new Mock<EventHubsEventSource>();
var mockConnection = new Mock<EventHubConnection>();
var mockProcessor = new Mock<MinimalProcessorMock>(65, "consumerGroup", "namespace", "eventHub", Mock.Of<TokenCredential>(), options) { CallBase = true };

Expand Down