Fixed tests and remove unnecessary test methods.

Author: jaffinito

src/Agent/NewRelic/Agent/Core/OpenTelemetryBridge/Tracing/ActivityBridge.cs

@@ -62,28 +62,6 @@ public void Dispose()
         _activityListener = null;
     }
 
-    /// <summary>
-    /// FOR TESTING ONLY: Resets the static Activity infrastructure state that was set by this class.
-    /// This should be called in test TearDown to ensure clean state between tests.
-    /// </summary>
-    public static void ResetStaticState()
-    {
-        // Reset the TraceIdGenerator to null (default behavior)
-        var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == "System.Diagnostics.DiagnosticSource");
-        if (assembly != null)
-        {
-            var activityType = assembly.GetType("System.Diagnostics.Activity", throwOnError: false);
-            if (activityType != null)
-            {
-                var traceIdGeneratorPropertyInfo = activityType.GetProperty("TraceIdGenerator", BindingFlags.Public | BindingFlags.Static);
-                traceIdGeneratorPropertyInfo?.SetValue(null, null);
-            }
-        }
-
-        // Reset the static setter
-        _activityTraceFlagsSetter = null;
-    }
-
     // Only .net 5 and newer libraries and applications will use the W3C id format by default.
     // We need to set the default id format to W3C to ensure that the activities we create are created
     // with the expected format.
@@ -412,16 +390,6 @@ private bool ShouldListenToActivitySource(object activitySource)
             return false;
         }
 
-        // Don't listen to the agent's own activity source to prevent recursion.
-        // When traditional agent instrumentation creates segments, they may create activities via
-        // NewRelicActivitySourceProxy. We must not listen to these to avoid infinite recursion
-        // where ActivityStarted tries to create a segment, which creates another activity.
-        if (activitySourceName == NewRelicActivitySourceProxy.ActivitySourceName)
-        {
-            Log.Finest($"ShouldListenToActivitySource: Not listening to agent's own activity source '{activitySourceName}'.");
-            return false;
-        }
-
         return ActivitySourceExtensions.ShouldListenToActivitySource(activitySourceName, _agent.Configuration);
     }
 

src/Agent/NewRelic/Agent/Core/OpenTelemetryBridge/Tracing/ActivityBridgeSegmentHelpers.cs

@@ -42,12 +42,6 @@ public static void ProcessActivityTags(this ISegment segment, object originalAct
             return;
         }
 
-        //TESTING
-        foreach (var tag in tags)
-        {
-            Log.Finest($"{activityLogPrefix} has tag: {tag.Key} = {tag.Value}");
-        }
-
         // based on activity kind, create the appropriate segment data
         // remove all tags that are used in segment data creation
         switch (activityKind)
@@ -157,7 +151,7 @@ private static void ProcessRpcClientTags(ISegment segment, IAgent agent, IErrorS
         tags.TryGetAndRemoveTag<string>(["rpc.method"], out var method);
         tags.TryGetAndRemoveTag<string>(["rpc.service"], out var service); // deprecated attribute, rpc.method includes this information in the format /service/method, but some instrumentation may still use this tag so we'll look for it as a fallback
         tags.TryGetAndRemoveTag<string>(["grpc.method"], out var grpcMethod);
-        var cleanGrpcMethod = grpcMethod.TrimStart('/'); // per spec, we need to strip leading slashes.
+        var cleanGrpcMethod = grpcMethod?.TrimStart('/'); // per spec, we need to strip leading slashes.
 
         tags.TryGetAndRemoveTag<string>(["server.address", "network.peer.address"], out var host);
         tags.TryGetAndRemoveTag<int?>(["server.port", "network.peer.port"], out var port);

tests/Agent/UnitTests/CompositeTests/HybridAgent/Helpers/HybridAgentTestsBase.cs

@@ -17,7 +17,7 @@ namespace CompositeTests.HybridAgent.Helpers;
 
 public abstract class HybridAgentTestsBase
 {
-    private CompositeTestAgent _compositeTestAgent;
+    private static CompositeTestAgent _compositeTestAgent;
     private IAgent _agent;
     private NewRelicAgentOperations _newRelicAgentOperations;
     private ActivityBridge _activityBridge;
@@ -63,11 +63,6 @@ public virtual void TearDown()
         _newRelicAgentOperations = null;
         _activityBridge.Dispose();
         _compositeTestAgent.Dispose();
-
-        // Reset static state to ensure clean slate for next test
-        ActivityBridge.ResetStaticState();
-        NewRelicActivitySourceProxy.ResetStaticState();
-        ActivityBridgeHelpers.Reset();
     }
 
     public abstract void Tests(HybridAgentTestCase test);

tests/Agent/UnitTests/CompositeTests/HybridAgent/TestCaseDefinitions/HybridAgentTests.json

@@ -1967,15 +1967,15 @@
             ],
             "spans": [
                 {
-                    "name": "External/localhost/Stream/GetItem",
+                    "name": "External/localhost/gRPC/GetItem",
                     "parentName": "Foo",
                     "category": "http",
                     "attributes": {
                         "span.kind": "client",
                         "server.address": "localhost",
                         "server.port": 50051,
-                        "http.request.method": "GetItem",
-                        "http.statusCode": 0,
+                        "http.method": "GetItem",
+                        "grpc.statusCode": 0,
                         "http.url": "grpc://localhost:50051/my.test.Service/GetItem",
                         "component": "grpc"
                     }
@@ -2061,15 +2061,15 @@
             ],
             "spans": [
                 {
-                    "name": "External/localhost/Stream/GetItem",
+                    "name": "External/localhost/gRPC/GetItem",
                     "parentName": "Foo",
                     "category": "http",
                     "attributes": {
                         "span.kind": "client",
                         "server.address": "localhost",
                         "server.port": 50051,
-                        "http.request.method": "GetItem",
-                        "http.statusCode": 14,
+                        "http.method": "GetItem",
+                        "grpc.statusCode": 14,
                         "http.url": "grpc://localhost:50051/my.test.Service/GetItem",
                         "component": "grpc"
                     }
@@ -2142,14 +2142,14 @@
             ],
             "spans": [
                 {
-                    "name": "External/localhost/Stream/ListItems",
+                    "name": "External/localhost/gRPC/ListItems",
                     "parentName": "Foo",
                     "category": "http",
                     "attributes": {
                         "span.kind": "client",
                         "server.address": "localhost",
                         "server.port": 50052,
-                        "http.request.method": "ListItems",
+                        "http.method": "ListItems",
                         "http.url": "grpc://localhost:50052/my.test.Service/ListItems",
                         "component": "grpc"
                     }
@@ -2230,15 +2230,15 @@
             ],
             "spans": [
                 {
-                    "name": "External/grpc.example.com/Stream/UnaryCall",
+                    "name": "External/grpc.example.com/gRPC/UnaryCall",
                     "parentName": "Foo",
                     "category": "http",
                     "attributes": {
                         "span.kind": "client",
                         "server.address": "grpc.example.com",
                         "server.port": 6000,
-                        "http.request.method": "UnaryCall",
-                        "http.statusCode": 0,
+                        "http.method": "UnaryCall",
+                        "grpc.statusCode": 0,
                         "http.url": "grpc://grpc.example.com:6000/pkg.alt.Service/UnaryCall",
                         "component": "grpc"
                     }