Skip to content

Commit a162fab

Browse files
authored
[Instrumentation.WCF] Fix null handling for AsyncCallback parameters (#4164)
1 parent 45273c0 commit a162fab

5 files changed

Lines changed: 317 additions & 25 deletions

File tree

‎src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
and [GHSA-37gx-xxp4-5rgx](https://github.com/dotnet/runtime/security/advisories/GHSA-37gx-xxp4-5rgx).
1111
([#4103](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/4103))
1212

13+
* Fixed an issue where instrumented WCF channel `Begin*` methods threw an
14+
`ArgumentNullException` when `AsyncCallback` was `null`.
15+
([#4164](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/4164))
16+
1317
## 1.15.0-beta.1
1418

1519
Released 2026-Jan-21

‎src/OpenTelemetry.Instrumentation.Wcf/Implementation/AsyncResultWithTelemetryState.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ public AsyncResultWithTelemetryState(IAsyncResult inner, RequestTelemetryState t
2323

2424
bool IAsyncResult.IsCompleted => this.Inner.IsCompleted;
2525

26-
public static AsyncCallback GetAsyncCallback(AsyncCallback innerCallback, RequestTelemetryState telemetryState) => ar =>
26+
public static AsyncCallback? GetAsyncCallback(AsyncCallback? innerCallback, RequestTelemetryState telemetryState)
2727
{
28-
innerCallback(new AsyncResultWithTelemetryState(ar, telemetryState));
29-
};
28+
if (innerCallback == null)
29+
{
30+
return null;
31+
}
32+
33+
return ar => innerCallback(new AsyncResultWithTelemetryState(ar, telemetryState));
34+
}
3035
}

‎src/OpenTelemetry.Instrumentation.Wcf/Implementation/InstrumentedDuplexChannel.cs‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,16 @@ public void Send(Message message, TimeSpan timeout)
3939
this.SendInternal(message, timeout, _ => this.Inner.Send(message, timeout));
4040
}
4141

42-
public IAsyncResult BeginSend(Message message, AsyncCallback callback, object? state)
42+
public IAsyncResult BeginSend(Message message, AsyncCallback? callback, object? state)
4343
{
4444
Guard.ThrowIfNull(message);
45-
Guard.ThrowIfNull(callback);
4645

4746
return this.SendInternal(message, this.telemetryTimeout, (cb, s) => this.Inner.BeginSend(message, cb, s), callback, state);
4847
}
4948

50-
public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback callback, object? state)
49+
public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback? callback, object? state)
5150
{
5251
Guard.ThrowIfNull(message);
53-
Guard.ThrowIfNull(callback);
5452

5553
return this.SendInternal(message, timeout, (cb, s) => this.Inner.BeginSend(message, timeout, cb, s), callback, state);
5654
}
@@ -85,17 +83,13 @@ public Message Receive(TimeSpan timeout)
8583
return message;
8684
}
8785

88-
public IAsyncResult BeginReceive(AsyncCallback callback, object? state)
86+
public IAsyncResult BeginReceive(AsyncCallback? callback, object? state)
8987
{
90-
Guard.ThrowIfNull(callback);
91-
9288
return this.Inner.BeginReceive(callback, state);
9389
}
9490

95-
public IAsyncResult BeginReceive(TimeSpan timeout, AsyncCallback callback, object? state)
91+
public IAsyncResult BeginReceive(TimeSpan timeout, AsyncCallback? callback, object? state)
9692
{
97-
Guard.ThrowIfNull(callback);
98-
9993
return this.Inner.BeginReceive(timeout, callback, state);
10094
}
10195

@@ -115,10 +109,8 @@ public bool TryReceive(TimeSpan timeout, out Message message)
115109
return returnValue;
116110
}
117111

118-
public IAsyncResult BeginTryReceive(TimeSpan timeout, AsyncCallback callback, object? state)
112+
public IAsyncResult BeginTryReceive(TimeSpan timeout, AsyncCallback? callback, object? state)
119113
{
120-
Guard.ThrowIfNull(callback);
121-
122114
return this.Inner.BeginTryReceive(timeout, callback, state);
123115
}
124116

@@ -136,10 +128,8 @@ public bool WaitForMessage(TimeSpan timeout)
136128
return this.Inner.WaitForMessage(timeout);
137129
}
138130

139-
public IAsyncResult BeginWaitForMessage(TimeSpan timeout, AsyncCallback callback, object? state)
131+
public IAsyncResult BeginWaitForMessage(TimeSpan timeout, AsyncCallback? callback, object? state)
140132
{
141-
Guard.ThrowIfNull(callback);
142-
143133
return this.Inner.BeginWaitForMessage(timeout, callback, state);
144134
}
145135

@@ -164,7 +154,7 @@ private static void OnTelemetryStateTimedOut(RequestTelemetryState telemetryStat
164154
ClientChannelInstrumentation.AfterRequestCompleted(null, telemetryState);
165155
}
166156

167-
private IAsyncResult SendInternal(Message message, TimeSpan timeout, Func<AsyncCallback, object?, IAsyncResult> executeSend, AsyncCallback callback, object? state)
157+
private IAsyncResult SendInternal(Message message, TimeSpan timeout, Func<AsyncCallback?, object?, IAsyncResult> executeSend, AsyncCallback? callback, object? state)
168158
{
169159
IAsyncResult? result = null;
170160
this.SendInternal(message, timeout, telemetryState =>

‎src/OpenTelemetry.Instrumentation.Wcf/Implementation/InstrumentedRequestChannel.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,16 @@ Message IRequestChannel.Request(Message message, TimeSpan timeout)
6060
return reply;
6161
}
6262

63-
IAsyncResult IRequestChannel.BeginRequest(Message message, TimeSpan timeout, AsyncCallback callback, object? state)
63+
IAsyncResult IRequestChannel.BeginRequest(Message message, TimeSpan timeout, AsyncCallback? callback, object? state)
6464
{
6565
Guard.ThrowIfNull(message);
66-
Guard.ThrowIfNull(callback);
6766

6867
return this.InternalBeginRequest(message, (cb, s) => this.Inner.BeginRequest(message, timeout, cb, s), callback, state);
6968
}
7069

71-
IAsyncResult IRequestChannel.BeginRequest(Message message, AsyncCallback callback, object? state)
70+
IAsyncResult IRequestChannel.BeginRequest(Message message, AsyncCallback? callback, object? state)
7271
{
7372
Guard.ThrowIfNull(message);
74-
Guard.ThrowIfNull(callback);
7573

7674
return this.InternalBeginRequest(message, (cb, s) => this.Inner.BeginRequest(message, cb, s), callback, state);
7775
}
@@ -96,7 +94,7 @@ Message IRequestChannel.EndRequest(IAsyncResult result)
9694
return reply;
9795
}
9896

99-
private IAsyncResult InternalBeginRequest(Message message, Func<AsyncCallback, object?, IAsyncResult> beginRequestDelegate, AsyncCallback callback, object? state)
97+
private IAsyncResult InternalBeginRequest(Message message, Func<AsyncCallback?, object?, IAsyncResult> beginRequestDelegate, AsyncCallback? callback, object? state)
10098
{
10199
IAsyncResult? result = null;
102100

0 commit comments

Comments
 (0)