open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename AddActivitySource to AddSource, use params (#1036)

This commit is contained in:
Reiley Yang 2020-08-10 18:02:50 -07:00 committed by GitHub
parent 8af9b326c6
commit ce0bf3f723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 101 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/trace/building-your-own-exporter/Program.cs
View File

@ -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();

2
docs/trace/building-your-own-processor/Program.cs
View File

@ -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();

2
docs/trace/building-your-own-sampler/Program.cs
View File

@ -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();

2
docs/trace/getting-started/Program.cs
View File

@ -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();

3
examples/Console/TestConsoleExporter.cs
View File

@ -30,7 +30,8 @@ namespace Examples.Console
{
// 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)

2
examples/Console/TestHttpClient.cs
View File

@ -30,7 +30,7 @@ namespace Examples.Console
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();

3
examples/Console/TestJaegerExporter.cs
View File

@ -30,8 +30,7 @@ namespace Examples.Console
// 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";

2
examples/Console/TestOTelShimWithConsoleExporter.cs
View File

@ -27,7 +27,7 @@ namespace Examples.Console
// 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();

2
examples/Console/TestOpenTracingWithConsoleExporter.cs
View File

@ -30,7 +30,7 @@ namespace Examples.Console
// 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();

3
examples/Console/TestOtlpExporter.cs
View File

@ -31,8 +31,7 @@ namespace Examples.Console
// 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();

2
examples/Console/TestRedis.cs
View File

@ -53,7 +53,7 @@ namespace Examples.Console
// changing flushinterval from 10s to 5s
options.FlushInterval = TimeSpan.FromSeconds(5);
})
.AddActivitySource("redis-test")
.AddSource("redis-test")
.Build();
ActivitySource activitySource = new ActivitySource("redis-test");

2
examples/Console/TestZPagesExporter.cs
View File

@ -35,7 +35,7 @@ namespace Examples.Console
httpServer.Start();
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("zpages-test")
.AddSource("zpages-test")
.AddProcessor(zpagesProcessor)
.UseZPagesExporter()
.Build();

3
examples/Console/TestZipkinExporter.cs
View File

@ -34,8 +34,7 @@ namespace Examples.Console
// 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";

2
examples/MicroserviceExample/WebApi/Startup.cs
View File

@ -42,7 +42,7 @@ namespace WebApi
services.AddOpenTelemetry((builder) => builder
.AddAspNetCoreInstrumentation()
.AddActivitySource(nameof(MessageSender))
.AddSource(nameof(MessageSender))
.UseZipkinExporter(b =>
{
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";

2
examples/MicroserviceExample/WorkerService/Program.cs
View File

@ -40,7 +40,7 @@ namespace WorkerService
services.AddOpenTelemetry((builder) =>
{
builder
.AddActivitySource(nameof(MessageReceiver))
.AddSource(nameof(MessageReceiver))
.UseZipkinExporter(b =>
{
var zipkinHostName = Environment.GetEnvironmentVariable("ZIPKIN_HOSTNAME") ?? "localhost";

2
src/OpenTelemetry.Instrumentation.Http/TracerProviderBuilderExtensions.cs
View File

@ -79,7 +79,7 @@ namespace OpenTelemetry.Trace
HttpWebRequestActivitySource.Options = options;
builder.AddActivitySource(HttpWebRequestActivitySource.ActivitySourceName);
builder.AddSource(HttpWebRequestActivitySource.ActivitySourceName);
return builder;
}

2
src/OpenTelemetry.Instrumentation.SqlClient/TracerProviderBuilderExtensions.cs
View File

@ -44,7 +44,7 @@ namespace OpenTelemetry.Trace
configureSqlClientInstrumentationOptions?.Invoke(sqlOptions);
builder.AddInstrumentation((activitySource) => new SqlClientInstrumentation(sqlOptions));
builder.AddActivitySource(SqlClientDiagnosticListener.ActivitySourceName);
builder.AddSource(SqlClientDiagnosticListener.ActivitySourceName);
return builder;
}

2
src/OpenTelemetry.Instrumentation.StackExchangeRedis/TracerProviderBuilderExtensions.cs
View File

@ -47,7 +47,7 @@ namespace OpenTelemetry.Trace
return builder
.AddInstrumentation((activitySourceAdapter) => new StackExchangeRedisCallsInstrumentation(connection, options))
.AddActivitySource(StackExchangeRedisCallsInstrumentation.ActivitySourceName);
.AddSource(StackExchangeRedisCallsInstrumentation.ActivitySourceName);
}
}
}

32
src/OpenTelemetry/Trace/TracerProviderBuilder.cs
View File

@ -61,31 +61,12 @@ namespace OpenTelemetry.Trace
return this;
}
/// <summary>
/// Adds given activitysource name to the list of subscribed sources.
/// </summary>
/// <param name="name">Activity source name.</param>
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
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;
}
/// <summary>
/// Adds given activitysource names to the list of subscribed sources.
/// </summary>
/// <param name="names">Activity source names.</param>
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder AddActivitySource(IEnumerable<string> names)
public TracerProviderBuilder AddSource(params string[] names)
{
if (names == null)
{
@ -93,8 +74,15 @@ namespace OpenTelemetry.Trace
}
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;

12
test/Benchmarks/OpenTelemetrySdkBenchmarks.cs
View File

@ -31,11 +31,15 @@ namespace Benchmarks
public OpenTelemetrySdkBenchmarks()
{
using var openTelemetryAlwaysOnSample = Sdk.CreateTracerProviderBuilder().AddActivitySource("AlwaysOnSample")
.SetSampler(new AlwaysOnSampler()).Build();
using var openTelemetryAlwaysOnSample = Sdk.CreateTracerProviderBuilder()
.AddSource("AlwaysOnSample")
.SetSampler(new AlwaysOnSampler())
.Build();
using var openTelemetryAlwaysOffSample = Sdk.CreateTracerProviderBuilder().AddActivitySource("AlwaysOffSample")
.SetSampler(new AlwaysOffSampler()).Build();
using var openTelemetryAlwaysOffSample = Sdk.CreateTracerProviderBuilder()
.AddSource("AlwaysOffSample")
.SetSampler(new AlwaysOffSampler())
.Build();
using var openTelemetryNoop = Sdk.CreateTracerProviderBuilder().Build();

4
test/Benchmarks/OpenTelemetrySdkBenchmarksActivity.cs
View File

@ -31,7 +31,9 @@ namespace Benchmarks
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]

2
test/OpenTelemetry.Exporter.Jaeger.Tests/JaegerExporterTests.cs
View File

@ -55,7 +55,7 @@ namespace OpenTelemetry.Exporter.Jaeger.Tests
};
var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.AddProcessor(testActivityProcessor)
.UseJaegerExporter()
.Build();

