Skip to content

Commit 9232135

Browse files
committed
Remove TracerProviderBuilderExtensions
1 parent 1613fe2 commit 9232135

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

src/NATS.Client.Core/Internal/Telemetry.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,11 @@ private static bool TryParseTraceContext(NatsHeaders headers, out ActivityContex
284284
},
285285
out var traceParent,
286286
out var traceState);
287-
287+
#if NET6_0
288+
return ActivityContext.TryParse(traceParent, traceState, out context);
289+
#else
288290
return ActivityContext.TryParse(traceParent, traceState, isRemote: true, out context);
291+
#endif
289292
}
290293

291294
public class Constants

src/NATS.Client.Core/Internal/TracerProviderBuilderExtensions.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/NATS.Client.Core/NATS.Client.Core.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>
40-
<PackageReference Include="OpenTelemetry.Api" Version="1.8.1" />
4140
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
4241
</ItemGroup>
4342

src/NATS.Client.Core/NatsConnection.RequestReply.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public async ValueTask<NatsMsg<TReply>> RequestAsync<TRequest, TReply>(
4545
using var rt = _replyTaskFactory.CreateReplyTask(replySerializer, replyOpts.Timeout);
4646
requestSerializer ??= Opts.SerializerRegistry.GetSerializer<TRequest>();
4747
await PublishAsync(subject, data, headers, rt.Subject, requestSerializer, requestOpts, cancellationToken).ConfigureAwait(false);
48-
return await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
48+
var reply = await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
49+
reply.Headers?.Activity?.Dispose();
50+
return reply;
4951
}
5052

5153
await using var sub1 = await CreateRequestSubAsync<TRequest, TReply>(subject, data, headers, requestSerializer, replySerializer, requestOpts, replyOpts, cancellationToken)

0 commit comments

Comments
 (0)