Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 82dd679

Browse files
authored
fix: telemetry activity source should use its own version (#207)
1 parent f5ba86d commit 82dd679

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

pkgs/telemetry/src/TracingHook.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Immutable;
22
using System.Diagnostics;
3-
using LaunchDarkly.Sdk.Internal;
3+
using System.Reflection;
44
using LaunchDarkly.Sdk.Server.Hooks;
55

66
namespace LaunchDarkly.Sdk.Server.Telemetry
@@ -72,11 +72,13 @@ public TracingHook Build()
7272
public class TracingHook : Hook
7373
{
7474

75+
private static readonly AssemblyName AssemblyName = typeof(TracingHook).GetTypeInfo().Assembly.GetName();
76+
7577
/// <summary>
76-
/// Used to create new activities if the TracingHook is configured to create them.
78+
/// Used as the source of activities if the TracingHook is configured to create them.
7779
/// </summary>
78-
private static readonly ActivitySource Source = new ActivitySource("LaunchDarkly.ServerSdk",
79-
AssemblyVersions.GetAssemblyVersionForType(typeof(LdClient)).ToString());
80+
private static readonly ActivitySource Source = new ActivitySource(AssemblyName.Name,
81+
AssemblyName.Version.ToString());
8082

8183
/// <summary>
8284
/// Returns the name of the ActivitySource that the TracingHook uses to generate Activities.

pkgs/telemetry/test/LaunchDarkly.ServerSdk.Telemetry.Tests.csproj

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
single framework that we are testing; this allows us to test with older SDK
55
versions that would error out if they saw any newer target frameworks listed
66
here, even if we weren't running those. -->
7-
<TestFramework Condition="'$(TESTFRAMEWORK)' == ''">netstandard2.0;net462;net6.0</TestFramework>
7+
<TestFramework Condition="'$(TESTFRAMEWORK)' == ''">net462;net6.0</TestFramework>
88
<TargetFrameworks>$(TESTFRAMEWORK)</TargetFrameworks>
99
<AssemblyName>LaunchDarkly.ServerSdk.Telemetry.Tests</AssemblyName>
1010
<PackageId>LaunchDarkly.ServerSdk.Telemetry.Tests</PackageId>
@@ -20,25 +20,8 @@
2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
2222
<PackageReference Include="xunit" Version="2.4.1" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2324
<PackageReference Include="OpenTelemetry" Version="1.7.0" />
2425
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.7.0" />
2526
</ItemGroup>
26-
27-
<ItemGroup>
28-
<None Update="TestFiles\all-properties.json">
29-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
30-
</None>
31-
<None Update="TestFiles\all-properties.yml">
32-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33-
</None>
34-
<None Update="TestFiles\bad-file.txt">
35-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
36-
</None>
37-
<None Update="TestFiles\flag-only.json">
38-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
39-
</None>
40-
<None Update="TestFiles\segment-only.json">
41-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
42-
</None>
43-
</ItemGroup>
4427
</Project>

pkgs/telemetry/test/Telemetry/TracingHookTests.cs renamed to pkgs/telemetry/test/TracingHookTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void TracingHookCreatesRootSpans(bool createSpans)
5555
{
5656
ICollection<Activity> exportedItems = new Collection<Activity>();
5757

58-
var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
58+
_ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
5959
.AddSource(TracingHook.ActivitySourceName)
6060
.AddInMemoryExporter(exportedItems)
6161
.Build();
@@ -102,7 +102,7 @@ public void TracingHookCreatesChildSpans(bool createSpans)
102102

103103
var testSource = new ActivitySource("test-source", "1.0.0");
104104

105-
var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
105+
_ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
106106
.AddSource("test-source")
107107
.AddSource(TracingHook.ActivitySourceName)
108108
.SetResourceBuilder(
@@ -157,16 +157,16 @@ public void TracingHookIncludesVariant(bool includeVariant)
157157
{
158158
ICollection<Activity> exportedItems = new Collection<Activity>();
159159

160-
var testSource = new ActivitySource("test-source", "1.0.0");
161-
162-
var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
160+
_ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
163161
.AddSource("test-source")
164162
.SetResourceBuilder(
165163
ResourceBuilder.CreateDefault()
166164
.AddService(serviceName: "test-source", serviceVersion: "1.0.0"))
167165
.AddInMemoryExporter(exportedItems)
168166
.Build();
169167

168+
var testSource = new ActivitySource("test-source", "1.0.0");
169+
170170
var hookUnderTest = TracingHook.Builder().IncludeVariant(includeVariant).Build();
171171
var featureKey = "feature-key";
172172
var context = Context.New("foo");

0 commit comments

Comments
 (0)