Simplifying configuration

Author: stebet

projects/RabbitMQ.Client.OpenTelemetry/RabbitMQOpenTelemetryConfiguration.cs

@@ -5,34 +5,17 @@
 using System.Text;
 using OpenTelemetry.Context.Propagation;
 using RabbitMQ.Client;
-using RabbitMQ.Client.OpenTelemetry;
 
 namespace OpenTelemetry.Trace
 {
     public static class OpenTelemetryExtensions
     {
-        public static TracerProviderBuilder AddRabbitMQInstrumentation(this TracerProviderBuilder builder,
-            RabbitMQOpenTelemetryConfiguration configuration = null)
+        public static TracerProviderBuilder AddRabbitMQInstrumentation(this TracerProviderBuilder builder)
         {
-            if (configuration == null)
-            {
-                configuration = RabbitMQOpenTelemetryConfiguration.Default;
-            }
-
-            RabbitMQActivitySource.UseRoutingKeyAsOperationName = configuration.UseRoutingKeyAsOperationName;
+            RabbitMQActivitySource.UseRoutingKeyAsOperationName = true;
             RabbitMQActivitySource.ContextExtractor = OpenTelemetryContextExtractor;
             RabbitMQActivitySource.ContextInjector = OpenTelemetryContextInjector;
-
-            if (configuration.IncludeSubscribers)
-            {
-                builder.AddSource(RabbitMQActivitySource.SubscriberSourceName);
-            }
-
-            if (configuration.IncludePublishers)
-            {
-                builder.AddSource(RabbitMQActivitySource.PublisherSourceName);
-            }
-
+            builder.AddSource("RabbitMQ.Client.*");
             return builder;
         }
 

projects/RabbitMQ.Client.OpenTelemetry/TraceProviderBuilderExtensions.cs

@@ -40,7 +40,6 @@
 using OpenTelemetry.Trace;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
-using RabbitMQ.Client.OpenTelemetry;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -90,7 +89,7 @@ public async Task TestPublisherAndConsumerActivityTags(bool useRoutingKeyAsOpera
         {
             var exportedItems = new List<Activity>();
             using (var tracer = Sdk.CreateTracerProviderBuilder()
-                       .AddRabbitMQInstrumentation(new RabbitMQOpenTelemetryConfiguration())
+                       .AddRabbitMQInstrumentation()
                        .AddInMemoryExporter(exportedItems)
                        .Build())
             {
@@ -145,7 +144,7 @@ public async Task TestPublisherAndConsumerActivityTagsAsync(bool useRoutingKeyAs
         {
             var exportedItems = new List<Activity>();
             using (var tracer = Sdk.CreateTracerProviderBuilder()
-                       .AddRabbitMQInstrumentation(new RabbitMQOpenTelemetryConfiguration())
+                       .AddRabbitMQInstrumentation()
                        .AddInMemoryExporter(exportedItems)
                        .Build())
             {
@@ -201,7 +200,7 @@ public async Task TestPublisherWithPublicationAddressAndConsumerActivityTagsAsyn
         {
             var exportedItems = new List<Activity>();
             using (var tracer = Sdk.CreateTracerProviderBuilder()
-                       .AddRabbitMQInstrumentation(new RabbitMQOpenTelemetryConfiguration())
+                       .AddRabbitMQInstrumentation()
                        .AddInMemoryExporter(exportedItems)
                        .Build())
             {
@@ -258,7 +257,7 @@ public async Task TestPublisherWithCachedStringsAndConsumerActivityTagsAsync(boo
         {
             var exportedItems = new List<Activity>();
             using (var tracer = Sdk.CreateTracerProviderBuilder()
-                       .AddRabbitMQInstrumentation(new RabbitMQOpenTelemetryConfiguration())
+                       .AddRabbitMQInstrumentation()
                        .AddInMemoryExporter(exportedItems)
                        .Build())
             {
@@ -316,7 +315,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
         {
             var exportedItems = new List<Activity>();
             using (var tracer = Sdk.CreateTracerProviderBuilder()
-                       .AddRabbitMQInstrumentation(new RabbitMQOpenTelemetryConfiguration())
+                       .AddRabbitMQInstrumentation()
                        .AddInMemoryExporter(exportedItems)
                        .Build())
             {