use .net framework version instead of Clr profiler version

open-telemetry · Nov 30, 2023 · 4c89888 · 4c89888
1 parent e2d00e1
commit 4c89888
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/ProcessRuntimeDetector.cs b/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/ProcessRuntimeDetector.cs
@@ -32,15 +32,21 @@ public class ProcessRuntimeDetector : IResourceDetector
     /// <returns>Resource with key-value pairs of resource attributes.</returns>
     public Resource Detect()
     {
+#if NETFRAMEWORK
+        var frameworkDescriptionParts = RuntimeInformation.FrameworkDescription.Split(' ');
+        var netFrameworkVersion = frameworkDescriptionParts.Length > 1 ? frameworkDescriptionParts[frameworkDescriptionParts.Length - 1] : "unknown";
+#endif
+
         return new Resource(new List<KeyValuePair<string, object>>(3)
         {
             new(ProcessRuntimeSemanticConventions.AttributeProcessRuntimeDescription, RuntimeInformation.FrameworkDescription),
 #if NETFRAMEWORK
             new(ProcessRuntimeSemanticConventions.AttributeProcessRuntimeName, ".NET Framework"),
+            new(ProcessRuntimeSemanticConventions.AttributeProcessRuntimeVersion, netFrameworkVersion),
 #else
             new(ProcessRuntimeSemanticConventions.AttributeProcessRuntimeName, ".NET"),
-#endif
             new(ProcessRuntimeSemanticConventions.AttributeProcessRuntimeVersion, Environment.Version.ToString()),
+#endif
         });
     }
 }
diff --git a/test/OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs b/test/OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs
@@ -34,7 +34,7 @@ public void TestProcessRuntimeAttributes()
 #if NETFRAMEWORK
         Assert.Matches(@"^\.NET Framework \d+\.\d+\.\d+\.\d+$", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeDescription]);
         Assert.Equal(".NET Framework", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeName]);
-        Assert.Matches(@"^\d+\.\d+\.\d+\.\d+$", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeVersion]);
+        Assert.Matches(@"^4.[1-9]\d*\.\d+\.\d+$", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeVersion]);
 #else
         Assert.Matches(@"^\.NET \d+\.\d+\.\d+$", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeDescription]);
         Assert.Equal(".NET", resourceAttributes[ProcessRuntimeSemanticConventions.AttributeProcessRuntimeName]);