diff --git a/docs/trace/building-your-own-exporter/Program.cs b/docs/trace/building-your-own-exporter/Program.cs index ac182a02091..4fd529a7a4d 100644 --- a/docs/trace/building-your-own-exporter/Program.cs +++ b/docs/trace/building-your-own-exporter/Program.cs @@ -25,7 +25,7 @@ public class Program public static void Main() { using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyLibrary") + .AddSource("MyCompany.MyProduct.MyLibrary") .AddMyExporter() .Build(); diff --git a/docs/trace/building-your-own-processor/Program.cs b/docs/trace/building-your-own-processor/Program.cs index a18aea5eabb..942a6d07cea 100644 --- a/docs/trace/building-your-own-processor/Program.cs +++ b/docs/trace/building-your-own-processor/Program.cs @@ -26,7 +26,7 @@ public class Program public static void Main() { using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyLibrary") + .AddSource("MyCompany.MyProduct.MyLibrary") .AddProcessor(new MyActivityProcessor("A")) .AddProcessor(new MyActivityProcessor("B")) .Build(); diff --git a/docs/trace/building-your-own-sampler/Program.cs b/docs/trace/building-your-own-sampler/Program.cs index 9dc5128ee22..887ca8890ba 100644 --- a/docs/trace/building-your-own-sampler/Program.cs +++ b/docs/trace/building-your-own-sampler/Program.cs @@ -27,7 +27,7 @@ public class Program public static void Main() { using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyLibrary") + .AddSource("MyCompany.MyProduct.MyLibrary") .SetSampler(new MySampler()) .AddProcessor(new SimpleActivityProcessor(new ConsoleExporter(new ConsoleExporterOptions()))) .Build(); diff --git a/docs/trace/getting-started/Program.cs b/docs/trace/getting-started/Program.cs index 3e46ca7bf93..3b0c8b9dbc8 100644 --- a/docs/trace/getting-started/Program.cs +++ b/docs/trace/getting-started/Program.cs @@ -27,7 +27,7 @@ public class Program public static void Main() { using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyLibrary") + .AddSource("MyCompany.MyProduct.MyLibrary") .AddProcessor(new SimpleActivityProcessor(new ConsoleExporter(new ConsoleExporterOptions()))) .Build(); diff --git a/examples/Console/TestConsoleExporter.cs b/examples/Console/TestConsoleExporter.cs index 3a16d7c54cc..ea92fb6e7e8 100644 --- a/examples/Console/TestConsoleExporter.cs +++ b/examples/Console/TestConsoleExporter.cs @@ -30,7 +30,8 @@ internal static object Run(ConsoleOptions options) { // Enable TracerProvider for the source "MyCompany.MyProduct.MyWebServer" // and use a custom MyProcessor, along with Console exporter. - using var tracerProvider = Sdk.CreateTracerProviderBuilder().AddActivitySource("MyCompany.MyProduct.MyWebServer") + using var tracerProvider = Sdk.CreateTracerProviderBuilder() + .AddSource("MyCompany.MyProduct.MyWebServer") .SetResource(Resources.CreateServiceResource("MyServiceName")) .AddProcessor(new MyProcessor()) // This must be added before ConsoleExporter .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson) diff --git a/examples/Console/TestHttpClient.cs b/examples/Console/TestHttpClient.cs index 4264df7d7bd..e624a777b6e 100644 --- a/examples/Console/TestHttpClient.cs +++ b/examples/Console/TestHttpClient.cs @@ -30,7 +30,7 @@ internal static object Run() using var openTelemetry = Sdk.CreateTracerProviderBuilder() .AddHttpClientInstrumentation() .SetResource(Resources.CreateServiceResource("http-service-example")) - .AddActivitySource("http-client-test") + .AddSource("http-client-test") .UseConsoleExporter(opt => opt.DisplayAsJson = false) .Build(); diff --git a/examples/Console/TestJaegerExporter.cs b/examples/Console/TestJaegerExporter.cs index b88d6c483fd..611555fbcca 100644 --- a/examples/Console/TestJaegerExporter.cs +++ b/examples/Console/TestJaegerExporter.cs @@ -30,8 +30,7 @@ internal static object RunWithActivity(string host, int port) // Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient" // and use the Jaeger exporter. using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("Samples.SampleServer") - .AddActivitySource("Samples.SampleClient") + .AddSource("Samples.SampleClient", "Samples.SampleServer") .UseJaegerExporter(o => { o.ServiceName = "jaeger-test"; diff --git a/examples/Console/TestOTelShimWithConsoleExporter.cs b/examples/Console/TestOTelShimWithConsoleExporter.cs index dfb214c6dc2..13e0e398e99 100644 --- a/examples/Console/TestOTelShimWithConsoleExporter.cs +++ b/examples/Console/TestOTelShimWithConsoleExporter.cs @@ -27,7 +27,7 @@ internal static object Run(OpenTelemetryShimOptions options) // Enable OpenTelemetry for the source "MyCompany.MyProduct.MyWebServer" // and use a single pipeline with a custom MyProcessor, and Console exporter. using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyWebServer") + .AddSource("MyCompany.MyProduct.MyWebServer") .SetResource(Resources.CreateServiceResource("MyServiceName")) .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson) .Build(); diff --git a/examples/Console/TestOpenTracingWithConsoleExporter.cs b/examples/Console/TestOpenTracingWithConsoleExporter.cs index 409717a919e..cda0b03aa5c 100644 --- a/examples/Console/TestOpenTracingWithConsoleExporter.cs +++ b/examples/Console/TestOpenTracingWithConsoleExporter.cs @@ -30,7 +30,7 @@ internal static object Run(OpenTracingShimOptions options) // Enable OpenTelemetry for the source "MyCompany.MyProduct.MyWebServer" // and use Console exporter. using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("MyCompany.MyProduct.MyWebServer") + .AddSource("MyCompany.MyProduct.MyWebServer") .SetResource(Resources.CreateServiceResource("MyServiceName")) .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson) .Build(); diff --git a/examples/Console/TestOtlpExporter.cs b/examples/Console/TestOtlpExporter.cs index ecdb056f1b8..92747889413 100644 --- a/examples/Console/TestOtlpExporter.cs +++ b/examples/Console/TestOtlpExporter.cs @@ -31,8 +31,7 @@ private static object RunWithActivitySource(string endpoint) // Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient" // and use OTLP exporter. using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("Samples.SampleServer") - .AddActivitySource("Samples.SampleClient") + .AddSource("Samples.SampleClient", "Samples.SampleServer") .UseOtlpExporter(opt => opt.Endpoint = endpoint) .Build(); diff --git a/examples/Console/TestRedis.cs b/examples/Console/TestRedis.cs index a7044601606..bacca2713cb 100644 --- a/examples/Console/TestRedis.cs +++ b/examples/Console/TestRedis.cs @@ -53,7 +53,7 @@ internal static object Run(string zipkinUri) // changing flushinterval from 10s to 5s options.FlushInterval = TimeSpan.FromSeconds(5); }) - .AddActivitySource("redis-test") + .AddSource("redis-test") .Build(); ActivitySource activitySource = new ActivitySource("redis-test"); diff --git a/examples/Console/TestZPagesExporter.cs b/examples/Console/TestZPagesExporter.cs index c4175cee7d5..819cc566e66 100644 --- a/examples/Console/TestZPagesExporter.cs +++ b/examples/Console/TestZPagesExporter.cs @@ -35,7 +35,7 @@ internal static object Run() httpServer.Start(); using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("zpages-test") + .AddSource("zpages-test") .AddProcessor(zpagesProcessor) .UseZPagesExporter() .Build(); diff --git a/examples/Console/TestZipkinExporter.cs b/examples/Console/TestZipkinExporter.cs index 9b025f5b5f2..8afb9a1f10b 100644 --- a/examples/Console/TestZipkinExporter.cs +++ b/examples/Console/TestZipkinExporter.cs @@ -34,8 +34,7 @@ internal static object Run(string zipkinUri) // Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient" // and use the Zipkin exporter. using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("Samples.SampleServer") - .AddActivitySource("Samples.SampleClient") + .AddSource("Samples.SampleClient", "Samples.SampleServer") .UseZipkinExporter(o => { o.ServiceName = "test-zipkin"; diff --git a/examples/MicroserviceExample/WebApi/Startup.cs b/examples/MicroserviceExample/WebApi/Startup.cs index eee59c30d1c..fb6aaed20b3 100644 --- a/examples/MicroserviceExample/WebApi/Startup.cs +++ b/examples/MicroserviceExample/WebApi/Startup.cs @@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services) services.AddOpenTelemetry((builder) => builder .AddAspNetCoreInstrumentation() - .AddActivitySource(nameof(MessageSender)) + .AddSource(nameof(MessageSender)) .UseZipkinExporter(b => { var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost"; diff --git a/examples/MicroserviceExample/WorkerService/Program.cs b/examples/MicroserviceExample/WorkerService/Program.cs index 36916ef6ddb..4aa8fb242a5 100644 --- a/examples/MicroserviceExample/WorkerService/Program.cs +++ b/examples/MicroserviceExample/WorkerService/Program.cs @@ -40,7 +40,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => services.AddOpenTelemetry((builder) => { builder - .AddActivitySource(nameof(MessageReceiver)) + .AddSource(nameof(MessageReceiver)) .UseZipkinExporter(b => { var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost"; diff --git a/src/OpenTelemetry.Instrumentation.Http/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.Http/TracerProviderBuilderExtensions.cs index 1489b73d478..eeb75fd26c5 100644 --- a/src/OpenTelemetry.Instrumentation.Http/TracerProviderBuilderExtensions.cs +++ b/src/OpenTelemetry.Instrumentation.Http/TracerProviderBuilderExtensions.cs @@ -79,7 +79,7 @@ internal static TracerProviderBuilder AddHttpWebRequestInstrumentation( HttpWebRequestActivitySource.Options = options; - builder.AddActivitySource(HttpWebRequestActivitySource.ActivitySourceName); + builder.AddSource(HttpWebRequestActivitySource.ActivitySourceName); return builder; } diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs index 75cda6ea349..04c28679936 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs +++ b/src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs @@ -44,7 +44,7 @@ public static TracerProviderBuilder AddSqlClientInstrumentation( configureSqlClientInstrumentationOptions?.Invoke(sqlOptions); builder.AddInstrumentation((activitySource) => new SqlClientInstrumentation(sqlOptions)); - builder.AddActivitySource(SqlClientDiagnosticListener.ActivitySourceName); + builder.AddSource(SqlClientDiagnosticListener.ActivitySourceName); return builder; } diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs index 3e47929e320..a59f8803354 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs @@ -47,7 +47,7 @@ public static TracerProviderBuilder AddRedisInstrumentation( return builder .AddInstrumentation((activitySourceAdapter) => new StackExchangeRedisCallsInstrumentation(connection, options)) - .AddActivitySource(StackExchangeRedisCallsInstrumentation.ActivitySourceName); + .AddSource(StackExchangeRedisCallsInstrumentation.ActivitySourceName); } } } diff --git a/src/OpenTelemetry/Trace/TracerProviderBuilder.cs b/src/OpenTelemetry/Trace/TracerProviderBuilder.cs index f73e53704f2..65db99188a6 100644 --- a/src/OpenTelemetry/Trace/TracerProviderBuilder.cs +++ b/src/OpenTelemetry/Trace/TracerProviderBuilder.cs @@ -61,31 +61,12 @@ public TracerProviderBuilder SetResource(Resource resource) return this; } - /// - /// Adds given activitysource name to the list of subscribed sources. - /// - /// Activity source name. - /// Returns for chaining. - public TracerProviderBuilder AddActivitySource(string name) - { - if (string.IsNullOrWhiteSpace(name)) - { - throw new ArgumentException($"{nameof(name)} is null or whitespace."); - } - - // TODO: We need to fix the listening model. - // Today it ignores version. - this.sources.Add(name); - - return this; - } - /// /// Adds given activitysource names to the list of subscribed sources. /// /// Activity source names. /// Returns for chaining. - public TracerProviderBuilder AddActivitySource(IEnumerable names) + public TracerProviderBuilder AddSource(params string[] names) { if (names == null) { @@ -93,8 +74,15 @@ public TracerProviderBuilder AddActivitySource(IEnumerable names) } foreach (var name in names) - { - this.AddActivitySource(name); + { + if (string.IsNullOrWhiteSpace(name)) + { + throw new ArgumentException($"{nameof(names)} contains null or whitespace string."); + } + + // TODO: We need to fix the listening model. + // Today it ignores version. + this.sources.Add(name); } return this; diff --git a/test/Benchmarks/OpenTelemetrySdkBenchmarks.cs b/test/Benchmarks/OpenTelemetrySdkBenchmarks.cs index 5d8e16f530a..f21b5e2efb8 100644 --- a/test/Benchmarks/OpenTelemetrySdkBenchmarks.cs +++ b/test/Benchmarks/OpenTelemetrySdkBenchmarks.cs @@ -31,11 +31,15 @@ public class OpenTelemetrySdkBenchmarks public OpenTelemetrySdkBenchmarks() { - using var openTelemetryAlwaysOnSample = Sdk.CreateTracerProviderBuilder().AddActivitySource("AlwaysOnSample") - .SetSampler(new AlwaysOnSampler()).Build(); - - using var openTelemetryAlwaysOffSample = Sdk.CreateTracerProviderBuilder().AddActivitySource("AlwaysOffSample") - .SetSampler(new AlwaysOffSampler()).Build(); + using var openTelemetryAlwaysOnSample = Sdk.CreateTracerProviderBuilder() + .AddSource("AlwaysOnSample") + .SetSampler(new AlwaysOnSampler()) + .Build(); + + using var openTelemetryAlwaysOffSample = Sdk.CreateTracerProviderBuilder() + .AddSource("AlwaysOffSample") + .SetSampler(new AlwaysOffSampler()) + .Build(); using var openTelemetryNoop = Sdk.CreateTracerProviderBuilder().Build(); diff --git a/test/Benchmarks/OpenTelemetrySdkBenchmarksActivity.cs b/test/Benchmarks/OpenTelemetrySdkBenchmarksActivity.cs index c4c7cdb4363..018fec2f1b5 100644 --- a/test/Benchmarks/OpenTelemetrySdkBenchmarksActivity.cs +++ b/test/Benchmarks/OpenTelemetrySdkBenchmarksActivity.cs @@ -31,7 +31,9 @@ public class OpenTelemetrySdkBenchmarksActivity public OpenTelemetrySdkBenchmarksActivity() { // Not configuring pipeline, which will result in default NoopActivityProcessor. - var openTel = Sdk.CreateTracerProviderBuilder().AddActivitySource("BenchMark"); + var openTel = Sdk.CreateTracerProviderBuilder() + .AddSource("BenchMark") + .Build(); } [Benchmark] diff --git a/test/OpenTelemetry.Exporter.Jaeger.Tests/JaegerExporterTests.cs b/test/OpenTelemetry.Exporter.Jaeger.Tests/JaegerExporterTests.cs index 81c3c0ca139..8df09aa5671 100644 --- a/test/OpenTelemetry.Exporter.Jaeger.Tests/JaegerExporterTests.cs +++ b/test/OpenTelemetry.Exporter.Jaeger.Tests/JaegerExporterTests.cs @@ -55,7 +55,7 @@ public void UseJaegerExporterWithCustomActivityProcessor() }; var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .AddProcessor(testActivityProcessor) .UseJaegerExporter() .Build(); diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs index b64e0faeae8..1b31f5f91c4 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs @@ -74,8 +74,8 @@ public void ToOtlpResourceSpansTest() // This following is done just to set Resource to Activity. using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(sources[0].Name) - .AddActivitySource(sources[1].Name) + .AddSource(sources[0].Name) + .AddSource(sources[1].Name) .SetResource(resource) .Build(); @@ -260,7 +260,7 @@ public void UseOpenTelemetryProtocolActivityExporterWithCustomActivityProcessor( }; var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .AddProcessor(testActivityProcessor) .UseOtlpExporter() .Build(); diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs b/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs index 080730ac45e..d1e37400735 100644 --- a/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs +++ b/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs @@ -88,10 +88,10 @@ public void ZPagesExporter_CustomActivityProcessor() }; var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) - .AddProcessor(testActivityProcessor) - .UseZPagesExporter() - .Build(); + .AddSource(ActivitySourceName) + .AddProcessor(testActivityProcessor) + .UseZPagesExporter() + .Build(); var source = new ActivitySource(ActivitySourceName); var activity = source.StartActivity("Test Zipkin Activity"); @@ -130,7 +130,7 @@ public void ZPagesExporter_ZPagesProcessor() var zpagesProcessor = new ZPagesProcessor(exporter); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .AddProcessor(zpagesProcessor) .UseZPagesExporter() .Build(); diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs b/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs index 8b6c1db4d24..6157cb701fb 100644 --- a/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs +++ b/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs @@ -158,15 +158,14 @@ public void UseZipkinExporterWithCustomActivityProcessor() }; var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) - .AddProcessor(testActivityProcessor) - .UseZipkinExporter( - o => - { - o.ServiceName = "test-zipkin"; - o.Endpoint = new Uri($"http://{this.testServerHost}:{this.testServerPort}/api/v2/spans?requestId={requestId}"); - }) - .Build(); + .AddSource(ActivitySourceName) + .AddProcessor(testActivityProcessor) + .UseZipkinExporter(o => + { + o.ServiceName = "test-zipkin"; + o.Endpoint = new Uri($"http://{this.testServerHost}:{this.testServerPort}/api/v2/spans?requestId={requestId}"); + }) + .Build(); var source = new ActivitySource(ActivitySourceName); var activity = source.StartActivity("Test Zipkin Activity"); diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs index 862da689a08..5ab538dd159 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs @@ -28,7 +28,7 @@ public class ActivityExtensionsTest public void SetStatus() { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .Build(); using var source = new ActivitySource(ActivitySourceName); @@ -43,7 +43,7 @@ public void SetStatus() public void SetStatusWithDescription() { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .Build(); using var source = new ActivitySource(ActivitySourceName); @@ -60,7 +60,7 @@ public void SetStatusWithDescription() public void SetCancelledStatus() { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .Build(); using var source = new ActivitySource(ActivitySourceName); @@ -75,7 +75,7 @@ public void SetCancelledStatus() public void GetStatusWithNoStatusInActivity() { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .Build(); using var source = new ActivitySource(ActivitySourceName); @@ -89,7 +89,7 @@ public void GetStatusWithNoStatusInActivity() public void LastSetStatusWins() { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .Build(); using var source = new ActivitySource(ActivitySourceName); diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Export/BatchingActivityProcessorTests.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Export/BatchingActivityProcessorTests.cs index ac191b6d83c..d4936c8bcbf 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/Export/BatchingActivityProcessorTests.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/Export/BatchingActivityProcessorTests.cs @@ -90,10 +90,10 @@ public void CancelWithExporterTimeoutMilliseconds() var activityExporter = new TestActivityExporter(null, sleepMilliseconds: 5000); using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, TimeSpan.FromMilliseconds(1000), TimeSpan.FromMilliseconds(0), 1); using (var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) - .SetSampler(new AlwaysOnSampler()) - .AddProcessor(activityProcessor) - .Build()) + .AddSource(ActivitySourceName) + .SetSampler(new AlwaysOnSampler()) + .AddProcessor(activityProcessor) + .Build()) { var activity1 = this.CreateActivity(ActivityName1); } // Force everything to flush out of the processor. @@ -107,7 +107,7 @@ public void ExportDifferentSampledActivities() var activityExporter = new TestActivityExporter(null); using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 128); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build(); @@ -136,7 +136,7 @@ public void ExporterIsSlowerThanDelay() using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, TimeSpan.FromMilliseconds(30), DefaultTimeout, 10); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build(); @@ -169,7 +169,7 @@ public void AddActivityAfterQueueIsExhausted() }); using var activityProcessor = new BatchingActivityProcessor(activityExporter, 1, TimeSpan.FromMilliseconds(100), DefaultTimeout, 1); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build(); @@ -200,7 +200,7 @@ public void ExportMoreActivitiesThanTheMaxBatchSize() using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 3); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build(); @@ -235,7 +235,7 @@ public void ExportNotSampledActivities() var activityExporter = new TestActivityExporter(_ => Interlocked.Increment(ref exportCalledCount)); using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 1); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new ParentOrElseSampler(new AlwaysOffSampler())) .AddProcessor(activityProcessor) .Build(); @@ -264,7 +264,7 @@ public void ProcessorDoesNotBlockOnExporter() using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 128); using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build(); @@ -296,7 +296,7 @@ public async Task ShutdownOnNotEmptyQueueFullFlush() using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize); using (var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build()) @@ -343,7 +343,7 @@ public async Task ShutdownOnNotEmptyQueueNotFullFlush() using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize); using (var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build()) @@ -386,7 +386,7 @@ public async Task ForceFlushExportsAllData() var activityExporter = new TestActivityExporter(_ => Interlocked.Increment(ref exportCalledCount)); using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize); using (var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(activityProcessor) .Build()) @@ -432,7 +432,7 @@ public void DisposeFlushes() using (var batchingActivityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize)) { using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(new AlwaysOnSampler()) .AddProcessor(batchingActivityProcessor) .Build(); diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs index 23106087744..43c0287c8c0 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs @@ -38,10 +38,10 @@ public SimpleActivityProcessorTest() { this.activityExporter = new TestActivityExporter(null); this.openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) - .SetSampler(new AlwaysOnSampler()) - .AddProcessor(new SimpleActivityProcessor(this.activityExporter)) - .Build(); + .AddSource(ActivitySourceName) + .SetSampler(new AlwaysOnSampler()) + .AddProcessor(new SimpleActivityProcessor(this.activityExporter)) + .Build(); this.activitySource = new ActivitySource(ActivitySourceName); } @@ -57,7 +57,7 @@ public void ThrowsInExporter() { this.activityExporter = new TestActivityExporter(_ => throw new ArgumentException("123")); this.openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("random") + .AddSource("random") .SetSampler(new AlwaysOnSampler()) .AddProcessor(new SimpleActivityProcessor(this.activityExporter)) .Build(); @@ -74,7 +74,7 @@ public void ProcessorDoesNotBlockOnExporter() { this.activityExporter = new TestActivityExporter(async _ => await Task.Delay(500)); this.openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("random") + .AddSource("random") .AddProcessor(new SimpleActivityProcessor(this.activityExporter)) .Build(); diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/OpenTelemetrySdkTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/OpenTelemetrySdkTest.cs index 5f679b675c1..87bf6cb6104 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/OpenTelemetrySdkTest.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/OpenTelemetrySdkTest.cs @@ -30,7 +30,7 @@ public void ResourceGetsAssociatedWithActivity() var expectedResource = Resources.Resources.CreateServiceResource("ServiceNameAbc"); using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(nameof(this.ResourceGetsAssociatedWithActivity)) + .AddSource(nameof(this.ResourceGetsAssociatedWithActivity)) .SetResource(expectedResource) .Build(); @@ -47,7 +47,7 @@ public void DefaultResourceGetsAssociatedWithActivityIfNoneConfigured() var expectedResource = Resource.Empty; using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(nameof(this.ResourceGetsAssociatedWithActivity)) + .AddSource(nameof(this.ResourceGetsAssociatedWithActivity)) .Build(); using (var root = activitySource.StartActivity("root")) diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/TraceSdkTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/TraceSdkTest.cs index 20548e0ac4d..c78b54b57f6 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/TraceSdkTest.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/TraceSdkTest.cs @@ -30,9 +30,9 @@ public void TracerSdkInvokesSamplingWithCorrectParameters() var testSampler = new TestSampler(); using var activitySource = new ActivitySource(ActivitySourceName); using var sdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) - .SetSampler(testSampler) - .Build(); + .AddSource(ActivitySourceName) + .SetSampler(testSampler) + .Build(); // OpenTelemetry Sdk is expected to set default to W3C. Assert.True(Activity.DefaultIdFormat == ActivityIdFormat.W3C); @@ -106,7 +106,7 @@ public void TracerSdkSetsActivityDataRequestBasedOnSamplingDecision() var testSampler = new TestSampler(); using var activitySource = new ActivitySource(ActivitySourceName); using var sdk = Sdk.CreateTracerProviderBuilder() - .AddActivitySource(ActivitySourceName) + .AddSource(ActivitySourceName) .SetSampler(testSampler) .Build(); diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/TracerTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/TracerTest.cs index eb022194527..f84dbdb48bc 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/TracerTest.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/TracerTest.cs @@ -60,7 +60,7 @@ public void TracerStartReturnsNoopSpanWhenNoSdk() public void Tracer_StartRootSpan_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartRootSpan(null); @@ -77,7 +77,7 @@ public void Tracer_StartRootSpan_BadArgs_NullSpanName() public void Tracer_StartSpan_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartSpan(null); @@ -94,7 +94,7 @@ public void Tracer_StartSpan_BadArgs_NullSpanName() public void Tracer_StartActiveSpan_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartActiveSpan(null); @@ -111,7 +111,7 @@ public void Tracer_StartActiveSpan_BadArgs_NullSpanName() public void Tracer_StartSpan_FromParent_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance); @@ -125,7 +125,7 @@ public void Tracer_StartSpan_FromParent_BadArgs_NullSpanName() public void Tracer_StartSpan_FromParentContext_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var blankContext = default(SpanContext); @@ -141,7 +141,7 @@ public void Tracer_StartSpan_FromParentContext_BadArgs_NullSpanName() public void Tracer_StartActiveSpan_FromParent_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartActiveSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance); @@ -155,7 +155,7 @@ public void Tracer_StartActiveSpan_FromParent_BadArgs_NullSpanName() public void Tracer_StartActiveSpan_FromParentContext_BadArgs_NullSpanName() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var blankContext = default(SpanContext); @@ -171,7 +171,7 @@ public void Tracer_StartActiveSpan_FromParentContext_BadArgs_NullSpanName() public void Tracer_StartActiveSpan_CreatesActiveSpan() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span1 = this.tracer.StartActiveSpan("Test"); @@ -195,7 +195,7 @@ public void Tracer_StartActiveSpan_CreatesActiveSpan() public void GetCurrentSpanBlank() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); Assert.False(this.tracer.CurrentSpan.Context.IsValid); } @@ -204,7 +204,7 @@ public void GetCurrentSpanBlank() public void GetCurrentSpanBlankWontThrowOnEnd() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var current = this.tracer.CurrentSpan; current.End(); @@ -214,7 +214,7 @@ public void GetCurrentSpanBlankWontThrowOnEnd() public void GetCurrentSpan() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span = this.tracer.StartSpan("foo"); @@ -228,7 +228,7 @@ public void GetCurrentSpan() public void CreateSpan_Sampled() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .Build(); var span = this.tracer.StartSpan("foo"); Assert.True(span.IsRecording); @@ -238,7 +238,7 @@ public void CreateSpan_Sampled() public void CreateSpan_NotSampled() { using var openTelemetry = Sdk.CreateTracerProviderBuilder() - .AddActivitySource("tracername") + .AddSource("tracername") .SetSampler(new AlwaysOffSampler()) .Build();