[Continuous Profiling] Set InstrumentationScope (#3928)

open-telemetry · Jan 14, 2025 · 89883dd · 89883dd
1 parent 56ed0e8
commit 89883dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/test/IntegrationTests/ContinuousProfilerTests.cs b/test/IntegrationTests/ContinuousProfilerTests.cs
@@ -3,6 +3,7 @@
 
 #if NET
 
+using FluentAssertions;
 using IntegrationTests.Helpers;
 using OpenTelemetry.Proto.Collector.Profiles.V1Development;
 using OpenTelemetry.Proto.Profiles.V1Development;
@@ -46,7 +47,7 @@ public void ExportThreadSamples()
         SetEnvironmentVariable("OTEL_DOTNET_AUTO_TRACES_ADDITIONAL_SOURCES", "TestApplication.ContinuousProfiler");
         var expectedStackTrace = string.Join("\n", CreateExpectedStackTrace());
 
-        collector.ExpectCollected(AllLocationReferencesProfileFrameTypeAttribute, "All location should contain reference to profile.frame.type attribute");
+        collector.ExpectCollected(ExpectCollected, "Expect Collected failed");
         collector.Expect(profileData => profileData.ResourceProfiles.Any(resourceProfiles => resourceProfiles.ScopeProfiles.Any(scopeProfile => scopeProfile.Profiles.Any(profile => ContainStackTraceForClassHierarchy(profile, expectedStackTrace) && ContainAttributes(profile, "cpu")))));
         collector.ResourceExpector.Expect("todo.resource.detector.key", "todo.resource.detector.value");
 
@@ -57,11 +58,14 @@ public void ExportThreadSamples()
         collector.ResourceExpector.AssertExpectations();
     }
 
-    private static bool AllLocationReferencesProfileFrameTypeAttribute(ICollection<ExportProfilesServiceRequest> c)
+    private static bool ExpectCollected(ICollection<ExportProfilesServiceRequest> c)
     {
-        var profiles = c.SelectMany(r => r.ResourceProfiles)
-            .SelectMany(rp => rp.ScopeProfiles)
-            .SelectMany(sp => sp.Profiles).ToList();
+        var scopeProfiles = c.SelectMany(r => r.ResourceProfiles)
+            .SelectMany(rp => rp.ScopeProfiles).ToList();
+
+        scopeProfiles.Should().AllSatisfy(sp => sp.Scope.Name.Should().Be("OpenTelemetry.AutoInstrumentation"));
+
+        var profiles = scopeProfiles.SelectMany(sp => sp.Profiles).ToList();
 
         foreach (var profile in profiles)
         {

diff --git a/...ications/integrations/TestApplication.ContinuousProfiler/Exporter/OtlpOverHttpExporter.cs b/...ications/integrations/TestApplication.ContinuousProfiler/Exporter/OtlpOverHttpExporter.cs
@@ -177,6 +177,12 @@ private static ResourceProfiles CreateResourceProfiles(ScopeProfiles scopeProfil
     private static ScopeProfiles CreateScopeProfiles()
     {
         var scopeProfiles = new ScopeProfiles();
+        scopeProfiles.Scope = new InstrumentationScope
+        {
+            Name = "OpenTelemetry.AutoInstrumentation",
+            // TODO consider setting Version here
+        };
+
         // TODO handle schema Url scopeProfiles.SchemaUrl
 
         return scopeProfiles;