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

More refactorings, renamings, namespace shortenings. (#886) 

* Rename OpenTelemetrySdk to TracerProviderSdk. Rename OpenTelemetryBuilder to TracerProviderBuilder

* renaming

* Shorter namespace for TracerProvider

* simpler namespace.

* revert unwanted change brought by git merge

* doc changes

* remove dup
This commit is contained in:
Cijo Thomas 2020-07-22 16:46:45 -07:00 committed by GitHub
parent e243394211
commit 4b4f0e95af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 240 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
benchmarks/OpenTelemetrySdkBenchmarks.cs
View File

@ -17,7 +17,6 @@
using BenchmarkDotNet.Attributes;
using Benchmarks.Tracing;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Samplers;
namespace Benchmarks
@ -31,13 +30,13 @@ namespace Benchmarks
public OpenTelemetrySdkBenchmarks()
{
using var openTelemetryAlwaysOnSample = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetryAlwaysOnSample = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("AlwaysOnSample").SetSampler(new AlwaysOnSampler()));
using var openTelemetryAlwaysOffSample = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetryAlwaysOffSample = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("AlwaysOffSample").SetSampler(new AlwaysOffSampler()));
using var openTelemetryNoOp = OpenTelemetrySdk.EnableOpenTelemetry(null);
using var openTelemetryNoOp = TracerProviderSdk.EnableTracerProvider(null);
this.alwaysSampleTracer = TracerProvider.GetTracer("AlwaysOnSample");
this.neverSampleTracer = TracerProvider.GetTracer("AlwaysOffSample");

4
benchmarks/OpenTelemetrySdkBenchmarksActivity.cs
View File

