fix: telemetry activity source should use its own version (#207)

launchdarkly · Apr 23, 2024 · 82dd679 · 82dd679
1 parent f5ba86d
commit 82dd679
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 28 deletions.
diff --git a/pkgs/telemetry/src/TracingHook.cs b/pkgs/telemetry/src/TracingHook.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
-using LaunchDarkly.Sdk.Internal;
+using System.Reflection;
 using LaunchDarkly.Sdk.Server.Hooks;
 
 namespace LaunchDarkly.Sdk.Server.Telemetry
@@ -72,11 +72,13 @@ public TracingHook Build()
     public class TracingHook : Hook
     {
 
+        private static readonly AssemblyName AssemblyName = typeof(TracingHook).GetTypeInfo().Assembly.GetName();
+
         /// <summary>
-        /// Used to create new activities if the TracingHook is configured to create them.
+        /// Used as the source of activities if the TracingHook is configured to create them.
         /// </summary>
-        private static readonly ActivitySource Source = new ActivitySource("LaunchDarkly.ServerSdk",
-            AssemblyVersions.GetAssemblyVersionForType(typeof(LdClient)).ToString());
+        private static readonly ActivitySource Source = new ActivitySource(AssemblyName.Name,
+            AssemblyName.Version.ToString());
 
         /// <summary>
         /// Returns the name of the ActivitySource that the TracingHook uses to generate Activities.

diff --git a/pkgs/telemetry/test/LaunchDarkly.ServerSdk.Telemetry.Tests.csproj b/pkgs/telemetry/test/LaunchDarkly.ServerSdk.Telemetry.Tests.csproj
@@ -4,7 +4,7 @@
          single framework that we are testing; this allows us to test with older SDK
          versions that would error out if they saw any newer target frameworks listed
          here, even if we weren't running those. -->
-    <TestFramework Condition="'$(TESTFRAMEWORK)' == ''">netstandard2.0;net462;net6.0</TestFramework>
+    <TestFramework Condition="'$(TESTFRAMEWORK)' == ''">net462;net6.0</TestFramework>
     <TargetFrameworks>$(TESTFRAMEWORK)</TargetFrameworks>
     <AssemblyName>LaunchDarkly.ServerSdk.Telemetry.Tests</AssemblyName>
     <PackageId>LaunchDarkly.ServerSdk.Telemetry.Tests</PackageId>
@@ -20,25 +20,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="OpenTelemetry" Version="1.7.0" />
     <PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.7.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <None Update="TestFiles\all-properties.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="TestFiles\all-properties.yml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="TestFiles\bad-file.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="TestFiles\flag-only.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="TestFiles\segment-only.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/...emetry/test/Telemetry/TracingHookTests.cs → pkgs/telemetry/test/TracingHookTests.cs b/...emetry/test/Telemetry/TracingHookTests.cs → pkgs/telemetry/test/TracingHookTests.cs
@@ -55,7 +55,7 @@ public void TracingHookCreatesRootSpans(bool createSpans)
         {
             ICollection<Activity> exportedItems = new Collection<Activity>();
 
-            var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+            _ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
                 .AddSource(TracingHook.ActivitySourceName)
                 .AddInMemoryExporter(exportedItems)
                 .Build();
@@ -102,7 +102,7 @@ public void TracingHookCreatesChildSpans(bool createSpans)
 
             var testSource = new ActivitySource("test-source", "1.0.0");
 
-            var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+            _ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
                 .AddSource("test-source")
                 .AddSource(TracingHook.ActivitySourceName)
                 .SetResourceBuilder(
@@ -157,16 +157,16 @@ public void TracingHookIncludesVariant(bool includeVariant)
         {
             ICollection<Activity> exportedItems = new Collection<Activity>();
 
-            var testSource = new ActivitySource("test-source", "1.0.0");
-
-            var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+            _ = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
                 .AddSource("test-source")
                 .SetResourceBuilder(
                     ResourceBuilder.CreateDefault()
                         .AddService(serviceName: "test-source", serviceVersion: "1.0.0"))
                 .AddInMemoryExporter(exportedItems)
                 .Build();
 
+            var testSource = new ActivitySource("test-source", "1.0.0");
+
             var hookUnderTest = TracingHook.Builder().IncludeVariant(includeVariant).Build();
             var featureKey = "feature-key";
             var context = Context.New("foo");