Skip to content

Fix exception in Kafka on .NET Framework #8366

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

Open
bouwkast wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −33
Open

Fix exception in Kafka on .NET Framework #8366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8c39dc
Fix exception in Kafka on .NET Framework
bouwkast Mar 24, 2026
7278249
Fix IDuckTypeTask for .NET Framework support
bouwkast Mar 25, 2026
5d27945
Revert "Fix IDuckTypeTask for .NET Framework support"
bouwkast Mar 25, 2026
dcc705d
Remove IsCompletedSuccessfully from IDuckTypeTask
bouwkast Mar 27, 2026
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
34 changes: 11 additions & 23 deletions tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Kafka/KafkaHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,32 +462,20 @@ internal static void TryInjectHeaders<TTopicPartitionMarker, TMessage>(
options.DuckCast<IDescribeClusterOptions>().RequestTimeout = TimeSpan.FromSeconds(2);

var duckTask = adminClient.DescribeClusterAsync(options);
var describeResult = SafeGetResult<IDuckTypeTask<IDescribeClusterResult>, IDescribeClusterResult>(duckTask);
return describeResult?.ClusterId;

static TResult? SafeGetResult<TTask, TResult>(TTask task)
where TTask : IDuckTypeTask<TResult>
where TResult : IDescribeClusterResult
var originalContext = SynchronizationContext.Current;
try
{
if (task.IsCompletedSuccessfully)
{
return task.Result;
}

var originalContext = SynchronizationContext.Current;
try
{
// Set the synchronization context to null to avoid deadlocks.
SynchronizationContext.SetSynchronizationContext(null);
// Set the synchronization context to null to avoid deadlocks.
SynchronizationContext.SetSynchronizationContext(null);

// Wait synchronously for the task to complete.
return task.GetAwaiter().GetResult();
}
finally
{
// Restore the original synchronization context.
SynchronizationContext.SetSynchronizationContext(originalContext);
}
// Wait synchronously for the task to complete.
return duckTask.GetAwaiter().GetResult()?.ClusterId;
}
finally
{
// Restore the original synchronization context.
SynchronizationContext.SetSynchronizationContext(originalContext);
}
}

Expand Down
10 changes: 0 additions & 10 deletions tracer/src/Datadog.Trace/DuckTyping/IDuckTypeTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ namespace Datadog.Trace.DuckTyping;
/// <typeparam name="T">Type of the result</typeparam>
public interface IDuckTypeTask<out T> : IDuckType
{
/// <summary>
/// Gets a value indicating whether if the task is completed
/// </summary>
bool IsCompletedSuccessfully { get; }

/// <summary>
/// Gets the result of the task
/// </summary>
Expand All @@ -34,11 +29,6 @@ public interface IDuckTypeTask<out T> : IDuckType
/// </summary>
public interface IDuckTypeTask : IDuckType
{
/// <summary>
/// Gets a value indicating whether if the task is completed
/// </summary>
bool IsCompletedSuccessfully { get; }

/// <summary>
/// Gets the awaiter for the task
/// </summary>
Expand Down
Loading