rebase from master

samples/Exporters/TestApplicationInsights.cs

@@ -25,6 +25,7 @@ namespace Samples
  using OpenTelemetry.Stats.Aggregations;
  using OpenTelemetry.Stats.Measures;
  using OpenTelemetry.Tags;
+ using OpenTelemetry.Trace;
  using OpenTelemetry.Trace.Configuration;
 
  internal class TestApplicationInsights

samples/Exporters/TestHttpClient.cs

@@ -20,6 +20,7 @@ namespace Samples
  using System.Net.Http;
  using OpenTelemetry.Collector.Dependencies;
  using OpenTelemetry.Exporter.Zipkin;
+ using OpenTelemetry.Trace;
  using OpenTelemetry.Trace.Configuration;
 
  internal class TestHttpClient

samples/Exporters/TestStackdriver.cs

@@ -24,8 +24,8 @@ namespace Samples
  using OpenTelemetry.Stats.Aggregations;
  using OpenTelemetry.Stats.Measures;
  using OpenTelemetry.Tags;
+ using OpenTelemetry.Trace;
  using OpenTelemetry.Trace.Configuration;
- using OpenTelemetry.Trace.Sampler;
 
  internal class TestStackdriver
  {

src/OpenTelemetry/Trace/Configuration/TracerFactory.cs

@@ -40,11 +40,6 @@ public class TracerFactory : TracerFactoryBase, IDisposable
 
  private TracerFactory(TracerBuilder builder)
  {
- if (builder == null)
- {
- throw new ArgumentNullException(nameof(builder));
- }
-
  this.sampler = builder.Sampler ?? Samplers.AlwaysSample;
 
  // TODO separate sampler from options
@@ -71,6 +66,11 @@ private TracerFactory(TracerBuilder builder)
 
  public static TracerFactory Create(Action<TracerBuilder> configure)
  {
+ if (configure == null)
+ {
+ throw new ArgumentNullException(nameof(configure));
+ }
+
  var builder = new TracerBuilder();
  configure(builder);
  var factory = new TracerFactory(builder);

test/OpenTelemetry.Exporter.ApplicationInsights.Tests/Implementation/ApplicationInsightsTraceExporterTests.cs

@@ -1645,7 +1645,6 @@ internal Span CreateTestSpan(string name,
  SpanKind kind,
  Status status)
  {
- var tracer = Tracing.TracerFactory.GetTracer("");
  var span = parentSpanId == default ? 
  tracer.StartRootSpan(name, kind, startTimestamp) :
  tracer.StartSpan(name, new SpanContext(traceId, parentSpanId, traceOptions, tracestate), kind, startTimestamp);

test/OpenTelemetry.Exporter.ApplicationInsights.Tests/TracerBuilderConfigurationTests.cs

@@ -17,6 +17,8 @@
 using System;
 using System.Collections.Concurrent;
 using Microsoft.ApplicationInsights.Channel;
+
+using OpenTelemetry.Trace;
 using OpenTelemetry.Trace.Configuration;
 using OpenTelemetry.Trace.Export;
 using Xunit;
@@ -41,7 +43,7 @@ public void UseApplicationInsights_ConfiguresExporter()
  .UseApplicationInsights(o => o.TelemetryChannel = channel))
  .GetTracer(null);
 
- tracer.SpanBuilder("foo").StartSpan().End();
+ tracer.StartSpan("foo").End();
 
  Assert.Single(sentItems);
  }

test/OpenTelemetry.Exporter.Jaeger.Tests/Implementation/JaegerSpanConverterTest.cs

@@ -359,7 +359,7 @@ internal Span CreateTestSpan(bool setAttributes = true,
  linkedSpanId,
  ActivityTraceFlags.Recorded));
 
- var span = (Span)Tracing.TracerFactory.GetTracer("")
+ var span = (Span)tracer
  .StartSpan("Name", new SpanContext(traceId, parentSpanId, ActivityTraceFlags.Recorded), SpanKind.Client, startTimestamp);
 
  if (addLinks)

test/OpenTelemetry.Exporter.Jaeger.Tests/Implementation/JaegerThriftIntegrationTest.cs

@@ -106,7 +106,7 @@ private Span CreateTestSpan()
  linkedSpanId,
  ActivityTraceFlags.Recorded));
 
