Skip to content

Commit 4c31856

Browse files
authored
[ServiceFabricRemoting] Additional TFMs + OTel Core 1.15.0 (#3791)
1 parent c47a7cf commit 4c31856

5 files changed

Lines changed: 14 additions & 10 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Unreleased
44

5+
* Add `net8.0`, `net10.0`, and `net462` target frameworks.
6+
([#3791](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3791))
7+
8+
* Updated OpenTelemetry core component version(s) to `1.15.0`.
9+
([#3791](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3791))
10+
511
## 1.14.0-beta.1
612

713
Released 2025-Nov-13

‎src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/OpenTelemetry.Instrumentation.ServiceFabricRemoting.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
5-
<TargetFrameworks>$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(TargetFrameworksForLibraries)</TargetFrameworks>
5+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
66
<Description>ServiceFabric Remoting instrumentation for OpenTelemetry .NET.</Description>
77
<PackageTags>$(PackageTags);distributed-tracing</PackageTags>
88
<MinVerTagPrefix>Instrumentation.ServiceFabricRemoting-</MinVerTagPrefix>
@@ -26,10 +26,10 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Extensions.Options" VersionOverride="[8.0.2,)" />
29+
<PackageReference Include="Microsoft.Extensions.Options" />
3030
<PackageReference Include="Microsoft.ServiceFabric.Actors" />
3131
<PackageReference Include="Microsoft.ServiceFabric.Services.Remoting" />
32-
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" VersionOverride="[1.9.0,)" />
32+
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" />
3333
</ItemGroup>
3434

3535
</Project>

‎src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/ServiceFabricRemotingActivitySource.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ internal class ServiceFabricRemotingActivitySource
1111
{
1212
internal static readonly Assembly Assembly = typeof(ServiceFabricRemotingActivitySource).Assembly;
1313
internal static readonly AssemblyName AssemblyName = Assembly.GetName();
14-
internal static readonly string ActivitySourceName = AssemblyName.Name;
14+
internal static readonly string ActivitySourceName = AssemblyName.Name!;
1515

1616
internal static readonly string IncomingRequestActivityName = ActivitySourceName + ".IncomingRequest";
1717
internal static readonly string OutgoingRequestActivityName = ActivitySourceName + ".OutgoingRequest";
1818

19-
public static ActivitySource ActivitySource { get; } = new ActivitySource(ActivitySourceName, Assembly.GetPackageVersion());
19+
public static ActivitySource ActivitySource { get; } = new(ActivitySourceName, Assembly.GetPackageVersion());
2020

2121
public static ServiceFabricRemotingInstrumentationOptions? Options { get; set; }
2222
}

‎src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/ServiceRemotingMessageDispatcherAdapter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.ServiceFabric.Services.Remoting.V2.Runtime;
77
using OpenTelemetry.Context.Propagation;
88
using OpenTelemetry.Internal;
9-
using OpenTelemetry.Trace;
109

1110
namespace OpenTelemetry.Instrumentation.ServiceFabricRemoting;
1211

@@ -92,7 +91,7 @@ public async Task<IServiceRemotingResponseMessage> HandleRequestResponseAsync(IS
9291

9392
if (ServiceFabricRemotingActivitySource.Options?.AddExceptionAtServer == true)
9493
{
95-
activity.RecordException(ex);
94+
activity.AddException(ex);
9695
}
9796
}
9897

‎src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/TraceContextEnrichedServiceRemotingClientAdapter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.ServiceFabric.Services.Remoting.V2.Client;
88
using OpenTelemetry.Context.Propagation;
99
using OpenTelemetry.Internal;
10-
using OpenTelemetry.Trace;
1110

1211
namespace OpenTelemetry.Instrumentation.ServiceFabricRemoting;
1312

@@ -116,7 +115,7 @@ public async Task<IServiceRemotingResponseMessage> RequestResponseAsync(IService
116115

117116
if (ServiceFabricRemotingActivitySource.Options?.AddExceptionAtClient == true)
118117
{
119-
activity.RecordException(ex);
118+
activity.AddException(ex);
120119
}
121120

122121
try

0 commit comments

Comments
 (0)