Fixed tests.

Author: jaffinito

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

@@ -171,7 +171,8 @@ private static void ProcessRpcClientTags(ISegment segment, IAgent agent, IErrorS
 
         Log.Finest($"Created ExternalSegmentData for {activityLogPrefix}.");
 
-        segment.GetExperimentalApi().SetSegmentData(externalSegmentData);
+        segment.GetExperimentalApi().SetSegmentData(externalSegmentData)
+            .MakeLeaf();
 
         // per spec, a non-zero status code must be recorded as an exception.
         // TODO: This behavior is supposed to be configurable by the customer but currently is not

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

@@ -32,14 +32,4 @@ public static void SetAndCreateRuntimeActivitySource(Type activitySourceType, Ty
     }
 
     public INewRelicActivity TryCreateActivity(string activityName, ActivityKind kind) => _activitySource?.CreateActivity(activityName, kind);
-
-    /// <summary>
-    /// FOR TESTING ONLY: Resets the static state to allow re-initialization in tests.
-    /// </summary>
-    public static void ResetStaticState()
-    {
-        var oldSource = Interlocked.Exchange(ref _activitySource, null) as IDisposable;
-        oldSource?.Dispose();
-        Interlocked.Exchange(ref _usingRuntimeActivitySource, 0);
-    }
 }

tests/Agent/IntegrationTests/IntegrationTests/Grpc/GrpcTests.cs

@@ -63,8 +63,8 @@ public void Metrics_ExternalCallIsCaptured()
         // The gRPC spec calls for host and port, but we don't include that in the metric name for any external so skipping that for now.
         var expectedMetrics = new List<Assertions.ExpectedMetric>
         {
-            new() { metricName = @"External/all", CallCountAllHarvests = 1 },
-            new() { metricName = @"External/allOther", CallCountAllHarvests = 1 },
+            new() { metricName = @"External/all", CallCountAllHarvests = 2 },
+            new() { metricName = @"External/allOther", CallCountAllHarvests = 2 },
             new() { metricName = @"External/unknown/all", CallCountAllHarvests = 1 },
             new() { metricName = @"External/unknown/gRPC/greet.Greeter/SayHello", CallCountAllHarvests = 1 },
             new() { metricName = @"External/unknown/gRPC/greet.Greeter/SayHello", metricScope = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.Grpc.GrpcExerciser/MakeGrpcClientCall", CallCountAllHarvests = 1 },

tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Grpc/GrpcExerciser.cs

@@ -8,6 +8,7 @@
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using GrpcGreet;
 using Grpc.Net.Client;
 using Microsoft.AspNetCore.Builder;
@@ -24,7 +25,7 @@ public class GrpcExerciser
 {
     [LibraryMethod]
     [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-    public void SayHello(string port)
+    public async Task SayHello(string port)
     {
         var actualPort = port == "0" ? GetAvailablePort() : int.Parse(port);
 
@@ -41,21 +42,21 @@ public void SayHello(string port)
         var app = builder.Build();
         app.MapGrpcService<GreeterService>();
 
-        app.StartAsync().GetAwaiter().GetResult();
+        await app.StartAsync();
 
         try
         {
-            MakeGrpcClientCall(actualPort);
+            await MakeGrpcClientCall(actualPort);
         }
         finally
         {
-            app.StopAsync().GetAwaiter().GetResult();
+            await app.StopAsync();
         }
     }
 
     [Transaction]
     [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-    private static void MakeGrpcClientCall(int port)
+    private static async Task MakeGrpcClientCall(int port)
     {
         using var channel = GrpcChannel.ForAddress($"http://localhost:{port}", new GrpcChannelOptions
         {
@@ -66,7 +67,7 @@ private static void MakeGrpcClientCall(int port)
         });
 
         var client = new Greeter.GreeterClient(channel);
-        var reply = client.SayHello(new HelloRequest { Name = "TestGrpc" });
+        var reply = await client.SayHelloAsync(new HelloRequest { Name = "TestGrpc" });
 
         Console.WriteLine($"[GrpcExerciser] Reply: {reply.Message}");
     }