Skip to content

Attempt to resolve some flakyness in tracing integration tests. #461

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
sophiatev merged 1 commit into from
Aug 18, 2025
Merged

Attempt to resolve some flakyness in tracing integration tests. #461

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
39 changes: 31 additions & 8 deletions test/Grpc.IntegrationTests/TracingIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.Collections;
using System.Collections.Concurrent;
using System.Diagnostics;
using FluentAssertions;
using Microsoft.DurableTask.Client;
Expand All @@ -16,7 +18,7 @@ public TracingIntegrationTests(ITestOutputHelper output, GrpcSidecarFixture side
{
}

static ActivityListener CreateListener(string[] sources, ICollection<Activity> activities)
static ActivityListener CreateListener(string[] sources, ConcurrentBag<Activity> activities)
{
ActivityListener listener = new();

Expand All @@ -39,7 +41,7 @@ static ActivityListener CreateListener(string[] sources, ICollection<Activity> a
[Fact]
public async Task MultiTaskOrchestration()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -70,6 +72,9 @@ public async Task MultiTaskOrchestration()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
var createActivity = activities.Single(a => a.Source.Name == CoreActivitySourceName && a.OperationName == $"create_orchestration:{orchestratorName}");

Expand Down Expand Up @@ -148,7 +153,7 @@ public async Task MultiTaskOrchestration()
[Fact]
public async Task TaskOrchestrationWithActivityFailure()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -178,6 +183,9 @@ public async Task TaskOrchestrationWithActivityFailure()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
var createActivity = activities.Single(a => a.Source.Name == CoreActivitySourceName && a.OperationName == $"create_orchestration:{orchestratorName}");

Expand Down Expand Up @@ -248,7 +256,7 @@ public async Task TaskOrchestrationWithActivityFailure()
[Fact]
public async Task TaskWithSuborchestration()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -287,6 +295,9 @@ public async Task TaskWithSuborchestration()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
var createActivity = activities.Single(a => a.Source.Name == CoreActivitySourceName && a.OperationName == $"create_orchestration:{orchestratorName}");

Expand Down Expand Up @@ -356,7 +367,7 @@ public async Task TaskWithSuborchestration()
[Fact]
public async Task TaskWithSuborchestrationFailure()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -395,6 +406,9 @@ public async Task TaskWithSuborchestrationFailure()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
var createActivity = activities.Single(a => a.Source.Name == CoreActivitySourceName && a.OperationName == $"create_orchestration:{orchestratorName}");

Expand Down Expand Up @@ -467,7 +481,7 @@ public async Task TaskWithSuborchestrationFailure()
[Fact]
public async Task TaskOrchestrationWithSentEvent()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -499,6 +513,9 @@ public async Task TaskOrchestrationWithSentEvent()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
var createActivity = activities.Single(a => a.Source.Name == CoreActivitySourceName && a.OperationName == $"create_orchestration:{orchestratorName}");

Expand Down Expand Up @@ -547,7 +564,7 @@ public async Task TaskOrchestrationWithSentEvent()
[Fact]
public async Task TaskOrchestrationWithTimer()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -581,6 +598,9 @@ public async Task TaskOrchestrationWithTimer()
OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutputs: true, this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

fireAt.Should().NotBe(default);

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");
Expand Down Expand Up @@ -632,7 +652,7 @@ public async Task TaskOrchestrationWithTimer()
[Fact]
public async Task ClientRaiseEvent()
{
var activities = new List<Activity>();
var activities = new ConcurrentBag<Activity>();

using var listener = CreateListener(ActivitySourceNames, activities);

Expand Down Expand Up @@ -664,6 +684,9 @@ await server.Client.WaitForInstanceCompletionAsync(instanceId, getInputsAndOutpu
this.TimeoutToken);
}

await server.DisposeAsync();
listener.Dispose();

var testActivity = activities.Single(a => a.Source == TestActivitySource && a.OperationName == "Test");

var raiseEventActivity = activities.Single(a =>
Expand Down
Loading