- var span = (Span)Tracing.TracerFactory.GetTracer("")
+ var span = (Span)tracer
  .StartSpan("Name", new SpanContext(traceId, parentSpanId, ActivityTraceFlags.Recorded), SpanKind.Client, startTimestamp);
 
  var spanContextSetter = typeof(Span).GetMethod("set_Context", BindingFlags.Instance | BindingFlags.NonPublic);

test/OpenTelemetry.Exporter.LightStep.Tests/LightStepSpanConverterTest.cs

@@ -15,7 +15,6 @@
 // </copyright>
 
 using System.Collections.Generic;
-using System.Linq;
 using OpenTelemetry.Exporter.LightStep.Implementation;
 using OpenTelemetry.Trace.Configuration;
 
@@ -74,7 +73,7 @@ public void AllPropertiesShouldTranslate()
  var link = new Link(new SpanContext(
  traceId, linkedSpanId, ActivityTraceFlags.Recorded));
 
- var span = (Span)Tracing.TracerFactory.GetTracer("")
+ var span = (Span)tracer
  .StartSpan("Test", new SpanContext(traceId, parentId, ActivityTraceFlags.Recorded), SpanKind.Client, startTs, new [] {link});
 
  var spanIdInt = span.Context.SpanId.ToLSSpanId();

test/OpenTelemetry.Tests/Impl/Trace/Config/TracerFactoryBaseTests.cs

