Azure Monitor Exporter: Upgrade OpenTelemetry to v1.0.1 (Azure#18673)

Timothy Mothra · rajkumar-rangaraj · web-flow · commit a5867adecf18 · 2021-02-12T10:03:18.000-08:00
* update versions

* changing activity.GetResource to exporter.ParentProvider.GetResource()

* BatchExportProcessor&lt;T&gt; is now abstract.

* change to packages

* fix for BatchExportProcessor

* fixing Resource tests

* more fixes for Resource

* Remove allocationless foreach, as OTel removed public reference for it.

* update version

* update comment

Co-authored-by: Rajkumar Rangaraj &lt;rajrang@microsoft.com&gt;
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -87,16 +87,17 @@
     <PackageReference Update="Microsoft.Identity.Client.Extensions.Msal" Version="2.16.6" />
     <!-- TODO: Make sure this package is arch-board approved -->
     <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
+
+    <!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
+    <PackageReference Update="OpenTelemetry" Version="1.0.1"  Condition="'$(MSBuildProjectName)' == 'Azure.Monitor.OpenTelemetry.Exporter'" />
   </ItemGroup>
 
   <!-- 
     Dependency versions for Track 2, Microsoft.* libraries.
     These are dependencies for Track 2 integration packages
   -->
-
   <ItemGroup Condition="'$(IsClientLibrary)' == 'true' and $(MSBuildProjectName.StartsWith('Microsoft.'))">
     <PackageReference Update="CloudNative.CloudEvents" Version="2.0.0-beta.1" />
-    <PackageReference Update="OpenTelemetry" Version="0.8.0-beta.1" />
     <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.25" />
     <PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
@@ -194,9 +195,9 @@
     <PackageReference Update="NSubstitute" Version="3.1.0" />
     <PackageReference Update="NUnit" Version="3.12.0" />
     <PackageReference Update="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="0.8.0-beta.1" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="0.8.0-beta.1" />
-    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="0.8.0-beta.1" />
+    <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+    <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />
     <PackageReference Update="Polly" Version="7.1.0" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.8.5" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Azure.Monitor.OpenTelemetry.Exporter.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="OpenTelemetry" VersionOverride="0.8.0-beta.1"/>
+    <PackageReference Include="OpenTelemetry" />
   </ItemGroup>
 
   <!-- Shared source from Azure.Core -->
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorConverter.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorConverter.cs
@@ -8,6 +8,7 @@
 
 using OpenTelemetry;
 using OpenTelemetry.Logs;
+using OpenTelemetry.Resources;
 
 namespace Azure.Monitor.OpenTelemetry.Exporter
 {
@@ -25,15 +26,15 @@ internal static class AzureMonitorConverter
             [TelemetryType.Event] = "EventData",
         };
 
-        internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, string instrumentationKey)
+        internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, Resource resource, string instrumentationKey)
         {
             List<TelemetryItem> telemetryItems = new List<TelemetryItem>();
             TelemetryItem telemetryItem;
 
             foreach (var activity in batchActivity)
             {
                 MonitorBase telemetryData = new MonitorBase();
-                telemetryItem = TelemetryPartA.GetTelemetryItem(activity, instrumentationKey);
+                telemetryItem = TelemetryPartA.GetTelemetryItem(activity, resource, instrumentationKey);
 
                 switch (activity.GetTelemetryType())
                 {
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorExporterHelperExtensions.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorExporterHelperExtensions.cs
@@ -30,7 +30,7 @@ public static TracerProviderBuilder AddAzureMonitorTraceExporter(this TracerProv
             configure?.Invoke(options);
 
             // TODO: Pick Simple vs Batching based on AzureMonitorExporterOptions
-            return builder.AddProcessor(new BatchExportProcessor<Activity>(new AzureMonitorTraceExporter(options)));
+            return builder.AddProcessor(new BatchActivityExportProcessor(new AzureMonitorTraceExporter(options)));
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorExporterLoggingExtensions.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorExporterLoggingExtensions.cs
@@ -22,7 +22,7 @@ public static OpenTelemetryLoggerOptions AddAzureMonitorLogExporter(this OpenTel
             var options = new AzureMonitorExporterOptions();
             configure?.Invoke(options);
 
-            return loggerOptions.AddProcessor(new BatchExportProcessor<LogRecord>(new AzureMonitorLogExporter(options)));
+            return loggerOptions.AddProcessor(new BatchLogRecordExportProcessor(new AzureMonitorLogExporter(options)));
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorTraceExporter.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorTraceExporter.cs
@@ -38,7 +38,9 @@ public override ExportResult Export(in Batch<Activity> batch)
 
             try
             {
-                var telemetryItems = AzureMonitorConverter.Convert(batch, this.instrumentationKey);
+                var resource = this.ParentProvider.GetResource();
+
+                var telemetryItems = AzureMonitorConverter.Convert(batch, resource, this.instrumentationKey);
 
                 // TODO: Handle return value, it can be converted as metrics.
                 // TODO: Validate CancellationToken and async pattern here.
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TagEnumerationState.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TagEnumerationState.cs
@@ -8,7 +8,7 @@
 
 namespace Azure.Monitor.OpenTelemetry.Exporter
 {
-    internal struct TagEnumerationState : IActivityEnumerator<KeyValuePair<string, object>>
+    internal struct TagEnumerationState
     {
         private static readonly IReadOnlyDictionary<string, PartBType> Part_B_Mapping = new Dictionary<string, PartBType>()
         {
@@ -63,56 +63,57 @@ internal struct TagEnumerationState : IActivityEnumerator<KeyValuePair<string, o
         private PartBType tempActivityType;
         public PartBType activityType;
 
-        public bool ForEach(KeyValuePair<string, object> activityTag)
+        public void ForEach(IEnumerable<KeyValuePair<string, object>> activityTags)
         {
-            if (activityTag.Value == null)
+            foreach (KeyValuePair<string, object> activityTag in activityTags)
             {
-                return true;
-            }
+                if (activityTag.Value == null)
+                {
+                    continue;
+                }
 
-            if (activityTag.Value is Array array)
-            {
-                StringBuilder sw = new StringBuilder();
-                foreach (var item in array)
+                if (activityTag.Value is Array array)
                 {
-                    // TODO: Consider changing it to JSon array.
-                    if (item != null)
+                    StringBuilder sw = new StringBuilder();
+                    foreach (var item in array)
+                    {
+                        // TODO: Consider changing it to JSon array.
+                        if (item != null)
+                        {
+                            sw.Append(item);
+                            sw.Append(',');
+                        }
+                    }
+
+                    if (sw.Length > 0)
                     {
-                        sw.Append(item);
-                        sw.Append(',');
+                        sw.Length--;
                     }
+
+                    AzMonList.Add(ref PartCTags, new KeyValuePair<string, object>(activityTag.Key, sw.ToString()));
+                    continue;
                 }
 
-                if (sw.Length > 0)
+                if (!Part_B_Mapping.TryGetValue(activityTag.Key, out tempActivityType))
                 {
-                    sw.Length--;
+                    AzMonList.Add(ref PartCTags, activityTag);
+                    continue;
                 }
 
-                AzMonList.Add(ref PartCTags, new KeyValuePair<string, object>(activityTag.Key, sw.ToString()));
-                return true;
-            }
-
-            if (!Part_B_Mapping.TryGetValue(activityTag.Key, out tempActivityType))
-            {
-                AzMonList.Add(ref PartCTags, activityTag);
-                return true;
-            }
-
-            if (activityType == PartBType.Unknown || activityType == PartBType.Common)
-            {
-                activityType = tempActivityType;
-            }
+                if (activityType == PartBType.Unknown || activityType == PartBType.Common)
+                {
+                    activityType = tempActivityType;
+                }
 
-            if (tempActivityType == activityType || tempActivityType == PartBType.Common)
-            {
-                AzMonList.Add(ref PartBTags, activityTag);
-            }
-            else
-            {
-                AzMonList.Add(ref PartCTags, activityTag);
+                if (tempActivityType == activityType || tempActivityType == PartBType.Common)
+                {
+                    AzMonList.Add(ref PartBTags, activityTag);
+                }
+                else
+                {
+                    AzMonList.Add(ref PartCTags, activityTag);
+                }
             }
-
-            return true;
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TelemetryPartA.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TelemetryPartA.cs
@@ -30,14 +30,14 @@ internal class TelemetryPartA
 
         internal static string RoleInstance { get; set; }
 
-        internal static TelemetryItem GetTelemetryItem(Activity activity, string instrumentationKey)
+        internal static TelemetryItem GetTelemetryItem(Activity activity, Resource resource, string instrumentationKey)
         {
             TelemetryItem telemetryItem = new TelemetryItem(PartA_Name_Mapping[activity.GetTelemetryType()], activity.StartTimeUtc.ToString(CultureInfo.InvariantCulture))
             {
                 InstrumentationKey = instrumentationKey
             };
 
-            InitRoleInfo(activity);
+            InitRoleInfo(resource);
             telemetryItem.Tags[ContextTagKeys.AiCloudRole.ToString()] = RoleName;
             telemetryItem.Tags[ContextTagKeys.AiCloudRoleInstance.ToString()] = RoleInstance;
             telemetryItem.Tags[ContextTagKeys.AiOperationId.ToString()] = activity.TraceId.ToHexString();
@@ -82,15 +82,13 @@ internal static TelemetryItem GetTelemetryItem(LogRecord logRecord, string instr
             return telemetryItem;
         }
 
-        internal static void InitRoleInfo(Activity activity)
+        internal static void InitRoleInfo(Resource resource)
         {
             if (RoleName != null || RoleInstance != null)
             {
                 return;
             }
 
-            var resource = activity.GetResource();
-
             if (resource == null)
             {
                 return;
@@ -101,15 +99,15 @@ internal static void InitRoleInfo(Activity activity)
 
             foreach (var attribute in resource.Attributes)
             {
-                if (attribute.Key == Resource.ServiceNameKey && attribute.Value is string)
+                if (attribute.Key == SemanticConventions.AttributeServiceName && attribute.Value is string)
                 {
                     serviceName = attribute.Value.ToString();
                 }
-                else if (attribute.Key == Resource.ServiceNamespaceKey && attribute.Value is string)
+                else if (attribute.Key == SemanticConventions.AttributeServiceNamespace && attribute.Value is string)
                 {
                     serviceNamespace = attribute.Value.ToString();
                 }
-                else if (attribute.Key == Resource.ServiceInstanceIdKey && attribute.Value is string)
+                else if (attribute.Key == SemanticConventions.AttributeServiceInstance && attribute.Value is string)
                 {
                     RoleInstance = attribute.Value.ToString();
                 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TelemetryPartB.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/TelemetryPartB.cs
@@ -109,7 +109,7 @@ private static TagEnumerationState EnumerateActivityTags(Activity activity)
                 PartCTags = AzMonList.Initialize()
             };
 
-            activity.EnumerateTags(ref monitorTags);
+            monitorTags.ForEach(activity.TagObjects);
             return monitorTags;
         }
 
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Benchmarks/TagObjectsBenchmarks.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Benchmarks/TagObjectsBenchmarks.cs
@@ -85,30 +85,6 @@ public void Cleanup()
         {
         }
 
-        [Benchmark]
-        public void Enumerate_AzMonList_NoItem()
-        {
-            NoItemActivity.EnumerateTags(ref monitorTags);
-        }
-
-        [Benchmark]
-        public void Enumerate_AzMonList_Part_B()
-        {
-            PartBActivity.EnumerateTags(ref monitorTags);
-        }
-
-        [Benchmark]
-        public void Enumerate_AzMonList_Part_C()
-        {
-            PartCActivity.EnumerateTags(ref monitorTags);
-        }
-
-        [Benchmark]
-        public void Enumerate_AzMonList_PartB_And_C()
-        {
-            PartBAndCActivity.EnumerateTags(ref monitorTags);
-        }
-
         [Benchmark]
         public void Enumerate_TagObjects_NoItem()
         {
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Benchmarks/TagObjectsGetValuesBenchmarks.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Benchmarks/TagObjectsGetValuesBenchmarks.cs
@@ -100,17 +100,5 @@ public void GetTagValueNonemptyAzMonList()
         {
             object _ = AzMonList.GetTagValue(ref AzMonList_Items, SemanticConventions.AttributeHttpHost);
         }
-
-        [Benchmark]
-        public void GetTagValueEmptyActivityTags()
-        {
-            object _ = this.EmptyActivity.GetTagValue(SemanticConventions.AttributeHttpHost);
-        }
-
-        [Benchmark]
-        public void GetTagValueNonemptyActivityTags()
-        {
-            object _ = this.ItemActivity.GetTagValue(SemanticConventions.AttributeHttpHost);
-        }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing/DemoTrace.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing/DemoTrace.cs
@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System.Collections.Generic;
 using System.Diagnostics;
 using global::OpenTelemetry;
 using global::OpenTelemetry.Resources;
 
+using OpenTelemetry.Trace;
+
 namespace Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing
 {
     public static class DemoTrace
@@ -13,9 +16,11 @@ public static class DemoTrace
 
         public static void Main()
         {
-            var resource = Resources.CreateServiceResource("my-service", "roleinstance1", "my-namespace");
+            var resourceAttributes = new Dictionary<string, object> { { "service.name", "my-service" }, { "service.namespace", "my-namespace" }, { "service.instance.id", "my-instance" } };
+            var resourceBuilder = ResourceBuilder.CreateDefault().AddAttributes(resourceAttributes);
+
             using var tracerProvider = Sdk.CreateTracerProviderBuilder()
-                .SetResource(resource)
+                .SetResourceBuilder(resourceBuilder)
                 .AddSource("Demo.DemoServer")
                 .AddSource("Demo.DemoClient")
                 .AddAzureMonitorTraceExporter(o => {
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/TagsTests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/TagsTests.cs
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/TelemetryPartATests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/TelemetryPartATests.cs
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/TelemetryItemTests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/TelemetryItemTests.cs
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/TestFramework/OpenTelemetryWebApplicationFactory.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/TestFramework/OpenTelemetryWebApplicationFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`using OpenTelemetry;`
`10`	`10`	`using OpenTelemetry.Logs;`
	`11`	`+using OpenTelemetry.Resources;`
`11`	`12`
`12`	`13`	`namespace Azure.Monitor.OpenTelemetry.Exporter`
`13`	`14`	`{`
`@@ -25,15 +26,15 @@ internal static class AzureMonitorConverter`
`25`	`26`	`[TelemetryType.Event] = "EventData",`
`26`	`27`	`};`
`27`	`28`
`28`		`- internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, string instrumentationKey)`
	`29`	`+ internal static List<TelemetryItem> Convert(Batch<Activity> batchActivity, Resource resource, string instrumentationKey)`
`29`	`30`	`{`
`30`	`31`	`List<TelemetryItem> telemetryItems = new List<TelemetryItem>();`
`31`	`32`	`TelemetryItem telemetryItem;`
`32`	`33`
`33`	`34`	`foreach (var activity in batchActivity)`
`34`	`35`	`{`
`35`	`36`	`MonitorBase telemetryData = new MonitorBase();`
`36`		`- telemetryItem = TelemetryPartA.GetTelemetryItem(activity, instrumentationKey);`
	`37`	`+ telemetryItem = TelemetryPartA.GetTelemetryItem(activity, resource, instrumentationKey);`
`37`	`38`
`38`	`39`	`switch (activity.GetTelemetryType())`
`39`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static TracerProviderBuilder AddAzureMonitorTraceExporter(this TracerProv`
`30`	`30`	`configure?.Invoke(options);`
`31`	`31`
`32`	`32`	`// TODO: Pick Simple vs Batching based on AzureMonitorExporterOptions`
`33`		`- return builder.AddProcessor(new BatchExportProcessor<Activity>(new AzureMonitorTraceExporter(options)));`
	`33`	`+ return builder.AddProcessor(new BatchActivityExportProcessor(new AzureMonitorTraceExporter(options)));`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static OpenTelemetryLoggerOptions AddAzureMonitorLogExporter(this OpenTel`
`22`	`22`	`var options = new AzureMonitorExporterOptions();`
`23`	`23`	`configure?.Invoke(options);`
`24`	`24`
`25`		`- return loggerOptions.AddProcessor(new BatchExportProcessor<LogRecord>(new AzureMonitorLogExporter(options)));`
	`25`	`+ return loggerOptions.AddProcessor(new BatchLogRecordExportProcessor(new AzureMonitorLogExporter(options)));`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ public override ExportResult Export(in Batch<Activity> batch)`
`38`	`38`
`39`	`39`	`try`
`40`	`40`	`{`
`41`		`- var telemetryItems = AzureMonitorConverter.Convert(batch, this.instrumentationKey);`
	`41`	`+ var resource = this.ParentProvider.GetResource();`
	`42`	`+`
	`43`	`+ var telemetryItems = AzureMonitorConverter.Convert(batch, resource, this.instrumentationKey);`
`42`	`44`
`43`	`45`	`// TODO: Handle return value, it can be converted as metrics.`
`44`	`46`	`// TODO: Validate CancellationToken and async pattern here.`
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,14 @@ internal class TelemetryPartA`
`30`	`30`
`31`	`31`	`internal static string RoleInstance { get; set; }`
`32`	`32`
`33`		`- internal static TelemetryItem GetTelemetryItem(Activity activity, string instrumentationKey)`
	`33`	`+ internal static TelemetryItem GetTelemetryItem(Activity activity, Resource resource, string instrumentationKey)`
`34`	`34`	`{`
`35`	`35`	`TelemetryItem telemetryItem = new TelemetryItem(PartA_Name_Mapping[activity.GetTelemetryType()], activity.StartTimeUtc.ToString(CultureInfo.InvariantCulture))`
`36`	`36`	`{`
`37`	`37`	`InstrumentationKey = instrumentationKey`
`38`	`38`	`};`
`39`	`39`
`40`		`- InitRoleInfo(activity);`
	`40`	`+ InitRoleInfo(resource);`
`41`	`41`	`telemetryItem.Tags[ContextTagKeys.AiCloudRole.ToString()] = RoleName;`
`42`	`42`	`telemetryItem.Tags[ContextTagKeys.AiCloudRoleInstance.ToString()] = RoleInstance;`
`43`	`43`	`telemetryItem.Tags[ContextTagKeys.AiOperationId.ToString()] = activity.TraceId.ToHexString();`
`@@ -82,15 +82,13 @@ internal static TelemetryItem GetTelemetryItem(LogRecord logRecord, string instr`
`82`	`82`	`return telemetryItem;`
`83`	`83`	`}`
`84`	`84`
`85`		`- internal static void InitRoleInfo(Activity activity)`
	`85`	`+ internal static void InitRoleInfo(Resource resource)`
`86`	`86`	`{`
`87`	`87`	`if (RoleName != null \|\| RoleInstance != null)`
`88`	`88`	`{`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`	`91`
`92`		`- var resource = activity.GetResource();`
`93`		`-`
`94`	`92`	`if (resource == null)`
`95`	`93`	`{`
`96`	`94`	`return;`
`@@ -101,15 +99,15 @@ internal static void InitRoleInfo(Activity activity)`
`101`	`99`
`102`	`100`	`foreach (var attribute in resource.Attributes)`
`103`	`101`	`{`
`104`		`- if (attribute.Key == Resource.ServiceNameKey && attribute.Value is string)`
	`102`	`+ if (attribute.Key == SemanticConventions.AttributeServiceName && attribute.Value is string)`
`105`	`103`	`{`
`106`	`104`	`serviceName = attribute.Value.ToString();`
`107`	`105`	`}`
`108`		`- else if (attribute.Key == Resource.ServiceNamespaceKey && attribute.Value is string)`
	`106`	`+ else if (attribute.Key == SemanticConventions.AttributeServiceNamespace && attribute.Value is string)`
`109`	`107`	`{`
`110`	`108`	`serviceNamespace = attribute.Value.ToString();`
`111`	`109`	`}`
`112`		`- else if (attribute.Key == Resource.ServiceInstanceIdKey && attribute.Value is string)`
	`110`	`+ else if (attribute.Key == SemanticConventions.AttributeServiceInstance && attribute.Value is string)`
`113`	`111`	`{`
`114`	`112`	`RoleInstance = attribute.Value.ToString();`
`115`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private static TagEnumerationState EnumerateActivityTags(Activity activity)`
`109`	`109`	`PartCTags = AzMonList.Initialize()`
`110`	`110`	`};`
`111`	`111`
`112`		`- activity.EnumerateTags(ref monitorTags);`
	`112`	`+ monitorTags.ForEach(activity.TagObjects);`
`113`	`113`	`return monitorTags;`
`114`	`114`	`}`
`115`	`115`