Skip to content

Fix (more) EventHubs flaky batch tests #7768

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
merged 1 commit into from
Nov 4, 2025
Merged

Fix (more) EventHubs flaky batch tests #7768

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
16 changes: 8 additions & 8 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventHubsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ public async Task TestEventHubsEnumerableIntegration(string packageVersion, stri
using (var agent = EnvironmentHelper.GetMockAgent())
using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
{
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000);
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000, assertExpectedCount: false);

using var s = new AssertionScope();

var sendSpans = spans.Where(span => span.Name == "azure_eventhubs.send").ToList();
var receiveSpans = spans.Where(span => span.Name == "azure_eventhubs.receive").ToList();

sendSpans.Should().HaveCount(1, "Expected 1 SendAsync span with azure_eventhubs.send operation for enumerable");
receiveSpans.Should().HaveCount(1, "Expected 1 receive span");
receiveSpans.Should().HaveCountGreaterOrEqualTo(1, "Expected at least 1 receive span");

var enumerableSendSpans = sendSpans.Where(s => s.Resource == "samples-eventhubs-hub").ToList();
enumerableSendSpans.Should().HaveCount(1, "Expected 1 enumerable send span from SendAsync operation");
Expand Down Expand Up @@ -174,15 +174,15 @@ public async Task TestEventHubsEnumerableIntegrationWithoutBatchLinks(string pac
using (var agent = EnvironmentHelper.GetMockAgent())
using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
{
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000);
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000, assertExpectedCount: false);

using var s = new AssertionScope();

var sendSpans = spans.Where(span => span.Name == "azure_eventhubs.send").ToList();
var receiveSpans = spans.Where(span => span.Name == "azure_eventhubs.receive").ToList();

sendSpans.Should().HaveCount(1, "Expected 1 SendAsync span for enumerable (no individual event spans when batch links disabled)");
receiveSpans.Should().HaveCount(1, "Expected 1 receive span");
receiveSpans.Should().HaveCountGreaterOrEqualTo(1, "Expected at least 1 receive span");

var createSpans = spans.Where(span => span.Name == "azure_eventhubs.create").ToList();
createSpans.Should().BeEmpty("Expected no individual message spans (azure_eventhubs.create) when batch links disabled");
Expand Down Expand Up @@ -213,7 +213,7 @@ public async Task TestEventHubsBufferedProducerIntegration(string packageVersion
using (var agent = EnvironmentHelper.GetMockAgent())
using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
{
var spans = await agent.WaitForSpansAsync(5, timeoutInMilliseconds: 30000);
var spans = await agent.WaitForSpansAsync(5, timeoutInMilliseconds: 30000, assertExpectedCount: false);

using var s = new AssertionScope();

Expand All @@ -223,7 +223,7 @@ public async Task TestEventHubsBufferedProducerIntegration(string packageVersion

createSpans.Should().HaveCount(3, "Expected 3 TryAdd spans with azure_eventhubs.create operation");
sendSpans.Should().HaveCount(1, "Expected 1 buffered send span with azure_eventhubs.send operation");
receiveSpans.Should().HaveCount(1, "Expected 1 receive span");
receiveSpans.Should().HaveCountGreaterOrEqualTo(1, "Expected at least 1 receive span");

var individualMessageSpans = createSpans.Where(s => s.Resource == "samples-eventhubs-hub").ToList();
individualMessageSpans.Should().HaveCount(3, "Expected 3 individual message spans from TryAdd operations");
Expand Down Expand Up @@ -255,15 +255,15 @@ public async Task TestEventHubsBufferedProducerIntegrationWithoutBatchLinks(stri
using (var agent = EnvironmentHelper.GetMockAgent())
using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
{
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000);
var spans = await agent.WaitForSpansAsync(2, timeoutInMilliseconds: 30000, assertExpectedCount: false);

using var s = new AssertionScope();

var sendSpans = spans.Where(span => span.Name == "azure_eventhubs.send").ToList();
var receiveSpans = spans.Where(span => span.Name == "azure_eventhubs.receive").ToList();

sendSpans.Should().HaveCount(1, "Expected 1 buffered send span (no individual TryAdd spans when batch links disabled)");
receiveSpans.Should().HaveCount(1, "Expected 1 receive span");
receiveSpans.Should().HaveCountGreaterOrEqualTo(1, "Expected at least 1 receive span");

var createSpans = spans.Where(span => span.Name == "azure_eventhubs.create").ToList();
createSpans.Should().BeEmpty("Expected no individual message spans (azure_eventhubs.create) when batch links disabled");
Expand Down
Loading