Implementing valid Copilot feedback

Author: rkargMsft

src/Orleans.Core.Abstractions/Diagnostics/ActivitySources.cs

@@ -7,23 +7,23 @@ public static class ActivitySources
     /// <summary>
     /// Spans triggered from application level code
     /// </summary>
-    public static string ApplicationGrainActivitySourceName = "Microsoft.Orleans.Application";
+    public const string ApplicationGrainActivitySourceName = "Microsoft.Orleans.Application";
     /// <summary>
     /// Spans triggered from Orleans runtime code
     /// </summary>
-    public static string RuntimeActivitySourceName = "Microsoft.Orleans.Runtime";
+    public const string RuntimeActivitySourceName = "Microsoft.Orleans.Runtime";
     /// <summary>
     /// Spans tied to lifecycle operations such as activation, migration, and deactivation.
     /// </summary>
-    public static string LifecycleActivitySourceName = "Microsoft.Orleans.Lifecycle";
+    public const string LifecycleActivitySourceName = "Microsoft.Orleans.Lifecycle";
     /// <summary>
     /// Spans tied to persistent storage operations.
     /// </summary>
-    public static string StorageActivitySourceName = "Microsoft.Orleans.Storage";
+    public const string StorageActivitySourceName = "Microsoft.Orleans.Storage";
     /// <summary>
     /// A wildcard name to match all Orleans activity sources.
     /// </summary>
-    public static string AllActivitySourceName = "Microsoft.Orleans.*";
+    public const string AllActivitySourceName = "Microsoft.Orleans.*";
 
     internal static readonly ActivitySource ApplicationGrainSource = new(ApplicationGrainActivitySourceName, "1.0.0");
     internal static readonly ActivitySource RuntimeGrainSource = new(RuntimeActivitySourceName, "1.0.0");

src/Orleans.Core.Abstractions/Diagnostics/OpenTelemetryHeaders.cs

@@ -0,0 +1,7 @@
+namespace Orleans.Diagnostics;
+
+internal static class OpenTelemetryHeaders
+{
+    internal const string TraceParent = "traceparent";
+    internal const string TraceState = "tracestate";
+}

src/Orleans.Core/Diagnostics/ActivityNames.cs

@@ -2,14 +2,14 @@ namespace Orleans.Runtime;
 
 public static class ActivityNames
 {
-    public static string PlaceGrain = "place grain";
-    public static string FilterPlacementCandidates = "filter placement candidates";
-    public static string ActivateGrain = "activate grain";
-    public static string OnActivate = "execute OnActivateAsync";
-    public static string RegisterDirectoryEntry = "register directory entry";
-    public static string StorageRead = "read storage";
-    public static string StorageWrite = "write storage";
-    public static string StorageClear = "clear storage";
-    public static string ActivationDehydrate = "dehydrate activation";
-    public static string ActivationRehydrate = "rehydrate activation";
+    public const string PlaceGrain = "place grain";
+    public const string FilterPlacementCandidates = "filter placement candidates";
+    public const string ActivateGrain = "activate grain";
+    public const string OnActivate = "execute OnActivateAsync";
+    public const string RegisterDirectoryEntry = "register directory entry";
+    public const string StorageRead = "read storage";
+    public const string StorageWrite = "write storage";
+    public const string StorageClear = "clear storage";
+    public const string ActivationDehydrate = "dehydrate activation";
+    public const string ActivationRehydrate = "rehydrate activation";
 }

src/Orleans.Runtime/Catalog/ActivationData.cs

@@ -1631,15 +1631,15 @@ private async Task ActivateAsync(Dictionary<string, object>? requestContextData,
                 }
 
                 registerSpan?.Stop();