@ -17,7 +17,7 @@
using System.Diagnostics;
using BenchmarkDotNet.Attributes;
using Benchmarks.Tracing;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Benchmarks
{
@ -31,7 +31,7 @@ namespace Benchmarks
public OpenTelemetrySdkBenchmarksActivity()
{
// Not configuring pipeline, which will result in default NoOpActivityProcessor.
var openTel = OpenTelemetrySdk.EnableOpenTelemetry(
var openTel = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("BenchMark")
);
}

4
docs/customization.md
View File

@ -5,7 +5,7 @@
You may configure sampler of your choice
```csharp
OpenTelemetrySdk.EnableOpenTelemetry(b => b
TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new ProbabilityActivitySampler(0.1))
.SetResource(Resources.Resources.CreateServiceResource("my-service"))
@ -98,7 +98,7 @@ class MyExporter : ActivityExporter, IDisposable
similarly to `UseZipkinExporter` extension method.
```csharp
OpenTelemetrySdk.EnableOpenTelemetry(b => b
TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.UseMyExporter();
```

4
docs/getting-started.md
View File

@ -29,7 +29,7 @@ Update the `Program.cs` file with the following code:
```csharp
using System.Diagnostics;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
class Program
{
@ -38,7 +38,7 @@ class Program
static void Main()
{
using var otel = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var otel = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource("MyCompany.MyProduct.MyLibrary")
.UseConsoleExporter(options => options.DisplayAsJson = true));

4
examples/AspNet/Global.asax.cs
View File

@ -3,7 +3,7 @@ using System.Web;
using System.Web.Http;
using System.Web.Mvc;
using System.Web.Routing;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.AspNet
{
@ -13,7 +13,7 @@ namespace Examples.AspNet
protected void Application_Start()
{
this.openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
this.openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddDependencyInstrumentation()
.AddRequestInstrumentation()
.UseJaegerExporter(c =>

2
examples/AspNetCore/Startup.cs
View File

@ -7,7 +7,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.OpenApi.Models;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.AspNetCore
{

10
examples/Console/Program.cs
View File

@ -27,11 +27,11 @@ namespace Examples.Console
/// Main method - invoke this using command line.
/// For example:
///
/// dotnet run -p Exporters.csproj console
/// dotnet run -p Exporters.csproj zipkin -u http://localhost:9411/api/v2/spans
/// dotnet run -p Exporters.csproj jaeger -h localhost -p 6831
/// dotnet run -p Exporters.csproj prometheus -i 15 -p 9184 -d 2
/// dotnet run -p Exporters.csproj otlp -e "localhost:55680"
/// dotnet run -p Examples.Console.csproj console
/// dotnet run -p Examples.Console.csproj zipkin -u http://localhost:9411/api/v2/spans
/// dotnet run -p Examples.Console.csproj jaeger -h localhost -p 6831
/// dotnet run -p Examples.Console.csproj prometheus -i 15 -p 9184 -d 2
/// dotnet run -p Examples.Console.csproj otlp -e "localhost:55680"
///
/// The above must be run from the project root folder
/// (eg: C:\repos\opentelemetry-dotnet\src\examples\Console\).

6
examples/Console/TestConsoleExporter.cs
View File

@ -19,7 +19,7 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Export;
namespace Examples.Console
@ -28,9 +28,9 @@ namespace Examples.Console
{
internal static object Run(ConsoleOptions options)
{
// Enable OpenTelemetry for the source "MyCompany.MyProduct.MyWebServer"
// Enable TracerProvider for the source "MyCompany.MyProduct.MyWebServer"
// and use a single pipeline with a custom MyProcessor, and Console exporter.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var tracerProvider = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer")
.SetResource(Resources.CreateServiceResource("MyServiceName"))
.UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson,

4
examples/Console/TestHttpClient.cs
View File

@ -16,7 +16,7 @@
using System.Diagnostics;
using System.Net.Http;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.Console
{
@ -26,7 +26,7 @@ namespace Examples.Console
{
System.Console.WriteLine("Hello World!");
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation()
.SetResource(Resources.CreateServiceResource("http-service-example"))
.AddActivitySource("http-client-test")

4
examples/Console/TestJaegerExporter.cs
View File

@ -15,7 +15,7 @@
// </copyright>
using System;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.Console
{
@ -30,7 +30,7 @@ namespace Examples.Console
{
// Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient"
// and use the Jaeger exporter.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
builder => builder
.AddActivitySource("Samples.SampleServer")
.AddActivitySource("Samples.SampleClient")

3
examples/Console/TestOTelShimWithConsoleExporter.cs
View File

@ -16,7 +16,6 @@
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
namespace Examples.Console
{
@ -26,7 +25,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 openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer")
.SetResource(Resources.CreateServiceResource("MyServiceName"))
.UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson));

3
examples/Console/TestOpenTracingWithConsoleExporter.cs
View File

@ -18,7 +18,6 @@ using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Resources;
using OpenTelemetry.Shims.OpenTracing;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTracing;
namespace Examples.Console
@ -29,7 +28,7 @@ namespace Examples.Console
{
// Enable OpenTelemetry for the source "MyCompany.MyProduct.MyWebServer"
// and use Console exporter.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer")
.SetResource(Resources.CreateServiceResource("MyServiceName"))
.UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson));

4
examples/Console/TestOtlpExporter.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.Console
{
@ -29,7 +29,7 @@ namespace Examples.Console
{
// Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient"
// and use OTLP exporter.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
builder => builder
.AddActivitySource("Samples.SampleServer")
.AddActivitySource("Samples.SampleClient")

1
examples/Console/TestPrometheusExporter.cs
View File

@ -20,7 +20,6 @@ using System.Diagnostics;
using System.Threading.Tasks;
using OpenTelemetry.Exporter.Prometheus;
using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;

4
examples/Console/TestRedis.cs
View File

@ -18,8 +18,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using StackExchange.Redis;
namespace Examples.Console
@ -43,7 +41,7 @@ namespace Examples.Console
var connection = ConnectionMultiplexer.Connect("localhost");
// Configure exporter to export traces to Zipkin
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
builder => builder
.UseZipkinExporter(o =>
{

4
examples/Console/TestZPagesExporter.cs
View File

@ -17,7 +17,7 @@
using System.Diagnostics;
using System.Threading;
using OpenTelemetry.Exporter.ZPages;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.Console
{
@ -33,7 +33,7 @@ namespace Examples.Console
// Start the server
httpServer.Start();
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
builder => builder
.AddActivitySource("zpages-test")
.UseZPagesExporter(

4
examples/Console/TestZipkinExporter.cs
View File

@ -15,7 +15,7 @@
// </copyright>
using System;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Examples.Console
{
@ -25,7 +25,7 @@ namespace Examples.Console
{
// Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient"
// and use the Zipkin exporter.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
builder => builder
.AddActivitySource("Samples.SampleServer")
.AddActivitySource("Samples.SampleClient")

2
src/OpenTelemetry.Api/Trace/TracerProvider.cs
View File

@ -21,7 +21,7 @@ namespace OpenTelemetry.Trace
/// <summary>
/// TracerProvider is the entry point of the OTel API. It provides access to Tracers.
/// </summary>
public class TracerProvider
public abstract class TracerProvider
{
/// <summary>
/// Gets a tracer with given name and version.

8
src/OpenTelemetry.Exporter.Console/OpenTelemetryBuilderExtensions.cs
View File

@ -17,18 +17,18 @@
using System;
using OpenTelemetry.Exporter.Console;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
public static class OpenTelemetryBuilderExtensions
{
/// <summary>
/// Registers a ConsoleActivity exporter to a processing pipeline.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> builder to use.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
/// <param name="configure">Exporter configuration options.</param>
/// <param name="processorConfigure">Activity processor configuration.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder UseConsoleExporter(this OpenTelemetryBuilder builder, Action<ConsoleExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder UseConsoleExporter(this TracerProviderBuilder builder, Action<ConsoleExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
{
if (builder == null)
{

8
src/OpenTelemetry.Exporter.Jaeger/OpenTelemetryBuilderExtensions.cs
View File

@ -17,7 +17,7 @@
using System;
using OpenTelemetry.Exporter.Jaeger;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering a Jaeger exporter.
@ -27,11 +27,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Registers a Jaeger exporter that will receive <see cref="System.Diagnostics.Activity"/> instances.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> builder to use.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
/// <param name="configure">Exporter configuration options.</param>
/// <param name="processorConfigure">Activity processor configuration.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder UseJaegerExporter(this OpenTelemetryBuilder builder, Action<JaegerExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder UseJaegerExporter(this TracerProviderBuilder builder, Action<JaegerExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
{
if (builder == null)
{

8
src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetryBuilderExtensions.cs
View File

@ -16,9 +16,9 @@
using System;
using OpenTelemetry.Exporter.OpenTelemetryProtocol;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of the OpenTelemetry Protocol (OTLP) exporter.
@ -31,8 +31,8 @@ namespace OpenTelemetry.Trace.Configuration
/// <param name="builder">Open Telemetry builder to use.</param>
/// <param name="configure">Exporter configuration options.</param>
/// <param name="processorConfigure">Activity processor configuration.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder UseOtlpExporter(this OpenTelemetryBuilder builder, Action<OtlpExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder UseOtlpExporter(this TracerProviderBuilder builder, Action<OtlpExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
{
if (builder == null)
{

10
src/OpenTelemetry.Exporter.ZPages/OpenTelemetryBuilderExtensions.cs
View File

@ -18,7 +18,7 @@ using System;
using OpenTelemetry.Exporter.ZPages;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of Zipkin exporter.
@ -28,12 +28,12 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Registers a Zipkin exporter that will receive <see cref="System.Diagnostics.Activity"/> instances.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> builder to use.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
/// <param name="configure">Exporter configuration options.</param>
/// <param name="processorConfigure">Activity processor configuration.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder UseZPagesExporter(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder UseZPagesExporter(
this TracerProviderBuilder builder,
Action<ZPagesExporterOptions> configure = null,
Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
{

8
src/OpenTelemetry.Exporter.Zipkin/OpenTelemetryBuilderExtensions.cs
View File

@ -17,7 +17,7 @@
using System;
using OpenTelemetry.Exporter.Zipkin;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of Zipkin exporter.
@ -27,11 +27,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Registers a Zipkin exporter that will receive <see cref="System.Diagnostics.Activity"/> instances.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> builder to use.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> builder to use.</param>
/// <param name="configure">Exporter configuration options.</param>
/// <param name="processorConfigure">Activity processor configuration.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder UseZipkinExporter(this OpenTelemetryBuilder builder, Action<ZipkinExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder UseZipkinExporter(this TracerProviderBuilder builder, Action<ZipkinExporterOptions> configure = null, Action<ActivityProcessorPipelineBuilder> processorConfigure = null)
{
if (builder == null)
{

4
src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs
View File

@ -19,7 +19,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace OpenTelemetry.Extensions.Hosting.Implementation
{
@ -41,7 +41,7 @@ namespace OpenTelemetry.Extensions.Hosting.Implementation
// This method is invoked when host starts, and
// by requesting the OpenTelemetrySdk from DI
// it ensures all instrumentations gets started.
this.serviceProvider.GetRequiredService<OpenTelemetrySdk>();
this.serviceProvider.GetRequiredService<TracerProviderSdk>();
}
catch (Exception ex)
{

18
src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs
View File

@ -18,7 +18,7 @@ using System;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using OpenTelemetry.Extensions.Hosting.Implementation;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace Microsoft.Extensions.DependencyInjection
{
@ -42,11 +42,11 @@ namespace Microsoft.Extensions.DependencyInjection
/// Adds OpenTelemetry services to the specified <see cref="IServiceCollection" />.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
/// <param name="configure">The <see cref="OpenTelemetryBuilder"/> configuration delegate.</param>
/// <param name="configure">The <see cref="TracerProviderBuilder"/> configuration delegate.</param>
/// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Action<OpenTelemetryBuilder> configure)
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Action<TracerProviderBuilder> configure)
{
services.AddOpenTelemetry(() => OpenTelemetrySdk.EnableOpenTelemetry(configure));
services.AddOpenTelemetry(() => TracerProviderSdk.EnableTracerProvider(configure));
return services;
}
@ -54,11 +54,11 @@ namespace Microsoft.Extensions.DependencyInjection
/// Adds OpenTelemetry services to the specified <see cref="IServiceCollection" />.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
/// <param name="configure">The <see cref="OpenTelemetryBuilder"/> configuration delegate.</param>
/// <param name="configure">The <see cref="TracerProviderBuilder"/> configuration delegate.</param>
/// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Action<IServiceProvider, OpenTelemetryBuilder> configure)
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Action<IServiceProvider, TracerProviderBuilder> configure)
{
services.AddOpenTelemetry(s => OpenTelemetrySdk.EnableOpenTelemetry(builder => configure(s, builder)));
services.AddOpenTelemetry(s => TracerProviderSdk.EnableTracerProvider(builder => configure(s, builder)));
return services;
}
@ -68,7 +68,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
/// <param name="createSdk">A delegate that provides the factory to be registered.</param>
/// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Func<OpenTelemetrySdk> createSdk)
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Func<TracerProviderSdk> createSdk)
{
if (services is null)
{
@ -99,7 +99,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
/// <param name="createSdk">A delegate that provides the factory to be registered.</param>
/// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Func<IServiceProvider, OpenTelemetrySdk> createSdk)
public static IServiceCollection AddOpenTelemetry(this IServiceCollection services, Func<IServiceProvider, TracerProviderSdk> createSdk)
{
if (services is null)
{

10
src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetryBuilderExtensions.cs
View File

@ -17,7 +17,7 @@
using System;
using OpenTelemetry.Instrumentation.AspNet;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of Asp.Net request instrumentation.
@ -27,11 +27,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the incoming requests automatic data collection for Asp.Net.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureAspNetInstrumentationOptions">ASP.NET Request configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddRequestInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddRequestInstrumentation(
this TracerProviderBuilder builder,
Action<AspNetInstrumentationOptions> configureAspNetInstrumentationOptions = null)
{
if (builder == null)

10
src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetryBuilderExtensions.cs
View File

@ -17,7 +17,7 @@
using System;
using OpenTelemetry.Instrumentation.AspNetCore;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of asp.net core request instrumentation.
@ -27,11 +27,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the incoming requests automatic data collection for Asp.Net Core.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureAspNetCoreInstrumentationOptions">ASP.NET Core Request configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddRequestInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddRequestInstrumentation(
this TracerProviderBuilder builder,
Action<AspNetCoreInstrumentationOptions> configureAspNetCoreInstrumentationOptions = null)
{
if (builder == null)

42
src/OpenTelemetry.Instrumentation.Dependencies/OpenTelemetryBuilderExtensions.cs
View File

@ -18,7 +18,7 @@ using System;
using OpenTelemetry.Instrumentation.Dependencies;
using OpenTelemetry.Instrumentation.Dependencies.Implementation;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of dependency instrumentation.
@ -28,12 +28,12 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for all supported activity sources.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureHttpClientInstrumentationOptions">HttpClient configuration options.</param>
/// <param name="configureSqlClientInstrumentationOptions">SqlClient configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddDependencyInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddDependencyInstrumentation(
this TracerProviderBuilder builder,
Action<HttpClientInstrumentationOptions> configureHttpClientInstrumentationOptions = null,
Action<SqlClientInstrumentationOptions> configureSqlClientInstrumentationOptions = null)
{
@ -54,11 +54,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for HttpClient.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureHttpClientInstrumentationOptions">HttpClient configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddHttpClientDependencyInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddHttpClientDependencyInstrumentation(
this TracerProviderBuilder builder,
Action<HttpClientInstrumentationOptions> configureHttpClientInstrumentationOptions = null)
{
if (builder == null)
@ -76,11 +76,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for SqlClient.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureSqlClientInstrumentationOptions">SqlClient configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddSqlClientDependencyInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddSqlClientDependencyInstrumentation(
this TracerProviderBuilder builder,
Action<SqlClientInstrumentationOptions> configureSqlClientInstrumentationOptions = null)
{
if (builder == null)
@ -100,10 +100,10 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for GrpcClient.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddGrpcClientDependencyInstrumentation(
this OpenTelemetryBuilder builder)
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddGrpcClientDependencyInstrumentation(
this TracerProviderBuilder builder)
{
if (builder == null)
{
@ -118,11 +118,11 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for .NET Framework HttpWebRequest activity source.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="configureOptions">HttpWebRequest configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddHttpWebRequestDependencyInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddHttpWebRequestDependencyInstrumentation(
this TracerProviderBuilder builder,
Action<HttpWebRequestInstrumentationOptions> configureOptions = null)
{
if (builder == null)

10
src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetryBuilderExtensions.cs
View File

@ -18,7 +18,7 @@ using System;
using OpenTelemetry.Instrumentation.StackExchangeRedis;
using StackExchange.Redis;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Extension methods to simplify registering of dependency instrumentation.
@ -28,12 +28,12 @@ namespace OpenTelemetry.Trace.Configuration
/// <summary>
/// Enables the outgoing requests automatic data collection for Redis.
/// </summary>
/// <param name="builder"><see cref="OpenTelemetryBuilder"/> being configured.</param>
/// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
/// <param name="connection"><see cref="ConnectionMultiplexer"/> to instrument.</param>
/// <param name="configureOptions">Redis configuration options.</param>
/// <returns>The instance of <see cref="OpenTelemetryBuilder"/> to chain the calls.</returns>
public static OpenTelemetryBuilder AddRedisInstrumentation(
this OpenTelemetryBuilder builder,
/// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
public static TracerProviderBuilder AddRedisInstrumentation(
this TracerProviderBuilder builder,
ConnectionMultiplexer connection,
Action<StackExchangeRedisCallsInstrumentationOptions> configureOptions = null)
{

2
src/OpenTelemetry.Instrumentation.StackExchangeRedis/README.md
View File

@ -19,7 +19,7 @@ dotnet add package OpenTelemetry.Instrumentation.StackExchangeRedis
using var connection = ConnectionMultiplexer.Connect("localhost:6379");
// Pass the connection to AddRedisInstrumentation.
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(b => b
.AddRedisInstrumentation(connection)
.UseZipkinExporter()
.SetResource(Resources.CreateServiceResource("my-service"));

2
src/OpenTelemetry/Metrics/Export/PushMetricController.cs
View File

@ -20,7 +20,7 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Internal;
using static OpenTelemetry.Metrics.Configuration.MeterFactory;
using static OpenTelemetry.Metrics.MeterFactory;
namespace OpenTelemetry.Metrics.Export
{

2
src/OpenTelemetry/Metrics/Configuration/MeterBuilder.cs → src/OpenTelemetry/Metrics/MeterBuilder.cs
View File

@ -17,7 +17,7 @@
using System;
using OpenTelemetry.Metrics.Export;
namespace OpenTelemetry.Metrics.Configuration
namespace OpenTelemetry.Metrics
{
public class MeterBuilder
{

4
src/OpenTelemetry/Metrics/Configuration/MeterFactory.cs → src/OpenTelemetry/Metrics/MeterFactory.cs
View File

@ -1,4 +1,4 @@
// <copyright file="MeterFactory.cs" company="OpenTelemetry Authors">
// <copyright file="MeterFactory.cs" company="OpenTelemetry Authors">
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -19,7 +19,7 @@ using System.Collections.Generic;
using System.Threading;
using OpenTelemetry.Metrics.Export;
namespace OpenTelemetry.Metrics.Configuration
namespace OpenTelemetry.Metrics
{
public class MeterFactory : MeterFactoryBase
{

4
src/OpenTelemetry/README.md
View File

@ -59,7 +59,7 @@ console application, and have the traces displayed in the console.
the source named "companyname.product.library".
```csharp
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(builder => builder
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(builder => builder
.AddActivitySource("companyname.product.library")
.UseConsoleExporter())
```
@ -95,7 +95,7 @@ The following sample shows how to change it to
with sampling probability of 25%.
```csharp
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(builder => builder
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(builder => builder
.AddActivitySource("companyname.product.library")
.SetSampler(new ProbabilitySampler(.25))
.UseConsoleExporter());

3
src/OpenTelemetry/Trace/Configuration/ActivityProcessorPipelineBuilder.cs → src/OpenTelemetry/Trace/ActivityProcessorPipelineBuilder.cs
View File

@ -17,8 +17,9 @@
using System;
using System.Collections.Generic;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Export.Internal;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Configures exporting pipeline with chains of processors and exporter.

2
src/OpenTelemetry/Trace/Export/Internal/NoopActivityProcessor.cs
View File

@ -18,7 +18,7 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
namespace OpenTelemetry.Trace.Export
namespace OpenTelemetry.Trace.Export.Internal
{
internal sealed class NoopActivityProcessor : ActivityProcessor
{

34
src/OpenTelemetry/Trace/Configuration/OpenTelemetryBuilder.cs → src/OpenTelemetry/Trace/TracerProviderBuilder.cs
View File

@ -1,4 +1,4 @@
// <copyright file="OpenTelemetryBuilder.cs" company="OpenTelemetry Authors">
// <copyright file="TracerProviderBuilder.cs" company="OpenTelemetry Authors">
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -17,16 +17,14 @@ using System;
using System.Collections.Generic;
using OpenTelemetry.Resources;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
/// <summary>
/// Build OpenTelemetry pipeline.
/// Currently supports a single processing pipeline, and any number of activity source names
/// to subscribe to.
/// Build TracerProvider pipeline with Sampler, Processors and Exporters.
/// </summary>
public class OpenTelemetryBuilder
public class TracerProviderBuilder
{
internal OpenTelemetryBuilder()
internal TracerProviderBuilder()
{
}
@ -44,8 +42,8 @@ namespace OpenTelemetry.Trace.Configuration
/// Sets processing and exporting pipeline.
/// </summary>
/// <param name="configure">Function that configures pipeline.</param>
/// <returns>Returns <see cref="OpenTelemetryBuilder"/> for chaining.</returns>
public OpenTelemetryBuilder AddProcessorPipeline(Action<ActivityProcessorPipelineBuilder> configure)
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder AddProcessorPipeline(Action<ActivityProcessorPipelineBuilder> configure)
{
if (configure == null)
{
@ -67,8 +65,8 @@ namespace OpenTelemetry.Trace.Configuration
/// Configures sampler.
/// </summary>
/// <param name="sampler">Sampler instance.</param>
/// <returns>Returns <see cref="OpenTelemetryBuilder"/> for chaining.</returns>
public OpenTelemetryBuilder SetSampler(Sampler sampler)
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder SetSampler(Sampler sampler)
{
this.Sampler = sampler ?? throw new ArgumentNullException(nameof(sampler));
return this;
@ -78,8 +76,8 @@ namespace OpenTelemetry.Trace.Configuration
/// Sets the <see cref="Resource"/> describing the app associated with all traces. Overwrites currently set resource.
/// </summary>
/// <param name="resource">Resource to be associate with all traces.</param>
/// <returns>Returns <see cref="OpenTelemetryBuilder"/> for chaining.</returns>
public OpenTelemetryBuilder SetResource(Resource resource)
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder SetResource(Resource resource)
{
this.Resource = resource ?? Resource.Empty;
return this;
@ -89,9 +87,11 @@ namespace OpenTelemetry.Trace.Configuration
/// Adds given activitysource name to the list of subscribed sources.
/// </summary>
/// <param name="activitySourceName">Activity source name.</param>
/// <returns>Returns <see cref="OpenTelemetryBuilder"/> for chaining.</returns>
public OpenTelemetryBuilder AddActivitySource(string activitySourceName)
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder AddActivitySource(string activitySourceName)
{
// TODO: We need to fix the listening model.
// Today it ignores version.
if (this.ActivitySourceNames == null)
{
this.ActivitySourceNames = new HashSet<string>();
@ -106,8 +106,8 @@ namespace OpenTelemetry.Trace.Configuration
/// </summary>
/// <typeparam name="TInstrumentation">Type of instrumentation class.</typeparam>
/// <param name="instrumentationFactory">Function that builds instrumentation.</param>
/// <returns>Returns <see cref="OpenTelemetryBuilder"/> for chaining.</returns>
public OpenTelemetryBuilder AddInstrumentation<TInstrumentation>(
/// <returns>Returns <see cref="TracerProviderBuilder"/> for chaining.</returns>
public TracerProviderBuilder AddInstrumentation<TInstrumentation>(
Func<ActivitySourceAdapter, TInstrumentation> instrumentationFactory)
where TInstrumentation : class
{

61
src/OpenTelemetry/Trace/Configuration/OpenTelemetrySdk.cs → src/OpenTelemetry/Trace/TracerProviderSdk.cs
View File

@ -1,4 +1,4 @@
// <copyright file="OpenTelemetrySdk.cs" company="OpenTelemetry Authors">
// <copyright file="TracerProviderSdk.cs" company="OpenTelemetry Authors">
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -23,89 +23,86 @@ using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Export.Internal;
using OpenTelemetry.Trace.Samplers;
namespace OpenTelemetry.Trace.Configuration
namespace OpenTelemetry.Trace
{
public class OpenTelemetrySdk : IDisposable
public class TracerProviderSdk : TracerProvider, IDisposable
{
private readonly List<object> instrumentations = new List<object>();
private Resource resource;
private ActivityProcessor activityProcessor;
private ActivityListener listener;
static OpenTelemetrySdk()
static TracerProviderSdk()
{
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
Activity.ForceDefaultIdFormat = true;
}
private OpenTelemetrySdk()
private TracerProviderSdk()
{
}
/// <summary>
/// Enables OpenTelemetry.
/// </summary>
/// <param name="configureOpenTelemetryBuilder">Function that configures OpenTelemetryBuilder.</param>
/// <returns><see cref="OpenTelemetrySdk"/> instance which can be disposed on application shutdown.</returns>
/// <remarks>
/// Basic implementation only. Most logic from TracerBuilder will be ported here.
/// </remarks>
public static OpenTelemetrySdk EnableOpenTelemetry(Action<OpenTelemetryBuilder> configureOpenTelemetryBuilder)
/// <param name="configureTracerProviderBuilder">Function that configures TracerProviderBuilder.</param>
/// <returns><see cref="TracerProviderSdk"/> instance which can be disposed on application shutdown.</returns>
public static TracerProviderSdk EnableTracerProvider(Action<TracerProviderBuilder> configureTracerProviderBuilder)
{
var openTelemetryBuilder = new OpenTelemetryBuilder();
configureOpenTelemetryBuilder?.Invoke(openTelemetryBuilder);
var tracerProviderBuilder = new TracerProviderBuilder();
configureTracerProviderBuilder?.Invoke(tracerProviderBuilder);
var openTelemetrySDK = new OpenTelemetrySdk();
Sampler sampler = openTelemetryBuilder.Sampler ?? new AlwaysOnSampler();
var tracerProviderSdk = new TracerProviderSdk();
Sampler sampler = tracerProviderBuilder.Sampler ?? new AlwaysOnSampler();
ActivityProcessor activityProcessor;
if (openTelemetryBuilder.ProcessingPipelines == null || !openTelemetryBuilder.ProcessingPipelines.Any())
if (tracerProviderBuilder.ProcessingPipelines == null || !tracerProviderBuilder.ProcessingPipelines.Any())
{
// if there are no pipelines are configured, use noop processor
activityProcessor = new NoopActivityProcessor();
}
else if (openTelemetryBuilder.ProcessingPipelines.Count == 1)
else if (tracerProviderBuilder.ProcessingPipelines.Count == 1)
{
// if there is only one pipeline - use it's outer processor as a
// single processor on the tracerSdk.
var processorFactory = openTelemetryBuilder.ProcessingPipelines[0];
var processorFactory = tracerProviderBuilder.ProcessingPipelines[0];
activityProcessor = processorFactory.Build();
}
else
{
// if there are more pipelines, use processor that will broadcast to all pipelines
var processors = new ActivityProcessor[openTelemetryBuilder.ProcessingPipelines.Count];
var processors = new ActivityProcessor[tracerProviderBuilder.ProcessingPipelines.Count];
for (int i = 0; i < openTelemetryBuilder.ProcessingPipelines.Count; i++)
for (int i = 0; i < tracerProviderBuilder.ProcessingPipelines.Count; i++)
{
processors[i] = openTelemetryBuilder.ProcessingPipelines[i].Build();
processors[i] = tracerProviderBuilder.ProcessingPipelines[i].Build();
}
activityProcessor = new BroadcastActivityProcessor(processors);
}
openTelemetrySDK.resource = openTelemetryBuilder.Resource;
tracerProviderSdk.resource = tracerProviderBuilder.Resource;
var activitySource = new ActivitySourceAdapter(sampler, activityProcessor, openTelemetrySDK.resource);
var activitySource = new ActivitySourceAdapter(sampler, activityProcessor, tracerProviderSdk.resource);
if (openTelemetryBuilder.InstrumentationFactories != null)
if (tracerProviderBuilder.InstrumentationFactories != null)
{
foreach (var instrumentation in openTelemetryBuilder.InstrumentationFactories)
foreach (var instrumentation in tracerProviderBuilder.InstrumentationFactories)
{
openTelemetrySDK.instrumentations.Add(instrumentation.Factory(activitySource));
tracerProviderSdk.instrumentations.Add(instrumentation.Factory(activitySource));
}
}
// This is what subscribes to Activities.
// Think of this as the replacement for DiagnosticListener.AllListeners.Subscribe(onNext => diagnosticListener.Subscribe(..));
openTelemetrySDK.listener = new ActivityListener
tracerProviderSdk.listener = new ActivityListener
{
// Callback when Activity is started.
ActivityStarted = (activity) =>
{
if (activity.IsAllDataRequested)
{
activity.SetResource(openTelemetrySDK.resource);
activity.SetResource(tracerProviderSdk.resource);
}
activityProcessor.OnStart(activity);
@ -116,7 +113,7 @@ namespace OpenTelemetry.Trace.Configuration
// Function which takes ActivitySource and returns true/false to indicate if it should be subscribed to
// or not
ShouldListenTo = (activitySource) => openTelemetryBuilder.ActivitySourceNames?.Contains(activitySource.Name.ToUpperInvariant()) ?? false,
ShouldListenTo = (activitySource) => tracerProviderBuilder.ActivitySourceNames?.Contains(activitySource.Name.ToUpperInvariant()) ?? false,
// The following parameter is not used now.
GetRequestedDataUsingParentId = (ref ActivityCreationOptions<string> options) => ActivityDataRequest.AllData,
@ -125,9 +122,9 @@ namespace OpenTelemetry.Trace.Configuration
GetRequestedDataUsingContext = (ref ActivityCreationOptions<ActivityContext> options) => ComputeActivityDataRequest(options, sampler),
};
ActivitySource.AddActivityListener(openTelemetrySDK.listener);
openTelemetrySDK.activityProcessor = activityProcessor;
return openTelemetrySDK;
ActivitySource.AddActivityListener(tracerProviderSdk.listener);
tracerProviderSdk.activityProcessor = activityProcessor;
return tracerProviderSdk;
}
public void Dispose()

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

@ -18,7 +18,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using OpenTelemetry.Exporter.Jaeger.Implementation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Exporter.Jaeger.Tests
@ -46,7 +46,7 @@ namespace OpenTelemetry.Exporter.Jaeger.Tests
endCalled = true;
};
var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.UseJaegerExporter(
null, p => p.AddProcessor((next) => testActivityProcessor)));

5
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/ActivityExtensionsTest.cs
View File

@ -25,7 +25,6 @@ using Opentelemetry.Proto.Common.V1;
using OpenTelemetry.Internal;
#endif
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using Xunit;
using OtlpCommon = Opentelemetry.Proto.Common.V1;
using OtlpTrace = Opentelemetry.Proto.Trace.V1;
@ -67,7 +66,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
});
// This following is done just to set Resource to Activity.
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(sources[0].Name)
.AddActivitySource(sources[1].Name)
.SetResource(resource));
@ -249,7 +248,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
endCalled = true;
};
var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.UseOtlpExporter(
null, p => p.AddProcessor((next) => testActivityProcessor)));

2
test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs
View File

@ -24,7 +24,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
#endif
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;

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

@ -22,7 +22,7 @@ using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -81,7 +81,7 @@ namespace OpenTelemetry.Exporter.ZPages.Tests
endCalled = true;
};
var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.UseZPagesExporter(
processorConfigure: p => p.AddProcessor((next) => testActivityProcessor)));

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

@ -27,7 +27,7 @@ using System.Threading.Tasks;
using OpenTelemetry.Exporter.Zipkin.Implementation;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Exporter.Zipkin.Tests
@ -150,7 +150,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Tests
endCalled = true;
};
var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.UseZipkinExporter(
o =>

8
test/OpenTelemetry.Extensions.Hosting.Tests/HostingExtensionsTests.cs
View File

@ -18,7 +18,7 @@ using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Extensions.Hosting
@ -74,8 +74,8 @@ namespace OpenTelemetry.Extensions.Hosting
var host = builder.Build();
var tracerFactoryBase1 = host.Services.GetRequiredService<OpenTelemetrySdk>();
var tracerFactoryBase2 = host.Services.GetRequiredService<OpenTelemetrySdk>();
var tracerFactoryBase1 = host.Services.GetRequiredService<TracerProviderSdk>();
var tracerFactoryBase2 = host.Services.GetRequiredService<TracerProviderSdk>();
Assert.Same(tracerFactoryBase1, tracerFactoryBase2);
}
@ -94,7 +94,7 @@ namespace OpenTelemetry.Extensions.Hosting
var serviceProvider = services.BuildServiceProvider();
var tracerFactory = serviceProvider.GetRequiredService<OpenTelemetrySdk>();
var tracerFactory = serviceProvider.GetRequiredService<TracerProviderSdk>();
Assert.NotNull(tracerFactory);
Assert.False(testInstrumentation.Disposed);

4
test/OpenTelemetry.Instrumentation.AspNet.Tests/BasicTests.cs
View File

@ -15,7 +15,7 @@
// </copyright>
using System;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Instrumentation.AspNet.Tests
@ -25,7 +25,7 @@ namespace OpenTelemetry.Instrumentation.AspNet.Tests
[Fact]
public void AddRequestInstrumentation_BadArgs()
{
OpenTelemetryBuilder builder = null;
TracerProviderBuilder builder = null;
Assert.Throws<ArgumentNullException>(() => builder.AddRequestInstrumentation());
}
}

3
test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs
View File

@ -25,7 +25,6 @@ using System.Web.Routing;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -139,7 +138,7 @@ namespace OpenTelemetry.Instrumentation.AspNet.Tests
var activity = new Activity(ActivityNameAspNet).AddBaggage("Stuff", "123");
activity.SetParentId(expectedTraceId, expectedSpanId, ActivityTraceFlags.Recorded);
var activityProcessor = new Mock<ActivityProcessor>();
using (openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using (openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddRequestInstrumentation(
(options) =>
{

14
test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
View File

@ -27,9 +27,7 @@ using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
#if NETCOREAPP2_1
using TestApp.AspNetCore._2._1;
@ -45,7 +43,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
: IClassFixture<WebApplicationFactory<Startup>>, IDisposable
{
private readonly WebApplicationFactory<Startup> factory;
private OpenTelemetrySdk openTelemetrySdk = null;
private TracerProviderSdk openTelemetrySdk = null;
public BasicTests(WebApplicationFactory<Startup> factory)
{
@ -55,7 +53,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
[Fact]
public void AddRequestInstrumentation_BadArgs()
{
OpenTelemetryBuilder builder = null;
TracerProviderBuilder builder = null;
Assert.Throws<ArgumentNullException>(() => builder.AddRequestInstrumentation());
}
@ -66,7 +64,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
var spanProcessor = new Mock<ActivityProcessor>();
void ConfigureTestServices(IServiceCollection services)
{
this.openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(
this.openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddRequestInstrumentation()
.SetResource(expectedResource)
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object)));
@ -108,7 +106,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
.WithWebHostBuilder(builder =>
builder.ConfigureTestServices(services =>
{
this.openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry((builder) => builder.AddRequestInstrumentation()
this.openTelemetrySdk = TracerProviderSdk.EnableTracerProvider((builder) => builder.AddRequestInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object)));
})))
{
@ -155,7 +153,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
.WithWebHostBuilder(builder =>
builder.ConfigureTestServices(services =>
{
this.openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(
this.openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddRequestInstrumentation((opt) => opt.TextFormat = textFormat.Object)
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object)));
})))
@ -187,7 +185,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests
void ConfigureTestServices(IServiceCollection services)
{
this.openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(
this.openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(
(builder) =>
builder.AddRequestInstrumentation((opt) => opt.RequestFilter = (ctx) => ctx.Request.Path != "/api/values/2")
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object)));

1
test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
View File

@ -28,7 +28,6 @@ using Microsoft.Extensions.DependencyInjection;
using Moq;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
#if NETCOREAPP2_1
using TestApp.AspNetCore._2._1;

18
test/OpenTelemetry.Instrumentation.Dependencies.Tests/HttpClientTests.Basic.netcore31.cs
View File

@ -24,7 +24,7 @@ using System.Threading.Tasks;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -52,7 +52,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
[Fact]
public void AddDependencyInstrumentation_BadArgs()
{
OpenTelemetryBuilder builder = null;
TracerProviderBuilder builder = null;
Assert.Throws<ArgumentNullException>(() => builder.AddDependencyInstrumentation());
}
@ -91,7 +91,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
}
});
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation(o => o.TextFormat = mockTextFormat.Object)
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{
@ -144,7 +144,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
parent.TraceStateString = "k1=v1,k2=v2";
parent.ActivityTraceFlags = ActivityTraceFlags.Recorded;
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation((opt) => opt.TextFormat = textFormat.Object)
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{
@ -174,7 +174,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
{
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{
@ -192,7 +192,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
{
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{
@ -218,7 +218,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
request.Headers.Add("traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01");
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{
@ -234,7 +234,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
{
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) =>
builder.AddHttpClientDependencyInstrumentation(
(opt) => opt.FilterFunc = (req) => !req.RequestUri.OriginalString.Contains(this.url))
@ -252,7 +252,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
{
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{

3
test/OpenTelemetry.Instrumentation.Dependencies.Tests/HttpClientTests.netcore31.cs
View File

@ -27,7 +27,6 @@ using Moq;
using Newtonsoft.Json;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -56,7 +55,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using (serverLifeTime)
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddHttpClientDependencyInstrumentation((opt) => opt.SetHttpFlavor = tc.SetHttpFlavor)
.SetResource(expectedResource)
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))

11
test/OpenTelemetry.Instrumentation.Dependencies.Tests/HttpWebRequestTests.Basic.netfx.cs
View File

@ -16,16 +16,13 @@
#if NETFRAMEWORK
using System;
using System.Diagnostics;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Instrumentation.Dependencies.Implementation;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -63,7 +60,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
public async Task HttpDependenciesInstrumentationInjectsHeadersAsync()
{
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddHttpWebRequestDependencyInstrumentation();
@ -110,7 +107,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
});
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddHttpWebRequestDependencyInstrumentation(options => options.TextFormat = textFormat.Object);
@ -150,7 +147,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
public async Task HttpDependenciesInstrumentationBacksOffIfAlreadyInstrumented()
{
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddHttpWebRequestDependencyInstrumentation();
@ -174,7 +171,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
public async Task HttpDependenciesInstrumentationFiltersOutRequests()
{
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddHttpWebRequestDependencyInstrumentation(

3
test/OpenTelemetry.Instrumentation.Dependencies.Tests/HttpWebRequestTests.netfx.cs
View File

@ -24,7 +24,6 @@ using Moq;
using Newtonsoft.Json;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -49,7 +48,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
var expectedResource = Resources.Resources.CreateServiceResource("test-service");
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.SetResource(expectedResource);
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));

7
test/OpenTelemetry.Instrumentation.Dependencies.Tests/SqlClientTests.cs
View File

@ -28,7 +28,6 @@ using Moq;
using OpenTelemetry.Instrumentation.Dependencies.Implementation;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -78,7 +77,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
bool isFailure = false)
{
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddSqlClientDependencyInstrumentation(options =>
@ -133,7 +132,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using var sqlCommand = sqlConnection.CreateCommand();
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddSqlClientDependencyInstrumentation(
(opt) =>
{
@ -183,7 +182,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using var sqlCommand = sqlConnection.CreateCommand();
var spanProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddSqlClientDependencyInstrumentation()
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))
{

9
test/OpenTelemetry.Instrumentation.Dependencies.Tests/SqlEventSourceTests.netfx.cs
View File

@ -25,7 +25,6 @@ using Moq;
using OpenTelemetry.Instrumentation.Dependencies.Implementation;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -53,7 +52,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
public async Task SuccessfulCommandTest(CommandType commandType, string commandText, bool captureText, bool isFailure = false)
{
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddSqlClientDependencyInstrumentation(options =>
@ -106,7 +105,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using FakeBehavingSqlEventSource fakeSqlEventSource = new FakeBehavingSqlEventSource();
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddSqlClientDependencyInstrumentation(options =>
@ -146,7 +145,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using FakeMisbehavingSqlEventSource fakeSqlEventSource = new FakeMisbehavingSqlEventSource();
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddSqlClientDependencyInstrumentation();
@ -163,7 +162,7 @@ namespace OpenTelemetry.Instrumentation.Dependencies.Tests
using FakeMisbehavingSqlEventSource fakeSqlEventSource = new FakeMisbehavingSqlEventSource();
var activityProcessor = new Mock<ActivityProcessor>();
using var shutdownSignal = OpenTelemetrySdk.EnableOpenTelemetry(b =>
using var shutdownSignal = TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddSqlClientDependencyInstrumentation();

5
test/OpenTelemetry.Instrumentation.GrpcClient.Tests/GrpcClientTests.cs
View File

@ -21,7 +21,6 @@ using Grpc.Net.Client;
using Moq;
using OpenTelemetry.Instrumentation.GrpcClient.Tests.Services;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -57,7 +56,7 @@ namespace OpenTelemetry.Instrumentation.GrpcClient.Tests
var parent = new Activity("parent")
.Start();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder
.AddGrpcClientDependencyInstrumentation()
.SetResource(expectedResource)
@ -108,7 +107,7 @@ namespace OpenTelemetry.Instrumentation.GrpcClient.Tests
var parent = new Activity("parent")
.Start();
using (OpenTelemetrySdk.EnableOpenTelemetry(
using (TracerProviderSdk.EnableTracerProvider(
(builder) => builder
.AddDependencyInstrumentation() // AddDependencyInstrumentation applies both gRPC client and HttpClient instrumentation
.AddProcessorPipeline(p => p.AddProcessor(n => spanProcessor.Object))))

3
test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
View File

@ -21,7 +21,6 @@ using System.Net;
using System.Net.Sockets;
using Moq;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using StackExchange.Redis;
using StackExchange.Redis.Profiling;
using Xunit;
@ -44,7 +43,7 @@ namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Implementation
this.connection = ConnectionMultiplexer.Connect(connectionOptions);
this.sdk = OpenTelemetrySdk.EnableOpenTelemetry(
this.sdk = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddRedisInstrumentation(this.connection));
}

3
test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs
View File

@ -21,7 +21,6 @@ using System.Threading.Tasks;
using Moq;
using OpenTelemetry.Internal.Test;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using StackExchange.Redis;
using StackExchange.Redis.Profiling;
@ -57,7 +56,7 @@ namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Tests
using var connection = ConnectionMultiplexer.Connect(connectionOptions);
var activityProcessor = new Mock<ActivityProcessor>();
using (OpenTelemetrySdk.EnableOpenTelemetry(b =>
using (TracerProviderSdk.EnableTracerProvider(b =>
{
b.AddProcessorPipeline(c => c.AddProcessor(ap => activityProcessor.Object));
b.AddRedisInstrumentation(connection);

1
test/OpenTelemetry.Tests/Implementation/Configuration/MeterFactoryTests.cs
View File

@ -17,7 +17,6 @@
using System.Diagnostics;
using System.Linq;
using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Metrics.Test;
using OpenTelemetry.Trace;

2
test/OpenTelemetry.Tests/Implementation/Metrics/CounterCleanUpTests.cs
View File

@ -17,7 +17,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;

2
test/OpenTelemetry.Tests/Implementation/Metrics/MeterFactoryBaseTests.cs
View File

@ -15,7 +15,7 @@
// </copyright>
using System;
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics;
using Xunit;
namespace OpenTelemetry.Metrics.Config.Test

2
test/OpenTelemetry.Tests/Implementation/Metrics/MetricsTest.cs
View File

@ -16,7 +16,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenTelemetry.Metrics.Configuration;
using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;

2
test/OpenTelemetry.Tests/Implementation/Metrics/PushControllerTest.cs
View File

@ -20,7 +20,7 @@ using System.Diagnostics;
using System.Threading;
using OpenTelemetry.Metrics.Export;
using Xunit;
using static OpenTelemetry.Metrics.Configuration.MeterFactory;
using static OpenTelemetry.Metrics.MeterFactory;
namespace OpenTelemetry.Metrics.Test
{

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

@ -16,7 +16,7 @@
using System;
using System.Diagnostics;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Trace.Test
@ -29,7 +29,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void SetStatus()
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName));
using var source = new ActivitySource(ActivitySourceName);
@ -43,7 +43,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void SetStatusWithDescription()
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName));
using var source = new ActivitySource(ActivitySourceName);
@ -59,7 +59,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void SetCancelledStatus()
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName));
using var source = new ActivitySource(ActivitySourceName);
@ -73,7 +73,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void GetStatusWithNoStatusInActivity()
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName));
using var source = new ActivitySource(ActivitySourceName);
@ -86,7 +86,7 @@ namespace OpenTelemetry.Trace.Test
[Fact(Skip = "Activity does not support UpdateTag now. Enable once .NET Activity support SetTag method.")]
public void LastSetStatusWins()
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName));
using var source = new ActivitySource(ActivitySourceName);

3
test/OpenTelemetry.Tests/Implementation/Trace/ActivityListenerSdkTest.cs
View File

@ -16,7 +16,6 @@
using System.Diagnostics;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using Xunit;
namespace OpenTelemetry.Tests.Implementation.Trace
@ -40,7 +39,7 @@ namespace OpenTelemetry.Tests.Implementation.Trace
{
ShouldListenTo = _ => true,
GetRequestedDataUsingContext = (ref ActivityCreationOptions<ActivityContext> options) =>
OpenTelemetrySdk.ComputeActivityDataRequest(options, testSampler),
TracerProviderSdk.ComputeActivityDataRequest(options, testSampler),
};
ActivitySource.AddActivityListener(listener);

3
test/OpenTelemetry.Tests/Implementation/Trace/Config/ActivityProcessorPipelineTests.cs
View File

@ -20,8 +20,9 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Testing.Export;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Export.Internal;
using Xunit;
namespace OpenTelemetry.Tests.Impl.Trace.Config

2
test/OpenTelemetry.Tests/Implementation/Trace/CurrentSpanTests.cs
View File

@ -17,7 +17,7 @@
using System;
using System.Diagnostics;
using OpenTelemetry.Internal;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Trace.Test

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

@ -22,7 +22,6 @@ using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Testing.Export;
using OpenTelemetry.Tests;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Samplers;
using Xunit;
@ -90,7 +89,7 @@ namespace OpenTelemetry.Trace.Export.Test
using var inMemoryEventListener = new InMemoryEventListener();
var activityExporter = new TestActivityExporter(null, sleepMilliseconds: 5000);
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, TimeSpan.FromMilliseconds(1000), TimeSpan.FromMilliseconds(0), 1);
using (var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using (var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor))))
@ -106,7 +105,7 @@ namespace OpenTelemetry.Trace.Export.Test
{
var activityExporter = new TestActivityExporter(null);
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 128);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -134,7 +133,7 @@ namespace OpenTelemetry.Trace.Export.Test
});
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, TimeSpan.FromMilliseconds(30), DefaultTimeout, 10);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -166,7 +165,7 @@ namespace OpenTelemetry.Trace.Export.Test
Thread.Sleep(50);
});
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 1, TimeSpan.FromMilliseconds(100), DefaultTimeout, 1);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -196,7 +195,7 @@ namespace OpenTelemetry.Trace.Export.Test
});
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 3);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -230,7 +229,7 @@ namespace OpenTelemetry.Trace.Export.Test
int exportCalledCount = 0;
var activityExporter = new TestActivityExporter(_ => Interlocked.Increment(ref exportCalledCount));
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 1);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.SetSampler(new ParentOrElseSampler(new AlwaysOffSampler()))
.AddActivitySource(ActivitySourceName)
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -258,7 +257,7 @@ namespace OpenTelemetry.Trace.Export.Test
var activityExporter = new TestActivityExporter(_ => resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, 128);
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor)));
@ -287,7 +286,7 @@ namespace OpenTelemetry.Trace.Export.Test
var activityExporter = new TestActivityExporter(_ => Interlocked.Increment(ref exportCalledCount));
using var activityProcessor =
new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize);
using (var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using (var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor))))
@ -333,7 +332,7 @@ namespace OpenTelemetry.Trace.Export.Test
using var activityProcessor =
new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize);
using (var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using (var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor))))
@ -375,7 +374,7 @@ namespace OpenTelemetry.Trace.Export.Test
int exportCalledCount = 0;
var activityExporter = new TestActivityExporter(_ => Interlocked.Increment(ref exportCalledCount));
using var activityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize);
using (var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using (var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => activityProcessor))))
@ -420,7 +419,7 @@ namespace OpenTelemetry.Trace.Export.Test
using var inMemoryEventListener = new InMemoryEventListener();
using (var batchingActivityProcessor = new BatchingActivityProcessor(activityExporter, 128, DefaultDelay, DefaultTimeout, batchSize))
{
using var openTelemetrySdk = OpenTelemetrySdk.EnableOpenTelemetry(b => b
using var openTelemetrySdk = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.SetSampler(new AlwaysOnSampler())
.AddProcessorPipeline(pp => pp.AddProcessor(ap => batchingActivityProcessor)));

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

@ -19,7 +19,7 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Testing.Export;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Samplers;
using Xunit;
@ -32,13 +32,13 @@ namespace OpenTelemetry.Trace.Export.Test
private const string ActivitySourceName = "defaultactivitysource";
private TestActivityExporter activityExporter;
private OpenTelemetrySdk openTelemetry;
private TracerProviderSdk openTelemetry;
private ActivitySource activitySource;
public SimpleActivityProcessorTest()
{
this.activityExporter = new TestActivityExporter(null);
this.openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(b => b
this.openTelemetry = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource(ActivitySourceName)
.AddProcessorPipeline(p => p
.SetExporter(this.activityExporter)
@ -57,7 +57,7 @@ namespace OpenTelemetry.Trace.Export.Test
public void ThrowsInExporter()
{
this.activityExporter = new TestActivityExporter(_ => throw new ArgumentException("123"));
this.openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(b => b
this.openTelemetry = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource("cijo")
.AddProcessorPipeline(p => p
.SetExporter(this.activityExporter)
@ -74,7 +74,7 @@ namespace OpenTelemetry.Trace.Export.Test
public void ProcessorDoesNotBlockOnExporter()
{
this.activityExporter = new TestActivityExporter(async _ => await Task.Delay(500));
this.openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(b => b
this.openTelemetry = TracerProviderSdk.EnableTracerProvider(b => b
.AddActivitySource("cijo")
.AddProcessorPipeline(p => p
.SetExporter(this.activityExporter)

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

@ -17,7 +17,6 @@
using System.Diagnostics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Configuration;
using Xunit;
namespace OpenTelemetry.Tests.Implementation.Trace
@ -30,7 +29,7 @@ namespace OpenTelemetry.Tests.Implementation.Trace
using var activitySource = new ActivitySource(nameof(this.ResourceGetsAssociatedWithActivity));
var expectedResource = OpenTelemetry.Resources.Resources.CreateServiceResource("ServiceNameAbc");
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource(nameof(this.ResourceGetsAssociatedWithActivity))
.SetResource(expectedResource));
@ -46,7 +45,7 @@ namespace OpenTelemetry.Tests.Implementation.Trace
using var activitySource = new ActivitySource(nameof(this.ResourceGetsAssociatedWithActivity));
var expectedResource = Resource.Empty;
using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(
using var openTelemetry = TracerProviderSdk.EnableTracerProvider(
(builder) => builder.AddActivitySource(nameof(this.ResourceGetsAssociatedWithActivity)));
using (var root = activitySource.StartActivity("root"))

2
test/TestApp.AspNetCore.3.1/Startup.cs
View File

@ -21,7 +21,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace;
namespace TestApp.AspNetCore._3._1
{