6
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs
View File

@ -74,8 +74,8 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
// 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 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
};
var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.AddProcessor(testActivityProcessor)
.UseOtlpExporter()
.Build();

10
test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs
View File

@ -88,10 +88,10 @@ namespace OpenTelemetry.Exporter.ZPages.Tests
};
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 @@ namespace OpenTelemetry.Exporter.ZPages.Tests
var zpagesProcessor = new ZPagesProcessor(exporter);
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.AddProcessor(zpagesProcessor)
.UseZPagesExporter()
.Build();

17
test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs
View File

@ -158,15 +158,14 @@ namespace OpenTelemetry.Exporter.Zipkin.Tests
};
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");

10
test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs
View File

@ -28,7 +28,7 @@ namespace OpenTelemetry.Trace.Test
public void SetStatus()
{
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.Build();
using var source = new ActivitySource(ActivitySourceName);
@ -43,7 +43,7 @@ namespace OpenTelemetry.Trace.Test
public void SetStatusWithDescription()
{
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.Build();
using var source = new ActivitySource(ActivitySourceName);
@ -60,7 +60,7 @@ namespace OpenTelemetry.Trace.Test
public void SetCancelledStatus()
{
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.Build();
using var source = new ActivitySource(ActivitySourceName);
@ -75,7 +75,7 @@ namespace OpenTelemetry.Trace.Test
public void GetStatusWithNoStatusInActivity()
{
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.Build();
using var source = new ActivitySource(ActivitySourceName);
@ -89,7 +89,7 @@ namespace OpenTelemetry.Trace.Test
public void LastSetStatusWins()
{
using var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.Build();
using var source = new ActivitySource(ActivitySourceName);

28
test/OpenTelemetry.Tests/Implementation/Trace/Export/BatchingActivityProcessorTests.cs
View File

@ -90,10 +90,10 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
});
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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();

12
test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs
View File

@ -38,10 +38,10 @@ namespace OpenTelemetry.Trace.Test
{
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 @@ namespace OpenTelemetry.Trace.Test
{
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 @@ namespace OpenTelemetry.Trace.Test
{
this.activityExporter = new TestActivityExporter(async _ => await Task.Delay(500));
this.openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("random")
.AddSource("random")
.AddProcessor(new SimpleActivityProcessor(this.activityExporter))
.Build();

4
test/OpenTelemetry.Tests/Implementation/Trace/OpenTelemetrySdkTest.cs
View File

@ -30,7 +30,7 @@ namespace OpenTelemetry.Tests.Implementation.Trace
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 @@ namespace OpenTelemetry.Tests.Implementation.Trace
var expectedResource = Resource.Empty;
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(nameof(this.ResourceGetsAssociatedWithActivity))
.AddSource(nameof(this.ResourceGetsAssociatedWithActivity))
.Build();
using (var root = activitySource.StartActivity("root"))

8
test/OpenTelemetry.Tests/Implementation/Trace/TraceSdkTest.cs
View File

@ -30,9 +30,9 @@ namespace OpenTelemetry.Tests.Implementation.Trace
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 @@ namespace OpenTelemetry.Tests.Implementation.Trace
var testSampler = new TestSampler();
using var activitySource = new ActivitySource(ActivitySourceName);
using var sdk = Sdk.CreateTracerProviderBuilder()
.AddActivitySource(ActivitySourceName)
.AddSource(ActivitySourceName)
.SetSampler(testSampler)
.Build();

26
test/OpenTelemetry.Tests/Implementation/Trace/TracerTest.cs
View File

@ -60,7 +60,7 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
public void GetCurrentSpanBlank()
{
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("tracername")
.AddSource("tracername")
.Build();
Assert.False(this.tracer.CurrentSpan.Context.IsValid);
}
@ -204,7 +204,7 @@ namespace OpenTelemetry.Trace.Test
public void GetCurrentSpanBlankWontThrowOnEnd()
{
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("tracername")
.AddSource("tracername")
.Build();
var current = this.tracer.CurrentSpan;
current.End();
@ -214,7 +214,7 @@ namespace OpenTelemetry.Trace.Test
public void GetCurrentSpan()
{
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("tracername")
.AddSource("tracername")
.Build();
var span = this.tracer.StartSpan("foo");
@ -228,7 +228,7 @@ namespace OpenTelemetry.Trace.Test
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 @@ namespace OpenTelemetry.Trace.Test
public void CreateSpan_NotSampled()
{
using var openTelemetry = Sdk.CreateTracerProviderBuilder()
.AddActivitySource("tracername")
.AddSource("tracername")
.SetSampler(new AlwaysOffSampler())
.Build();