-                 if (!success)
-                 {
-                     Deactivate(new(DeactivationReasonCode.DirectoryFailure, registrationException, "Failed to register activation in grain directory."));
-
-                     // Activation failed.
-                     _activationActivity?.SetStatus(ActivityStatusCode.Error);
-                     _activationActivity?.AddEvent(new ActivityEvent("activation-aborted"));
-                     return;
-                 }
+                if (!success)
+                {
+                    Deactivate(new(DeactivationReasonCode.DirectoryFailure, registrationException, "Failed to register activation in grain directory."));
+
+                    // Activation failed.
+                    _activationActivity?.SetStatus(ActivityStatusCode.Error);
+                    _activationActivity?.AddEvent(new ActivityEvent("activation-aborted"));
+                    return;
+                }
             }
 
             lock (this)

src/Orleans.Runtime/Catalog/Catalog.cs

@@ -10,9 +10,6 @@ namespace Orleans.Runtime
 {
     internal sealed partial class Catalog : SystemTarget, ICatalog, ILifecycleParticipant<ISiloLifecycle>
     {
-        private const string TraceParentHeaderName = "traceparent";
-        private const string TraceStateHeaderName = "tracestate";
-
         private readonly SiloAddress _siloAddress;
         private readonly ActivationCollector activationCollector;
         private readonly GrainDirectoryResolver grainDirectoryResolver;
@@ -464,12 +461,12 @@ private readonly struct SiloAddressLogValue(SiloAddress silo)
             string traceParent = null;
             string traceState = null;
 
-            if (requestContextData.TryGetValue(TraceParentHeaderName, out var traceParentObj) && traceParentObj is string tp)
+            if (requestContextData.TryGetValue(OpenTelemetryHeaders.TraceParent, out var traceParentObj) && traceParentObj is string tp)
             {
                 traceParent = tp;
             }
 
-            if (requestContextData.TryGetValue(TraceStateHeaderName, out var traceStateObj) && traceStateObj is string ts)
+            if (requestContextData.TryGetValue(OpenTelemetryHeaders.TraceState, out var traceStateObj) && traceStateObj is string ts)
             {
                 traceState = ts;
             }

src/Orleans.Runtime/Placement/PlacementService.cs

@@ -17,8 +17,6 @@ namespace Orleans.Runtime.Placement
     /// </summary>
     internal partial class PlacementService : IPlacementContext
     {
-        private const string TraceParentHeaderName = "traceparent";
-        private const string TraceStateHeaderName = "tracestate";
         private const int PlacementWorkerCount = 16;
         private readonly PlacementStrategyResolver _strategyResolver;
         private readonly PlacementDirectorResolver _directorResolver;
@@ -425,12 +423,12 @@ private static Activity TryRestoreActivityContext(Dictionary<string, object> req
             string traceParent = null;
             string traceState = null;
 
-            if (requestContextData.TryGetValue(TraceParentHeaderName, out var traceParentObj) && traceParentObj is string tp)
+            if (requestContextData.TryGetValue(OpenTelemetryHeaders.TraceParent, out var traceParentObj) && traceParentObj is string tp)
             {
                 traceParent = tp;
             }
 
-            if (requestContextData.TryGetValue(TraceStateHeaderName, out var traceStateObj) && traceStateObj is string ts)
+            if (requestContextData.TryGetValue(OpenTelemetryHeaders.TraceState, out var traceStateObj) && traceStateObj is string ts)
             {
                 traceState = ts;
             }

test/Tester/ActivationTracingTests.cs

@@ -28,7 +28,6 @@ static ActivationTracingTests()
         {
             var listener = new ActivityListener
             {
-                //ShouldListenTo = src => src.Name.StartsWith("Microsoft.Orleans"),
                 ShouldListenTo = src => src.Name == ActivitySources.ApplicationGrainActivitySourceName
                                         || src.Name == ActivitySources.LifecycleActivitySourceName
                                         || src.Name == ActivitySources.StorageActivitySourceName,
@@ -336,9 +335,6 @@ public async Task MigrationSpansAreCreatedForGrainWithPersistentState()
                     .Select(s => s.SiloAddress)
                     .First(address => address != originalHost);
 
-                // Clear activities before migration to isolate migration spans
-                //Started.Clear();
-
                 // Trigger migration with a placement hint
                 RequestContext.Set(IPlacementDirector.PlacementHintKey, targetHost);
                 await grain.Cast<IGrainManagementExtension>().MigrateOnIdle();