@@ -23,6 +23,11 @@ namespace OpenTelemetry.Tests.Impl.Trace.Config
 {
  public class TracerFactoryBaseTests : IDisposable
  {
+ public TracerFactoryBaseTests()
+ {
+ TracerFactoryBase.Default.Reset();
+ }
+
  [Fact]
  public void TraceFactory_Default()
  {
@@ -31,7 +36,7 @@ public void TraceFactory_Default()
  Assert.NotNull(defaultTracer);
  Assert.Same(defaultTracer, TracerFactoryBase.Default.GetTracer("named tracer"));
 
- var span = defaultTracer.SpanBuilder("foo").StartSpan();
+ var span = defaultTracer.StartSpan("foo");
  Assert.IsType<BlankSpan>(span);
  }
 
@@ -47,7 +52,7 @@ public void TraceFactory_SetDefault()
 
  Assert.NotSame(defaultTracer, TracerFactoryBase.Default.GetTracer("named tracer"));
 
- var span = defaultTracer.SpanBuilder("foo").StartSpan();
+ var span = defaultTracer.StartSpan("foo");
  Assert.IsType<Span>(span);
  }
 
@@ -68,11 +73,11 @@ public void TraceFactory_SetDefaultTwice_Throws()
  public void TraceFactory_UpdateDefault_CachedTracer()
  {
  var defaultTracer = TracerFactoryBase.Default.GetTracer("");
- var noopSpan = defaultTracer.SpanBuilder("foo").StartSpan();
+ var noopSpan = defaultTracer.StartSpan("foo");
  Assert.IsType<BlankSpan>(noopSpan);
 
  TracerFactoryBase.Default = TracerFactory.Create(b => { });
- var span = defaultTracer.SpanBuilder("foo").StartSpan();
+ var span = defaultTracer.StartSpan("foo");
  Assert.IsType<Span>(span);
 
  var newDefaultTracer = TracerFactoryBase.Default.GetTracer("");

test/OpenTelemetry.Tests/Impl/Trace/CurrentSpanUtilsTest.cs

@@ -15,8 +15,6 @@
 // </copyright>
 
 using OpenTelemetry.Trace.Internal;
-using OpenTelemetry.Resources;
-using OpenTelemetry.Utils;
 
 namespace OpenTelemetry.Trace.Test
 {
@@ -37,7 +35,10 @@ public CurrentSpanUtilsTest()
  Activity.DefaultIdFormat = ActivityIdFormat.W3C;
  Activity.ForceDefaultIdFormat = true;
 
- tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
+ tracer = TracerFactory.Create(b => b
+ .SetProcessor(_ => spanProcessor)
+ .SetTracerOptions(new TracerConfiguration()))
+ .GetTracer(null);
  }
 
  [Fact]

test/OpenTelemetry.Tests/Impl/Trace/Export/BatchingSpanProcessorTests.cs

@@ -15,6 +15,7 @@
 // </copyright>
 
 using OpenTelemetry.Resources;
+using OpenTelemetry.Trace.Sampler;
 
 namespace OpenTelemetry.Trace.Export.Test
 {
@@ -41,7 +42,10 @@ public class BatchingSpanProcessorTest : IDisposable
 
  private Span CreateSampledEndedSpan(string spanName, SpanProcessor spanProcessor)
  {
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
+ var tracer = TracerFactory.Create(b => b
+ .SetSampler(Samplers.AlwaysSample)
+ .SetProcessor(_ => spanProcessor)
+ .SetTracerOptions(new TracerConfiguration())).GetTracer(null);
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
  var span = (Span)tracer.StartSpan(spanName, context);
  span.End();
@@ -50,7 +54,10 @@ private Span CreateSampledEndedSpan(string spanName, SpanProcessor spanProcessor
 
  private Span CreateNotSampledEndedSpan(string spanName, SpanProcessor spanProcessor)
  {
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
+ var tracer = TracerFactory.Create(b => b
+ .SetSampler(Samplers.NeverSample)
+ .SetProcessor(_ => spanProcessor)
+ .SetTracerOptions(new TracerConfiguration())).GetTracer(null);
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.None);
  var span = (Span)tracer.StartSpan(spanName, context);
  span.End();
@@ -225,7 +232,10 @@ public void ProcessorDoesNotBlockOnExporter()
  var spanExporter = new TestExporter( _ => Thread.Sleep(500));
  using (var spanProcessor = new BatchingSpanProcessor(spanExporter, 128, DefaultDelay, 128))
  {
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
+ var tracer = TracerFactory.Create(b => b
+ .SetProcessor(e => spanProcessor))
+ .GetTracer(null);
+
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
  var span = (Span)tracer.StartSpan("foo", context);
 

test/OpenTelemetry.Tests/Impl/Trace/Export/SimpleSpanProcessorTests.cs

@@ -33,17 +33,19 @@ public class SimpleSpanProcessorTest : IDisposable
  private const string SpanName2 = "MySpanName/2";
 
  private TestExporter spanExporter;
- private SpanProcessor spanProcessor;
+ private ITracer tracer;
 
  public SimpleSpanProcessorTest()
  {
  spanExporter = new TestExporter(null);
- spanProcessor = new SimpleSpanProcessor(spanExporter);
+ tracer = TracerFactory.Create(b => b
+ .SetExporter(spanExporter)
+ .SetProcessor(e => new SimpleSpanProcessor(e)))
+ .GetTracer(null);
  }
 
  private Span CreateSampledEndedSpan(string spanName)
  {
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
  var span = (Span)tracer.StartSpan(spanName, context);
  span.End();
@@ -52,7 +54,6 @@ private Span CreateSampledEndedSpan(string spanName)
 
  private Span CreateNotSampledEndedSpan(string spanName)
  {
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.None);
  var span = (Span)tracer.StartSpan(spanName, context);
  span.End();
@@ -70,9 +71,11 @@ public void ThrowsOnNullExporter()
  public void ThrowsInExporter()
  {
  spanExporter = new TestExporter(_ => throw new ArgumentException("123"));
- spanProcessor = new SimpleSpanProcessor(spanExporter);
+ tracer = TracerFactory.Create(b => b
+ .SetExporter(spanExporter)
+ .SetProcessor(e => new SimpleSpanProcessor(e)))
+ .GetTracer(null);
 
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
  var span = (Span)tracer.StartSpan("foo", context);
 
@@ -84,8 +87,11 @@ public void ThrowsInExporter()
  public void ProcessorDoesNotBlockOnExporter()
  {
  spanExporter = new TestExporter( async _ => await Task.Delay(500));
- spanProcessor = new SimpleSpanProcessor(spanExporter);
- var tracer = new Tracer(spanProcessor, new TracerConfiguration(), Resource.Empty);
+ tracer = TracerFactory.Create(b => b
+ .SetExporter(spanExporter)
+ .SetProcessor(e => new SimpleSpanProcessor(e)))
+ .GetTracer(null);
+
  var context = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
  var span = (Span)tracer.StartSpan("foo", context);
 
@@ -105,7 +111,7 @@ public void ProcessorDoesNotBlockOnExporter()
  [Fact]
  public async Task ShutdownTwice()
  {
- spanProcessor = new SimpleSpanProcessor(new NoopSpanExporter());
+ var spanProcessor = new SimpleSpanProcessor(new NoopSpanExporter());
 
  await spanProcessor.ShutdownAsync(CancellationToken.None).ConfigureAwait(false);