Merge remote-tracking branch 'origin/main'

Sample.MoneyTransfer.Api/Controllers/SampleInsights.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Mvc;
 using OpenTelemetry.Trace;
+using Sample.MoneyTransfer.API.Utils;
 
 namespace Sample.MoneyTransfer.API.Controllers;
 
@@ -245,34 +246,38 @@ private static async Task DelayAsync(TimeSpan timeSpan)
     }
 
     [HttpGet]
-    [Route(nameof(NPlusOneWithoutInternalSpan))]
-    public void NPlusOneWithoutInternalSpan()
+    [Route(nameof(NPlusOne))]
+    public void NPlusOne()
     {
-        for (int i = 0; i < 100; i++)
+        using (Activity.StartActivity("NewInternalSpan"))
         {
-            DbQuery();
+            Enumerable.Range(0, 100).Foreach(_ => DbQueryUsers());
         }
+
+        Enumerable.Range(0, 90).Foreach(_ => DbQueryAccounts());
+        Enumerable.Range(0, 80).Foreach(_ => DbQueryRoles());
+        Enumerable.Range(0, 70).Foreach(_ => DbQueryGroups());
     }
 
-    [HttpGet]
-    [Route(nameof(NPlusOneWithInternalSpan))]
-    public void NPlusOneWithInternalSpan()
+    private static void DbQueryUsers()
     {
-        Console.WriteLine("doing stuff before");
-
-        using (Activity.StartActivity("SomeInternalSpan"))
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                DbQuery();
-            }
-        }
+        using var activity = Activity.StartActivity(ActivityKind.Client);
+        activity?.SetTag("db.statement", "select * from users");
+    } 
+    private static void DbQueryAccounts()
+    {
+        using var activity = Activity.StartActivity(ActivityKind.Client);
+        activity?.SetTag("db.statement", "select * from accounts");
     }
-
-    private static void DbQuery()
+    private static void DbQueryRoles()
+    {
+        using var activity = Activity.StartActivity(ActivityKind.Client);
+        activity?.SetTag("db.statement", "select * from roles");
+    }
+    private static void DbQueryGroups()
     {
         using var activity = Activity.StartActivity(ActivityKind.Client);
-        activity.SetTag("db.statement", "select * from users");
+        activity?.SetTag("db.statement", "select * from groups");
     }
 
     [HttpGet]

Sample.MoneyTransfer.Api/Utils/CollectionUtils.cs

@@ -0,0 +1,12 @@
+namespace Sample.MoneyTransfer.API.Utils;
+
+public static class CollectionUtils
+{
+    public static void Foreach<T>(this IEnumerable<T> list, Action<T> action)
+    {
+        foreach (var item in list)
+        {
+            action(item);
+        }
+    }
+}