[AOT] Resolve Trimming warnings in ActivityInstrumentationHelper (#4513)

open-telemetry · May 22, 2023 · f4f4469 · f4f4469
1 parent 1510b76
commit f4f4469
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/OpenTelemetry/Internal/ActivityInstrumentationHelper.cs b/src/OpenTelemetry/Internal/ActivityInstrumentationHelper.cs
@@ -16,6 +16,7 @@
 
 using System.Diagnostics;
 using System.Linq.Expressions;
+using System.Reflection;
 #pragma warning restore IDE0005
 
 namespace OpenTelemetry.Instrumentation
@@ -29,15 +30,17 @@ private static Action<Activity, ActivitySource> CreateActivitySourceSetter()
         {
             ParameterExpression instance = Expression.Parameter(typeof(Activity), "instance");
             ParameterExpression propertyValue = Expression.Parameter(typeof(ActivitySource), "propertyValue");
-            var body = Expression.Assign(Expression.Property(instance, "Source"), propertyValue);
+            PropertyInfo sourcePropertyInfo = typeof(Activity).GetProperty("Source");
+            var body = Expression.Assign(Expression.Property(instance, sourcePropertyInfo), propertyValue);
             return Expression.Lambda<Action<Activity, ActivitySource>>(body, instance, propertyValue).Compile();
         }
 
         private static Action<Activity, ActivityKind> CreateActivityKindSetter()
         {
             ParameterExpression instance = Expression.Parameter(typeof(Activity), "instance");
             ParameterExpression propertyValue = Expression.Parameter(typeof(ActivityKind), "propertyValue");
-            var body = Expression.Assign(Expression.Property(instance, "Kind"), propertyValue);
+            PropertyInfo kindPropertyInfo = typeof(Activity).GetProperty("Kind");
+            var body = Expression.Assign(Expression.Property(instance, kindPropertyInfo), propertyValue);
             return Expression.Lambda<Action<Activity, ActivityKind>>(body, instance, propertyValue).Compile();
         }
     }

diff --git a/test/OpenTelemetry.AotCompatibility.Tests/AotCompatibilityTests.cs b/test/OpenTelemetry.AotCompatibility.Tests/AotCompatibilityTests.cs
@@ -85,7 +85,7 @@ public void EnsureAotCompatibility()
             Assert.True(process.ExitCode == 0, "Publishing the AotCompatibility app failed. See test output for more details.");
 
             var warnings = expectedOutput.ToString().Split('\n', '\r').Where(line => line.Contains("warning IL"));
-            Assert.Equal(58, warnings.Count());
+            Assert.Equal(48, warnings.Count());
         }
     }
 }