Support redis instrumentation for keyed service

src/Components/Aspire.StackExchange.Redis/AspireRedisExtensions.cs

@@ -100,11 +100,22 @@ private static void AddRedis(IHostApplicationBuilder builder, string configurati
         if (settings.Tracing)
         {
             // Supports distributed tracing
-            builder.Services.AddOpenTelemetry()
+            if (serviceKey is null)
+            {
+                builder.Services.AddOpenTelemetry()
                 .WithTracing(t =>
                 {
                     t.AddRedisInstrumentation();
                 });
+            }
+            else
+            {
+                builder.Services.AddOpenTelemetry()
+                .WithTracing(t =>
+                {
+                    t.AddRedisInstrumentationWithKeyedService(serviceKey);
+                });
+            }
         }
 
         if (settings.HealthChecks)

src/Components/Aspire.StackExchange.Redis/TempOpenTelemetry.cs

@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using OpenTelemetry.Instrumentation.StackExchangeRedis;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+
+namespace Aspire.StackExchange.Redis;
+
+// This is a temporary solution to add instrumentation for keyed service.
+// This class needs to get removed once this issue got solved and published.
+// https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/1451
+
+// This code has been copied from here
+//https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/c3a4f335f5a1f4fc784d44cc99b5bf44e872a66c/src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs#L109
+internal static class TempOpenTelemetry
+{
+    public static TracerProviderBuilder AddRedisInstrumentationWithKeyedService(
+        this TracerProviderBuilder builder,
+        object serviceKey)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.ConfigureServices(services =>
+        {
+            services.TryAddSingleton(sp => Create(sp));
+        });
+
+        return builder
+            .AddSource("OpenTelemetry.Instrumentation.StackExchangeRedis")
+            .AddInstrumentation(sp =>
+            {
+                var instrumentation = sp.GetRequiredService<StackExchangeRedisInstrumentation>();
+
+                var connection = sp.GetKeyedService<IConnectionMultiplexer>(serviceKey);
+
+                if (connection != null)
+                {
+                    instrumentation.AddConnection(Options.DefaultName, connection);
+                }
+
+                return instrumentation;
+            });
+    }
+
+    private static StackExchangeRedisInstrumentation Create(IServiceProvider sp)
+    {
+        // StackExchangeRedisInstrumentation has an internal constructor
+        var instrumentation = Activator.CreateInstance(
+            typeof(StackExchangeRedisInstrumentation),
+            BindingFlags.NonPublic | BindingFlags.Instance,
+            null,
+            new object[] { sp.GetRequiredService<IOptionsMonitor<StackExchangeRedisInstrumentationOptions>>() },
+            null) as StackExchangeRedisInstrumentation;
+
+        return instrumentation!;
+    }
+}

tests/Aspire.StackExchange.Redis.Tests/AspireRedisExtensionsTests.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Reflection;
 using Microsoft.AspNetCore.OutputCaching;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.StackExchangeRedis;
@@ -9,6 +10,7 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using OpenTelemetry.Trace;
 using StackExchange.Redis;
 using Xunit;
 
@@ -223,4 +225,25 @@ public void MultipleRedisComponentsCanBeAdded(bool useKeyed)
         var healthCheckService = host.Services.GetRequiredService<HealthCheckService>();
         Assert.NotNull(healthCheckService);
     }
+
+    [Fact]
+    public void KeyedServiceRedisInstrumentation()
+    {
+        var builder = Host.CreateEmptyApplicationBuilder(null);
+
+        builder.AddKeyedRedis("redis", settings =>
+        {
+            settings.ConnectionString = "localhost";
+            settings.Tracing = true;
+        }, options => { });
+        var host = builder.Build();
+
+        //This will add the instrumentations.
+        var tracerProvider = host.Services.GetRequiredService<TracerProvider>();
+
+        var connectionMultiplexer = host.Services.GetRequiredKeyedService<IConnectionMultiplexer>("redis");
+        var profiler = connectionMultiplexer.GetType().GetField("_profilingSessionProvider", BindingFlags.NonPublic | BindingFlags.Instance)!.GetValue(connectionMultiplexer);
+
+        Assert.NotNull(profiler);
+    }
 }