Fix naming of ActivitySource and Meter

MattKotsenas · MattKotsenas · commit e36e1c4735d2 · 2025-12-08T09:32:58.000-08:00
diff --git a/src/OpenTelemetry.Instrumentation.Kusto/Implementation/KustoActivitySourceHelper.cs b/src/OpenTelemetry.Instrumentation.Kusto/Implementation/KustoActivitySourceHelper.cs
@@ -14,13 +14,16 @@ namespace OpenTelemetry.Instrumentation.Kusto.Implementation;
 internal static class KustoActivitySourceHelper
 {
     public const string DbSystem = "azure.kusto";
-    public const string ActivitySourceName = "Kusto.Client";
-    public const string MeterName = "Kusto.Client";
-    public const string ClientRequestIdTagKey = "kusto.client_request_id";
+    public const string ClientRequestIdTagKey = $"{DbSystem}.client_request_id";
 
     public static readonly Assembly Assembly = typeof(KustoActivitySourceHelper).Assembly;
+    public static readonly AssemblyName AssemblyName = Assembly.GetName();
     public static readonly string PackageVersion = Assembly.GetPackageVersion();
+
+    public static readonly string ActivitySourceName = AssemblyName.Name!;
     public static readonly ActivitySource ActivitySource = new(ActivitySourceName, PackageVersion);
+
+    public static readonly string MeterName = AssemblyName.Name!;
     public static readonly Meter Meter = new(MeterName, PackageVersion);
 
     public static readonly Histogram<double> OperationDurationHistogram = Meter.CreateHistogram(
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/KustoIntegrationTests.cs b/test/OpenTelemetry.Instrumentation.Kusto.Tests/KustoIntegrationTests.cs
@@ -321,8 +321,8 @@ private static dynamic FilterActivites(IEnumerable<Activity> activities) =>
             .Where(activity => activity.Source == KustoActivitySourceHelper.ActivitySource)
             .Select(activity => new
             {
+                ActivitySourceName = activity.Source.Name,
                 activity.DisplayName,
-                activity.Source.Name,
                 activity.Status,
                 activity.StatusDescription,
                 activity.TagObjects,
@@ -335,6 +335,7 @@ private static dynamic FilterMetrics(IEnumerable<Metric> metrics) =>
             .Where(metric => metric.MeterName == KustoActivitySourceHelper.MeterName)
             .Select(metric => new
             {
+                metric.MeterName,
                 metric.Name,
                 metric.Description,
                 metric.MeterTags,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.FailedQueryTest_query=InvalidTable - take 10_processQuery=False.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.FailedQueryTest_query=InvalidTable - take 10_processQuery=False.verified.txt
@@ -1,13 +1,13 @@
 {
   Activities: [
     {
+      ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,
       DisplayName: KD.RestClient.ExecuteQuery,
-      Name: Kusto.Client,
       Status: Error,
       StatusDescription: 'take' operator: Failed to resolve table or column expression named 'InvalidTable',
       TagObjects: [
         {
-          kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==
+          azure.kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==
         },
         {
           error.type: Kusto.Data.Exceptions.SemanticException
@@ -34,6 +34,7 @@
   ],
   Metrics: [
     {
+      MeterName: OpenTelemetry.Instrumentation.Kusto,
       Name: db.client.operation.duration,
       Description: Duration of database client operations,
       Unit: s,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.FailedQueryTest_query=InvalidTable - take 10_processQuery=True.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.FailedQueryTest_query=InvalidTable - take 10_processQuery=True.verified.txt
@@ -1,13 +1,13 @@
 {
   Activities: [
     {
+      ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,
       DisplayName: InvalidTable | take,
-      Name: Kusto.Client,
       Status: Error,
       StatusDescription: 'take' operator: Failed to resolve table or column expression named 'InvalidTable',
       TagObjects: [
         {
-          kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==
+          azure.kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==
         },
         {
           error.type: Kusto.Data.Exceptions.SemanticException
@@ -40,6 +40,7 @@
   ],
   Metrics: [
     {
+      MeterName: OpenTelemetry.Instrumentation.Kusto,
       Name: db.client.operation.duration,
       Description: Duration of database client operations,
       Unit: s,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.MetricsOnlyTest_query=print number=42.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.MetricsOnlyTest_query=print number=42.verified.txt
@@ -1,6 +1,7 @@
 ﻿{
   Metrics: [
     {
+      MeterName: OpenTelemetry.Instrumentation.Kusto,
       Name: db.client.operation.duration,
       Description: Duration of database client operations,
       Unit: s,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.SuccessfulQueryTest_query=print number=42_processQuery=False.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.SuccessfulQueryTest_query=print number=42_processQuery=False.verified.txt
@@ -1,12 +1,12 @@
 {
   Activities: [
     {
+      ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,
       DisplayName: KD.RestClient.ExecuteQuery,
-      Name: Kusto.Client,
       Status: Ok,
       TagObjects: [
         {
-          kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
+          azure.kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
         },
         {
           db.system.name: azure.kusto
@@ -30,6 +30,7 @@
   ],
   Metrics: [
     {
+      MeterName: OpenTelemetry.Instrumentation.Kusto,
       Name: db.client.operation.duration,
       Description: Duration of database client operations,
       Unit: s,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.SuccessfulQueryTest_query=print number=42_processQuery=True.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.SuccessfulQueryTest_query=print number=42_processQuery=True.verified.txt
@@ -1,12 +1,12 @@
 {
   Activities: [
     {
+      ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,
       DisplayName: print,
-      Name: Kusto.Client,
       Status: Ok,
       TagObjects: [
         {
-          kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
+          azure.kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
         },
         {
           db.system.name: azure.kusto
@@ -36,6 +36,7 @@
   ],
   Metrics: [
     {
+      MeterName: OpenTelemetry.Instrumentation.Kusto,
       Name: db.client.operation.duration,
       Description: Duration of database client operations,
       Unit: s,
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.TraceOnlyTest_query=print number=42.verified.txt b/test/OpenTelemetry.Instrumentation.Kusto.Tests/Snapshots/KustoIntegrationTests.TraceOnlyTest_query=print number=42.verified.txt
@@ -1,12 +1,12 @@
 ﻿{
   Activities: [
     {
+      ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,
       DisplayName: KD.RestClient.ExecuteQuery,
-      Name: Kusto.Client,
       Status: Ok,
       TagObjects: [
         {
-          kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
+          azure.kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy
         },
         {
           db.system.name: azure.kusto

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`Activities: [`
`3`	`3`	`{`
	`4`	`+ ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,`
`4`	`5`	`DisplayName: KD.RestClient.ExecuteQuery,`
`5`		`- Name: Kusto.Client,`
`6`	`6`	`Status: Error,`
`7`	`7`	`StatusDescription: 'take' operator: Failed to resolve table or column expression named 'InvalidTable',`
`8`	`8`	`TagObjects: [`
`9`	`9`	`{`
`10`		`- kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==`
	`10`	`+ azure.kusto.client_request_id: SW52YWxpZFRhYmxlIHwgdGFrZSAxMA==`
`11`	`11`	`},`
`12`	`12`	`{`
`13`	`13`	`error.type: Kusto.Data.Exceptions.SemanticException`
`@@ -34,6 +34,7 @@`
`34`	`34`	`],`
`35`	`35`	`Metrics: [`
`36`	`36`	`{`
	`37`	`+ MeterName: OpenTelemetry.Instrumentation.Kusto,`
`37`	`38`	`Name: db.client.operation.duration,`
`38`	`39`	`Description: Duration of database client operations,`
`39`	`40`	`Unit: s,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`Metrics: [`
`3`	`3`	`{`
	`4`	`+ MeterName: OpenTelemetry.Instrumentation.Kusto,`
`4`	`5`	`Name: db.client.operation.duration,`
`5`	`6`	`Description: Duration of database client operations,`
`6`	`7`	`Unit: s,`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`Activities: [`
`3`	`3`	`{`
	`4`	`+ ActivitySourceName: OpenTelemetry.Instrumentation.Kusto,`
`4`	`5`	`DisplayName: KD.RestClient.ExecuteQuery,`
`5`		`- Name: Kusto.Client,`
`6`	`6`	`Status: Ok,`
`7`	`7`	`TagObjects: [`
`8`	`8`	`{`
`9`		`- kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy`
	`9`	`+ azure.kusto.client_request_id: cHJpbnQgbnVtYmVyPTQy`
`10`	`10`	`},`
`11`	`11`	`{`
`12`	`12`	`db.system.name: azure.kusto`
`@@ -30,6 +30,7 @@`
`30`	`30`	`],`
`31`	`31`	`Metrics: [`
`32`	`32`	`{`
	`33`	`+ MeterName: OpenTelemetry.Instrumentation.Kusto,`
`33`	`34`	`Name: db.client.operation.duration,`
`34`	`35`	`Description: Duration of database client operations,`
`35`	`36`	`Unit: s,`