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

Rename TraceConfig to TracerConfiguration and remove Default (#258) 

* TraceConfig to TracerConfiguration and remove Default

* Add TracerConfiguration file and fix namespace
This commit is contained in:
Liudmila Molkova 2019-10-07 12:48:51 -07:00 committed by GitHub
parent e9edb28ab6
commit 6bf0e18d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 189 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/OpenTelemetry.Exporter.Stackdriver/Implementation/SpanExtensions.cs
View File

@ -20,7 +20,6 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation
using Google.Cloud.Trace.V2;
using Google.Protobuf.WellKnownTypes;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
internal static class SpanExtensions
{
@ -90,8 +89,6 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation
{
ret.Attributes = new Google.Cloud.Trace.V2.Span.Types.Attributes
{
DroppedAttributesCount = TraceConfig.Default.MaxNumberOfAttributes - link.Attributes.Count,
AttributeMap =
{
link.Attributes.ToDictionary(

21
src/OpenTelemetry/Trace/Config/TraceConfig.cs → src/OpenTelemetry/Trace/Configuration/TracerConfiguration.cs
View File

@ -1,4 +1,4 @@
// <copyright file="TraceConfig.cs" company="OpenTelemetry Authors">
// <copyright file="TracerConfiguration.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace.Config
namespace OpenTelemetry.Trace.Configuration
{
using System;
using OpenTelemetry.Trace.Sampler;
@ -22,24 +22,23 @@ namespace OpenTelemetry.Trace.Config
/// <summary>
/// Trace configuration that can be updates in runtime.
/// </summary>
public sealed class TraceConfig
public sealed class TracerConfiguration
{
/// <summary>
/// Default trace parameters.
/// </summary>
public static readonly TraceConfig Default =
new TraceConfig(Samplers.AlwaysSample, DefaultSpanMaxNumAttributes, DefaultSpanMaxNumEvents, DefaultSpanMaxNumLinks);
private const int DefaultSpanMaxNumAttributes = 32;
private const int DefaultSpanMaxNumEvents = 128;
private const int DefaultSpanMaxNumLinks = 32;
public TraceConfig(ISampler sampler)
public TracerConfiguration()
: this(Samplers.AlwaysSample, DefaultSpanMaxNumAttributes, DefaultSpanMaxNumEvents, DefaultSpanMaxNumLinks)
{
}
public TracerConfiguration(ISampler sampler)
: this(sampler, DefaultSpanMaxNumAttributes, DefaultSpanMaxNumEvents, DefaultSpanMaxNumLinks)
{
}
public TraceConfig(ISampler sampler, int maxNumberOfAttributes, int maxNumberOfEvents, int maxNumberOfLinks)
public TracerConfiguration(ISampler sampler, int maxNumberOfAttributes, int maxNumberOfEvents, int maxNumberOfLinks)
{
if (maxNumberOfAttributes <= 0)
{

18
src/OpenTelemetry/Trace/Span.cs
View File

@ -21,7 +21,7 @@ namespace OpenTelemetry.Trace
using System.Diagnostics;
using System.Linq;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Internal;
using OpenTelemetry.Utils;
@ -31,7 +31,7 @@ namespace OpenTelemetry.Trace
/// </summary>
public sealed class Span : ISpan
{
private readonly TraceConfig traceConfig;
private readonly TracerConfiguration tracerConfiguration;
private readonly SpanProcessor spanProcessor;
private readonly Lazy<SpanContext> spanContext;
private readonly DateTimeOffset startTimestamp;
@ -46,7 +46,7 @@ namespace OpenTelemetry.Trace
Activity activity,
IEnumerable<KeyValuePair<string, string>> tracestate,
SpanKind spanKind,
TraceConfig traceConfig,
TracerConfiguration tracerConfiguration,
SpanProcessor spanProcessor,
DateTimeOffset startTimestamp,
bool ownsActivity,
@ -59,7 +59,7 @@ namespace OpenTelemetry.Trace
this.Activity.ActivityTraceFlags,
tracestate));
this.Name = this.Activity.OperationName;
this.traceConfig = traceConfig;
this.tracerConfiguration = tracerConfiguration;
this.spanProcessor = spanProcessor;
this.Kind = spanKind;
this.OwnsActivity = ownsActivity;
@ -185,7 +185,7 @@ namespace OpenTelemetry.Trace
if (this.attributes == null)
{
this.attributes = new EvictingQueue<KeyValuePair<string, object>>(this.traceConfig.MaxNumberOfAttributes);
this.attributes = new EvictingQueue<KeyValuePair<string, object>>(this.tracerConfiguration.MaxNumberOfAttributes);
}
this.attributes.AddEvent(new KeyValuePair<string, object>(keyValuePair.Key, keyValuePair.Value));
@ -216,7 +216,7 @@ namespace OpenTelemetry.Trace
if (this.events == null)
{
this.events =
new EvictingQueue<Event>(this.traceConfig.MaxNumberOfEvents);
new EvictingQueue<Event>(this.tracerConfiguration.MaxNumberOfEvents);
}
this.events.AddEvent(new Event(name, PreciseTimestamp.GetUtcNow()));
@ -252,7 +252,7 @@ namespace OpenTelemetry.Trace
if (this.events == null)
{
this.events =
new EvictingQueue<Event>(this.traceConfig.MaxNumberOfEvents);
new EvictingQueue<Event>(this.tracerConfiguration.MaxNumberOfEvents);
}
this.events.AddEvent(new Event(name, PreciseTimestamp.GetUtcNow(), eventAttributes));
@ -283,7 +283,7 @@ namespace OpenTelemetry.Trace
if (this.events == null)
{
this.events =
new EvictingQueue<Event>(this.traceConfig.MaxNumberOfEvents);
new EvictingQueue<Event>(this.tracerConfiguration.MaxNumberOfEvents);
}
this.events.AddEvent(addEvent);
@ -313,7 +313,7 @@ namespace OpenTelemetry.Trace
if (this.links == null)
{
this.links = new EvictingQueue<Link>(this.traceConfig.MaxNumberOfLinks);
this.links = new EvictingQueue<Link>(this.tracerConfiguration.MaxNumberOfLinks);
}
this.links.AddEvent(link);

16
src/OpenTelemetry/Trace/SpanBuilder.cs
View File

@ -22,7 +22,7 @@ namespace OpenTelemetry.Trace
using System.Linq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Internal;
@ -30,7 +30,7 @@ namespace OpenTelemetry.Trace
public class SpanBuilder : ISpanBuilder
{
private readonly SpanProcessor spanProcessor;
private readonly TraceConfig traceConfig;
private readonly TracerConfiguration tracerConfiguration;
private readonly string name;
private SpanKind kind;
@ -45,11 +45,11 @@ namespace OpenTelemetry.Trace
private DateTimeOffset startTimestamp;
private Resource libraryResource;
internal SpanBuilder(string name, SpanProcessor spanProcessor, TraceConfig traceConfig, Resource libraryResource)
internal SpanBuilder(string name, SpanProcessor spanProcessor, TracerConfiguration tracerConfiguration, Resource libraryResource)
{
this.name = name ?? throw new ArgumentNullException(nameof(name));
this.spanProcessor = spanProcessor ?? throw new ArgumentNullException(nameof(spanProcessor));
this.traceConfig = traceConfig ?? throw new ArgumentNullException(nameof(traceConfig));
this.tracerConfiguration = tracerConfiguration ?? throw new ArgumentNullException(nameof(tracerConfiguration));
this.libraryResource = libraryResource ?? throw new ArgumentNullException(nameof(libraryResource));
}
@ -217,7 +217,7 @@ namespace OpenTelemetry.Trace
this.links,
activityForSpan.TraceId,
activityForSpan.SpanId,
this.traceConfig);
this.tracerConfiguration);
if (sampledIn || this.recordEvents)
{
@ -251,7 +251,7 @@ namespace OpenTelemetry.Trace
activityForSpan,
childTracestate,
this.kind,
this.traceConfig,
this.tracerConfiguration,
this.spanProcessor,
this.startTimestamp,
ownsActivity: this.contextSource != ContextSource.Activity,
@ -300,7 +300,7 @@ namespace OpenTelemetry.Trace
List<Link> parentLinks,
ActivityTraceId traceId,
ActivitySpanId spanId,
TraceConfig traceConfig)
TracerConfiguration tracerConfiguration)
{
// If users set a specific sampler in the SpanBuilder, use it.
if (sampler != null)
@ -312,7 +312,7 @@ namespace OpenTelemetry.Trace
// parent).
if (parent == null || !parent.IsValid)
{
return traceConfig
return tracerConfiguration
.Sampler
.ShouldSample(parent, traceId, spanId, name, parentLinks).IsSampled;
}

19
src/OpenTelemetry/Trace/Tracer.cs
View File

@ -18,10 +18,9 @@ namespace OpenTelemetry.Trace
{
using System;
using System.Diagnostics;
using OpenTelemetry.Context;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Internal;
@ -40,10 +39,10 @@ namespace OpenTelemetry.Trace
/// Creates an instance of <see cref="ITracer"/>.
/// </summary>
/// <param name="spanProcessor">Span processor.</param>
/// <param name="traceConfig">Trace configuration.</param>
/// <param name="tracerConfiguration">Trace configuration.</param>
/// <param name="libraryResource">Resource describing the instrumentation library.</param>
public Tracer(SpanProcessor spanProcessor, TraceConfig traceConfig, Resource libraryResource)
: this(spanProcessor, traceConfig, new BinaryFormat(), new TraceContextFormat(), libraryResource)
public Tracer(SpanProcessor spanProcessor, TracerConfiguration tracerConfiguration, Resource libraryResource)
: this(spanProcessor, tracerConfiguration, new BinaryFormat(), new TraceContextFormat(), libraryResource)
{
}
@ -51,14 +50,14 @@ namespace OpenTelemetry.Trace
/// Creates an instance of <see cref="Tracer"/>.
/// </summary>
/// <param name="spanProcessor">Span processor.</param>
/// <param name="traceConfig">Trace configuration.</param>
/// <param name="tracerConfiguration">Trace configuration.</param>
/// <param name="binaryFormat">Binary format context propagator.</param>
/// <param name="textFormat">Text format context propagator.</param>
/// <param name="libraryResource">Resource describing the instrumentation library.</param>
internal Tracer(SpanProcessor spanProcessor, TraceConfig traceConfig, IBinaryFormat binaryFormat, ITextFormat textFormat, Resource libraryResource)
internal Tracer(SpanProcessor spanProcessor, TracerConfiguration tracerConfiguration, IBinaryFormat binaryFormat, ITextFormat textFormat, Resource libraryResource)
{
this.spanProcessor = spanProcessor ?? throw new ArgumentNullException(nameof(spanProcessor));
this.ActiveTraceConfig = traceConfig ?? throw new ArgumentNullException(nameof(traceConfig));
this.ActiveTracerConfiguration = tracerConfiguration ?? throw new ArgumentNullException(nameof(tracerConfiguration));
this.BinaryFormat = binaryFormat ?? throw new ArgumentNullException(nameof(binaryFormat));
this.TextFormat = textFormat ?? throw new ArgumentNullException(nameof(textFormat));
this.LibraryResource = libraryResource ?? throw new ArgumentNullException(nameof(libraryResource));
@ -75,12 +74,12 @@ namespace OpenTelemetry.Trace
/// <inheritdoc/>
public ITextFormat TextFormat { get; }
public TraceConfig ActiveTraceConfig { get; set; }
public TracerConfiguration ActiveTracerConfiguration { get; set; }
/// <inheritdoc/>
public ISpanBuilder SpanBuilder(string spanName)
{
return new SpanBuilder(spanName, this.spanProcessor, this.ActiveTraceConfig, this.LibraryResource);
return new SpanBuilder(spanName, this.spanProcessor, this.ActiveTracerConfiguration, this.LibraryResource);
}
public IDisposable WithSpan(ISpan span)

12
src/OpenTelemetry/Trace/TracerFactory.cs
View File

@ -19,7 +19,7 @@ namespace OpenTelemetry.Trace
using System.Collections.Generic;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
/// <inheritdoc/>
@ -27,19 +27,19 @@ namespace OpenTelemetry.Trace
{
private readonly object lck = new object();
private readonly SpanProcessor spanProcessor;
private readonly TraceConfig traceConfig;
private readonly TracerConfiguration tracerConfiguration;
private readonly ITextFormat textFormat;
private readonly IBinaryFormat binaryFormat;
private readonly Tracer defaultTracer;
private readonly Dictionary<TracerRegistryKey, ITracer> tracerRegistry = new Dictionary<TracerRegistryKey, ITracer>();
public TracerFactory(SpanProcessor spanProcessor = null, TraceConfig traceConfig = null, ITextFormat textFormat = null, IBinaryFormat binaryFormat = null)
public TracerFactory(SpanProcessor spanProcessor = null, TracerConfiguration tracerConfiguration = null, ITextFormat textFormat = null, IBinaryFormat binaryFormat = null)
{
this.spanProcessor = spanProcessor ?? Tracing.SpanProcessor;
this.traceConfig = traceConfig ?? Tracing.TraceConfig;
this.tracerConfiguration = tracerConfiguration ?? Tracing.TracerConfiguration;
this.textFormat = textFormat ?? new TraceContextFormat();
this.binaryFormat = binaryFormat ?? new BinaryFormat();
this.defaultTracer = new Tracer(this.spanProcessor, this.traceConfig, this.binaryFormat, this.textFormat, Resource.Empty);
this.defaultTracer = new Tracer(this.spanProcessor, this.tracerConfiguration, this.binaryFormat, this.textFormat, Resource.Empty);
}
/// <inheritdoc/>
@ -56,7 +56,7 @@ namespace OpenTelemetry.Trace
if (!this.tracerRegistry.TryGetValue(key, out var tracer))
{
var labels = CreateLibraryResourceLabels(name, version);
tracer = new Tracer(this.spanProcessor, this.traceConfig, this.binaryFormat, this.textFormat, new Resource(labels));
tracer = new Tracer(this.spanProcessor, this.tracerConfiguration, this.binaryFormat, this.textFormat, new Resource(labels));
this.tracerRegistry.Add(key, tracer);
}

8
src/OpenTelemetry/Trace/Tracing.cs
View File

@ -16,7 +16,7 @@
namespace OpenTelemetry.Trace
{
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
/// <summary>
@ -28,9 +28,9 @@ namespace OpenTelemetry.Trace
static Tracing()
{
TraceConfig = TraceConfig.Default;
TracerConfiguration = new TracerConfiguration();
SpanProcessor = new BatchingSpanProcessor(new NoopSpanExporter());
tracerFactory = new TracerFactory(SpanProcessor, TraceConfig);
tracerFactory = new TracerFactory(SpanProcessor, TracerConfiguration);
}
/// <summary>
@ -46,6 +46,6 @@ namespace OpenTelemetry.Trace
/// <summary>
/// Gets the trace config.
/// </summary>
public static TraceConfig TraceConfig { get; }
public static TracerConfiguration TracerConfiguration { get; }
}
}

12
test/OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs
View File

@ -24,7 +24,7 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Moq;
using Microsoft.AspNetCore.TestHost;
@ -48,8 +48,8 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests
[Fact]
public async Task SuccessfulTemplateControllerCallGeneratesASpan()
{
var panProcessor = new Mock<SpanProcessor>(new NoopSpanExporter());
var tracerFactory = new TracerFactory(panProcessor.Object);
var spanProcessor = new Mock<SpanProcessor>(new NoopSpanExporter());
var tracerFactory = new TracerFactory(spanProcessor.Object);
void ConfigureTestServices(IServiceCollection services) =>
services.AddSingleton<ITracerFactory>(tracerFactory);
@ -69,7 +69,7 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests
for (var i = 0; i < 10; i++)
{
if (panProcessor.Invocations.Count == 2)
if (spanProcessor.Invocations.Count == 2)
{
break;
}
@ -82,8 +82,8 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests
}
Assert.Equal(2, panProcessor.Invocations.Count); // begin and end was called
var span = ((Span)panProcessor.Invocations[1].Arguments[0]);
Assert.Equal(2, spanProcessor.Invocations.Count); // begin and end was called
var span = ((Span)spanProcessor.Invocations[1].Arguments[0]);
Assert.Equal(SpanKind.Server, span.Kind);
Assert.Equal("/api/values", span.Attributes.GetValue("http.path"));

2
test/OpenTelemetry.Collector.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
View File

@ -24,7 +24,7 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Moq;
using Microsoft.AspNetCore.TestHost;

5
test/OpenTelemetry.Collector.Dependencies.Tests/BasicTests.cs
View File

@ -14,18 +14,15 @@
// limitations under the License.
// </copyright>
using System.Linq;
using OpenTelemetry.Resources;
namespace OpenTelemetry.Collector.Dependencies.Tests
{
using Moq;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
using System;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Xunit;

2
test/OpenTelemetry.Collector.Dependencies.Tests/HttpClientTests.cs
View File

@ -21,7 +21,7 @@ namespace OpenTelemetry.Collector.Dependencies.Tests
using Moq;
using Newtonsoft.Json;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
using System;

4
test/OpenTelemetry.Collector.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToSpanConverterTests.cs
View File

@ -23,7 +23,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
using Moq;
using OpenTelemetry.Collector.StackExchangeRedis.Tests;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using StackExchange.Redis.Profiling;
using Xunit;
@ -34,7 +34,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
public RedisProfilerEntryToSpanConverterTests()
{
tracer = new Tracer(new SimpleSpanProcessor(new NoopSpanExporter()), TraceConfig.Default, Resource.Empty);
tracer = new Tracer(new SimpleSpanProcessor(new NoopSpanExporter()), new TracerConfiguration(), Resource.Empty);
}
[Fact]

4
test/OpenTelemetry.Collector.StackExchangeRedis.Tests/StackExchangeRedisCallsCollectorTests.cs
View File

@ -20,7 +20,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis
{
using Moq;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using StackExchange.Redis.Profiling;
using System.Threading.Tasks;
@ -32,7 +32,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis
public async void ProfilerSessionUsesTheSameDefault()
{
var spanProcessor = new Mock<SpanProcessor>(new NoopSpanExporter());
var tracer = new Tracer(spanProcessor.Object, TraceConfig.Default, Resource.Empty);
var tracer = new Tracer(spanProcessor.Object, new TracerConfiguration(), Resource.Empty);
using (var collector = new StackExchangeRedisCallsCollector(tracer))
{

5
test/OpenTelemetry.Exporter.ApplicationInsights.Tests/Implementation/ApplicationInsightsTraceExporterTests.cs
View File

@ -14,10 +14,6 @@
// limitations under the License.
// </copyright>
using System.Threading;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Export;
namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{
using Microsoft.ApplicationInsights.Channel;
@ -31,6 +27,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using Xunit;
public class ApplicationInsightsTraceExporterTests

21
test/OpenTelemetry.Tests/Impl/Trace/Config/TraceParamsTest.cs
View File

@ -17,7 +17,7 @@
namespace OpenTelemetry.Trace.Config.Test
{
using System;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Sampler;
using Xunit;
@ -26,41 +26,42 @@ namespace OpenTelemetry.Trace.Config.Test
[Fact]
public void DefaultTraceConfig()
{
Assert.Equal(Samplers.AlwaysSample, TraceConfig.Default.Sampler);
Assert.Equal(32, TraceConfig.Default.MaxNumberOfAttributes);
Assert.Equal(128, TraceConfig.Default.MaxNumberOfEvents);
Assert.Equal(32, TraceConfig.Default.MaxNumberOfLinks);
var config = new TracerConfiguration();
Assert.Equal(Samplers.AlwaysSample, config.Sampler);
Assert.Equal(32, config.MaxNumberOfAttributes);
Assert.Equal(128, config.MaxNumberOfEvents);
Assert.Equal(32, config.MaxNumberOfLinks);
}
[Fact]
public void UpdateTraceParams_NullSampler()
{
Assert.Throws<ArgumentNullException>(() => new TraceConfig(null));
Assert.Throws<ArgumentNullException>(() => new TracerConfiguration(null));
}
[Fact]
public void UpdateTraceParams_NonPositiveMaxNumberOfAttributes()
{
Assert.Throws<ArgumentOutOfRangeException>(() => new TraceConfig(Samplers.AlwaysSample, 0 ,1, 1));
Assert.Throws<ArgumentOutOfRangeException>(() => new TracerConfiguration(Samplers.AlwaysSample, 0 ,1, 1));
}
[Fact]
public void UpdateTraceParams_NonPositiveMaxNumberOfEvents()
{
Assert.Throws<ArgumentOutOfRangeException>(() => new TraceConfig(Samplers.AlwaysSample, 1, 0, 1));
Assert.Throws<ArgumentOutOfRangeException>(() => new TracerConfiguration(Samplers.AlwaysSample, 1, 0, 1));
}
[Fact]
public void updateTraceParams_NonPositiveMaxNumberOfLinks()
{
Assert.Throws<ArgumentOutOfRangeException>(() => new TraceConfig(Samplers.AlwaysSample, 1, 1, 0));
Assert.Throws<ArgumentOutOfRangeException>(() => new TracerConfiguration(Samplers.AlwaysSample, 1, 1, 0));
}
[Fact]
public void UpdateTraceParams_All()
{
var traceParams = new TraceConfig(Samplers.NeverSample, 8, 9, 11);
var traceParams = new TracerConfiguration(Samplers.NeverSample, 8, 9, 11);
Assert.Equal(Samplers.NeverSample, traceParams.Sampler);
Assert.Equal(8, traceParams.MaxNumberOfAttributes);

20
test/OpenTelemetry.Tests/Impl/Trace/CurrentSpanUtilsTest.cs
View File

@ -22,7 +22,7 @@ namespace OpenTelemetry.Trace.Test
using System;
using System.Diagnostics;
using Moq;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -66,7 +66,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -101,7 +101,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
false,
@ -135,7 +135,7 @@ namespace OpenTelemetry.Trace.Test
parentActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -148,7 +148,7 @@ namespace OpenTelemetry.Trace.Test
childActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -183,7 +183,7 @@ namespace OpenTelemetry.Trace.Test
parentActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -196,7 +196,7 @@ namespace OpenTelemetry.Trace.Test
childActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -223,7 +223,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -248,7 +248,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,
@ -283,7 +283,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
true,

8
test/OpenTelemetry.Tests/Impl/Trace/Export/BatchingSpanProcessorTests.cs
View File

@ -27,7 +27,7 @@ namespace OpenTelemetry.Trace.Export.Test
using OpenTelemetry.Testing.Export;
using OpenTelemetry.Utils;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using Xunit;
@ -56,7 +56,7 @@ namespace OpenTelemetry.Trace.Export.Test
sampledActivity,
Enumerable.Empty<KeyValuePair<string, string>>(),
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
default,
@ -75,7 +75,7 @@ namespace OpenTelemetry.Trace.Export.Test
notSampledActivity,
Enumerable.Empty<KeyValuePair<string, string>>(),
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -246,7 +246,7 @@ namespace OpenTelemetry.Trace.Export.Test
sampledActivity,
Enumerable.Empty<KeyValuePair<string, string>>(),
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
default,

10
test/OpenTelemetry.Tests/Impl/Trace/Export/SimpleSpanProcessorTests.cs
View File

@ -23,7 +23,7 @@ namespace OpenTelemetry.Trace.Export.Test
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Testing.Export;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Utils;
using Xunit;
@ -52,7 +52,7 @@ namespace OpenTelemetry.Trace.Export.Test
sampledActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
default,
@ -71,7 +71,7 @@ namespace OpenTelemetry.Trace.Export.Test
notSampledActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -101,7 +101,7 @@ namespace OpenTelemetry.Trace.Export.Test
sampledActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
default,
@ -127,7 +127,7 @@ namespace OpenTelemetry.Trace.Export.Test
sampledActivity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
default,

118
test/OpenTelemetry.Tests/Impl/Trace/SpanBuilderTest.cs
View File

@ -20,10 +20,9 @@ namespace OpenTelemetry.Trace.Test
using System.Diagnostics;
using System.Collections.Generic;
using System.Linq;
using Moq;
using OpenTelemetry.Abstractions.Utils;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
using OpenTelemetry.Resources;
@ -33,20 +32,20 @@ namespace OpenTelemetry.Trace.Test
{
private static readonly string SpanName = "MySpanName";
private readonly TraceConfig alwaysSampleTraceConfig = new TraceConfig(Samplers.AlwaysSample);
private readonly TracerConfiguration alwaysSampleTracerConfiguration = new TracerConfiguration(Samplers.AlwaysSample);
private readonly SpanProcessor spanProcessor = new SimpleSpanProcessor(new NoopSpanExporter());
private readonly ITracer tracer;
public SpanBuilderTest()
{
tracer = new Tracer(spanProcessor, alwaysSampleTraceConfig, Resource.Empty);
tracer = new Tracer(spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty);
}
[Fact]
public void StartSpanNullParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.StartSpan();
@ -73,7 +72,7 @@ namespace OpenTelemetry.Trace.Test
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var span = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetNoParent()
.SetParent(spanContext)
.StartSpan();
@ -92,7 +91,7 @@ namespace OpenTelemetry.Trace.Test
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var span = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(spanContext)
.SetNoParent()
.StartSpan();
@ -110,10 +109,10 @@ namespace OpenTelemetry.Trace.Test
ActivityTraceId.CreateRandom(),
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var rootSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.StartSpan();
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(spanContext)
.SetParent(rootSpan)
.StartSpan();
@ -131,11 +130,10 @@ namespace OpenTelemetry.Trace.Test
ActivityTraceId.CreateRandom(),
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var rootSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.StartSpan();
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(rootSpan)
.SetParent(spanContext)
.StartSpan();
@ -157,7 +155,7 @@ namespace OpenTelemetry.Trace.Test
.SetIdFormat(ActivityIdFormat.W3C)
.Start();
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(spanContext)
.SetParent(activity)
.StartSpan();
@ -179,7 +177,7 @@ namespace OpenTelemetry.Trace.Test
.SetIdFormat(ActivityIdFormat.W3C)
.Start();
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(spanContext)
.SetCreateChild(false)
.StartSpan();
@ -201,7 +199,7 @@ namespace OpenTelemetry.Trace.Test
.SetIdFormat(ActivityIdFormat.W3C)
.Start();
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetCreateChild(false)
.SetParent(spanContext)
.StartSpan();
@ -214,7 +212,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpanNullParentWithRecordEvents()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetRecordEvents(true)
@ -230,7 +228,7 @@ namespace OpenTelemetry.Trace.Test
public void StartSpanWithStartTimestamp()
{
var timestamp = DateTime.UtcNow.AddSeconds(-100);
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.AlwaysSample)
.SetStartTimestamp(timestamp)
@ -243,7 +241,7 @@ namespace OpenTelemetry.Trace.Test
public void StartSpanWithImplicitTimestamp()
{
var timestamp = PreciseTimestamp.GetUtcNow();
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.AlwaysSample)
.StartSpan();
@ -254,7 +252,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpanNullParentNoRecordOptions()
{
var span = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetNoParent()
@ -267,7 +265,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartChildSpan()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.StartSpan();
@ -276,7 +274,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True(rootSpan.IsRecordingEvents);
Assert.True((rootSpan.Context.TraceOptions & ActivityTraceFlags.Recorded) != 0);
var childSpan = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(rootSpan)
.StartSpan();
@ -294,7 +292,7 @@ namespace OpenTelemetry.Trace.Test
.Start();
parentActivity.TraceStateString = "k1=v1,k2=v2";
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.StartSpan();
@ -317,7 +315,7 @@ namespace OpenTelemetry.Trace.Test
.Start();
parentActivity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.StartSpan();
@ -334,7 +332,7 @@ namespace OpenTelemetry.Trace.Test
var parentActivity = new Activity(SpanName).Start();
parentActivity.TraceStateString = "k1=v1,k2=v2";
var childSpan = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.StartSpan();
@ -360,7 +358,7 @@ namespace OpenTelemetry.Trace.Test
parentActivity.TraceStateString = "k1=v1,k2=v2";
parentActivity.Stop();
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(parentActivity)
.StartSpan();
@ -387,7 +385,7 @@ namespace OpenTelemetry.Trace.Test
parentActivity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
parentActivity.Stop();
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(parentActivity)
.StartSpan();
@ -406,7 +404,7 @@ namespace OpenTelemetry.Trace.Test
.Start();
activity.TraceStateString = "k1=v1,k2=v2";
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetCreateChild(false)
.StartSpan();
@ -431,7 +429,7 @@ namespace OpenTelemetry.Trace.Test
.Start();
activity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var span = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetCreateChild(false)
.StartSpan();
@ -447,7 +445,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_ExplicitNoParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.StartSpan();
@ -468,7 +466,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_NoParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.StartSpan();
@ -481,7 +479,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_BlankSpanParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(BlankSpan.Instance)
.StartSpan();
@ -495,7 +493,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_BlankSpanContextParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(SpanContext.Blank)
.StartSpan();
@ -511,7 +509,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_CurrentSpanParent()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetParent(
new SpanContext(
ActivityTraceId.CreateRandom(),
@ -521,7 +519,7 @@ namespace OpenTelemetry.Trace.Test
.StartSpan();
using (tracer.WithSpan(rootSpan))
{
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.StartSpan();
Assert.True(childSpan.Context.IsValid);
@ -534,11 +532,11 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpan_NoParentInScopeOfCurrentSpan()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.StartSpan();
using (tracer.WithSpan(rootSpan))
{
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = (Span)new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetNoParent()
.StartSpan();
@ -551,7 +549,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartSpanInvalidParent()
{
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(SpanContext.Blank)
.StartSpan();
@ -572,7 +570,7 @@ namespace OpenTelemetry.Trace.Test
ActivityTraceFlags.None,
new List<KeyValuePair<string, string>> { new KeyValuePair<string, string>("k1", "v1") });
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(spanContext)
.SetRecordEvents(true)
@ -595,7 +593,7 @@ namespace OpenTelemetry.Trace.Test
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None));
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.AddLink(link)
.StartSpan();
@ -617,7 +615,7 @@ namespace OpenTelemetry.Trace.Test
var contextLink = new SpanContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.AddLink(contextLink)
.StartSpan();
@ -644,7 +642,7 @@ namespace OpenTelemetry.Trace.Test
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.AddLink(linkContext, new Dictionary<string, object> { ["k"] = "v", })
.StartSpan();
@ -671,7 +669,7 @@ namespace OpenTelemetry.Trace.Test
ActivitySpanId.CreateRandom(),
ActivityTraceFlags.None);
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var span = (Span) new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.AddLink(linkContext)
.StartSpan();
@ -690,7 +688,7 @@ namespace OpenTelemetry.Trace.Test
public void StartRootSpan_WithSpecifiedSampler()
{
// Apply given sampler before default sampler for root spans.
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.SetSampler(Samplers.NeverSample)
@ -704,7 +702,7 @@ namespace OpenTelemetry.Trace.Test
public void StartRootSpan_WithoutSpecifiedSampler()
{
// Apply default sampler (always true in the tests) for root spans.
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetNoParent()
.StartSpan();
@ -716,7 +714,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartRemoteChildSpan_WithSpecifiedSampler()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.AlwaysSample)
.SetNoParent()
@ -725,7 +723,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True(rootSpan.Context.IsValid);
Assert.True((rootSpan.Context.TraceOptions & ActivityTraceFlags.Recorded) != 0);
// Apply given sampler before default sampler for spans with remote parent.
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetParent(rootSpan.Context)
@ -739,7 +737,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartRemoteChildSpan_WithoutSpecifiedSampler()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetNoParent()
@ -748,7 +746,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True(rootSpan.Context.IsValid);
Assert.True((rootSpan.Context.TraceOptions & ActivityTraceFlags.Recorded) == 0);
// Apply default sampler (always true in the tests) for spans with remote parent.
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(rootSpan.Context)
.StartSpan();
@ -761,7 +759,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartChildSpan_WithSpecifiedSampler()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.AlwaysSample)
.SetNoParent()
@ -771,7 +769,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True((rootSpan.Context.TraceOptions & ActivityTraceFlags.Recorded) != 0);
// Apply the given sampler for child spans.
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetParent(rootSpan)
@ -785,7 +783,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartChildSpan_WithoutSpecifiedSampler()
{
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetNoParent()
@ -795,7 +793,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True((rootSpan.Context.TraceOptions & ActivityTraceFlags.Recorded) == 0);
// Don't apply the default sampler (always true) for child spans.
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(rootSpan)
.StartSpan();
@ -808,7 +806,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void StartChildSpan_SampledLinkedParent()
{
var rootSpanUnsampled = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var rootSpanUnsampled = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.NeverSample)
.SetNoParent()
@ -816,7 +814,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True((rootSpanUnsampled.Context.TraceOptions & ActivityTraceFlags.Recorded) == 0);
var rootSpanSampled =
new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetSampler(Samplers.AlwaysSample)
.SetNoParent()
@ -824,7 +822,7 @@ namespace OpenTelemetry.Trace.Test
Assert.True((rootSpanSampled.Context.TraceOptions & ActivityTraceFlags.Recorded) != 0);
// Sampled because the linked parent is sampled.
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
var childSpan = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.AddLink(new Link(rootSpanSampled.Context))
.SetParent(rootSpanUnsampled)
@ -846,7 +844,7 @@ namespace OpenTelemetry.Trace.Test
// If parent is sampled then the remote child must be sampled.
var childSpan =
new SpanBuilder(SpanName, spanProcessor, new TraceConfig(ProbabilitySampler.Create(0.1)), Resource.Empty)
new SpanBuilder(SpanName, spanProcessor, new TracerConfiguration(ProbabilitySampler.Create(0.1)), Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(new SpanContext(
traceId,
@ -861,7 +859,7 @@ namespace OpenTelemetry.Trace.Test
// If parent is not sampled then the remote child must be not sampled.
childSpan =
new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty)
new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty)
.SetSpanKind(SpanKind.Internal)
.SetParent(new SpanContext(
traceId,
@ -878,11 +876,11 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void SpanBuilder_BadArguments()
{
Assert.Throws<ArgumentNullException>(() => new SpanBuilder(null, spanProcessor, alwaysSampleTraceConfig, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new SpanBuilder(SpanName, null, alwaysSampleTraceConfig, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new SpanBuilder(null, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new SpanBuilder(SpanName, null, alwaysSampleTracerConfiguration, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new SpanBuilder(SpanName, spanProcessor, null, Resource.Empty));
var spanBuilder = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTraceConfig, Resource.Empty);
var spanBuilder = new SpanBuilder(SpanName, spanProcessor, alwaysSampleTracerConfiguration, Resource.Empty);
Assert.Throws<ArgumentNullException>(() => spanBuilder.SetParent((ISpan)null));
Assert.Throws<ArgumentNullException>(() => spanBuilder.SetParent((SpanContext)null));
Assert.Throws<ArgumentNullException>(() => spanBuilder.SetParent((Activity)null));

37
test/OpenTelemetry.Tests/Impl/Trace/SpanTest.cs
View File

@ -14,8 +14,6 @@
// limitations under the License.
// </copyright>
using OpenTelemetry.Resources;
namespace OpenTelemetry.Trace.Test
{
using System;
@ -27,9 +25,10 @@ namespace OpenTelemetry.Trace.Test
using OpenTelemetry.Abstractions.Utils;
using OpenTelemetry.Tests;
using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
using OpenTelemetry.Resources;
using Xunit;
public class SpanTest : IDisposable
@ -78,7 +77,7 @@ namespace OpenTelemetry.Trace.Test
activity,
tracestate,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
false,
@ -103,7 +102,7 @@ namespace OpenTelemetry.Trace.Test
activity,
tracestate,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
default,
false,
@ -129,7 +128,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
spanStartTime,
false,
@ -170,7 +169,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -201,7 +200,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
spanStartTime,
false,
@ -274,7 +273,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
spanStartTime,
false,
@ -339,7 +338,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -366,7 +365,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -390,7 +389,7 @@ namespace OpenTelemetry.Trace.Test
activity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var maxNumberOfAttributes = 8;
var traceConfig = new TraceConfig(Samplers.AlwaysSample, 8 , 128, 32);
var traceConfig = new TracerConfiguration(Samplers.AlwaysSample, 8 , 128, 32);
var span = new Span(
activity,
null,
@ -441,7 +440,7 @@ namespace OpenTelemetry.Trace.Test
activity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var maxNumberOfAttributes = 8;
var traceConfig = new TraceConfig(Samplers.AlwaysSample, maxNumberOfAttributes, 128, 32);
var traceConfig = new TracerConfiguration(Samplers.AlwaysSample, maxNumberOfAttributes, 128, 32);
var span = new Span(
activity,
null,
@ -509,7 +508,7 @@ namespace OpenTelemetry.Trace.Test
activity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var maxNumberOfEvents = 8;
var traceConfig = new TraceConfig(Samplers.AlwaysSample, 32, maxNumberOfEvents, 32);
var traceConfig = new TracerConfiguration(Samplers.AlwaysSample, 32, maxNumberOfEvents, 32);
var span = new Span(
activity,
null,
@ -552,7 +551,7 @@ namespace OpenTelemetry.Trace.Test
activity.ActivityTraceFlags |= ActivityTraceFlags.Recorded;
var maxNumberOfLinks = 8;
var traceConfig = new TraceConfig(Samplers.AlwaysSample, 32, 128, maxNumberOfLinks);
var traceConfig = new TracerConfiguration(Samplers.AlwaysSample, 32, 128, maxNumberOfLinks);
var span = new Span(
activity,
null,
@ -594,7 +593,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
false,
@ -631,7 +630,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
ownsActivity: true,
@ -657,7 +656,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
ownsActivity: false,
@ -686,7 +685,7 @@ namespace OpenTelemetry.Trace.Test
activity,
null,
SpanKind.Internal,
TraceConfig.Default,
new TracerConfiguration(),
spanProcessor,
PreciseTimestamp.GetUtcNow(),
ownsActivity: ownsActivity,

30
test/OpenTelemetry.Tests/Impl/Trace/TracerTest.cs
View File

@ -20,7 +20,7 @@ using OpenTelemetry.Resources;
namespace OpenTelemetry.Trace.Test
{
using System;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
@ -30,15 +30,15 @@ namespace OpenTelemetry.Trace.Test
{
private const string SpanName = "MySpanName";
private readonly SpanProcessor spanProcessor;
private readonly TraceConfig traceConfig;
private readonly TracerConfiguration tracerConfiguration;
private readonly Tracer tracer;
public TracerTest()
{
spanProcessor = new SimpleSpanProcessor(new NoopSpanExporter());
traceConfig = TraceConfig.Default;
tracer = new Tracer(spanProcessor, traceConfig, Resource.Empty);
tracerConfiguration = new TracerConfiguration();
tracer = new Tracer(spanProcessor, tracerConfiguration, Resource.Empty);
}
[Fact]
@ -52,17 +52,17 @@ namespace OpenTelemetry.Trace.Test
public void BadConstructorArgumentsThrow()
{
var noopProc = new SimpleSpanProcessor(new NoopSpanExporter());
Assert.Throws<ArgumentNullException>(() => new Tracer(null, TraceConfig.Default, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(null, TraceConfig.Default, new BinaryFormat(), new TraceContextFormat(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(null, new TracerConfiguration(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(null, new TracerConfiguration(), new BinaryFormat(), new TraceContextFormat(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, null, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, null, new BinaryFormat(), new TraceContextFormat(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, TraceConfig.Default, null, new TraceContextFormat(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, TraceConfig.Default, new BinaryFormat(), null, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, new TracerConfiguration(), null, new TraceContextFormat(), Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, new TracerConfiguration(), new BinaryFormat(), null, Resource.Empty));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, TraceConfig.Default, null));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, TraceConfig.Default, new BinaryFormat(), new TraceContextFormat(), null));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, new TracerConfiguration(), null));
Assert.Throws<ArgumentNullException>(() => new Tracer(noopProc, new TracerConfiguration(), new BinaryFormat(), new TraceContextFormat(), null));
}
[Fact]
@ -109,17 +109,17 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void GetActiveConfig()
{
var config = new TraceConfig(Samplers.NeverSample);
var config = new TracerConfiguration(Samplers.NeverSample);
var tracer = new Tracer(spanProcessor, config, Resource.Empty);
Assert.Equal(config, tracer.ActiveTraceConfig);
Assert.Equal(config, tracer.ActiveTracerConfiguration);
}
[Fact]
public void SetActiveConfig()
{
var config = new TraceConfig(Samplers.NeverSample);
tracer.ActiveTraceConfig = config;
Assert.Equal(config, tracer.ActiveTraceConfig);
var config = new TracerConfiguration(Samplers.NeverSample);
tracer.ActiveTracerConfiguration = config;
Assert.Equal(config, tracer.ActiveTracerConfiguration);
}
// TODO test for sampler

8
test/OpenTelemetry.Tests/Impl/Trace/TracingTest.cs
View File

@ -14,6 +14,8 @@
// limitations under the License.
// </copyright>
using OpenTelemetry.Trace.Sampler.Internal;
namespace OpenTelemetry.Trace.Test
{
using OpenTelemetry.Trace.Config;
@ -34,11 +36,13 @@ namespace OpenTelemetry.Trace.Test
Assert.Equal(typeof(BatchingSpanProcessor), Tracing.SpanProcessor.GetType());
}
[Fact]
public void DefaultTraceConfig()
{
Assert.Same(TraceConfig.Default, Tracing.TraceConfig);
Assert.IsType<AlwaysSampleSampler>(Tracing.TracerConfiguration.Sampler);
Assert.Equal(32, Tracing.TracerConfiguration.MaxNumberOfAttributes);
Assert.Equal(128, Tracing.TracerConfiguration.MaxNumberOfEvents);
Assert.Equal(32, Tracing.TracerConfiguration.MaxNumberOfLinks);
}
}
}

4
test/TestApp.AspNetCore.2.0/Startup.cs
View File

@ -25,7 +25,7 @@ using OpenTelemetry.Trace.Export;
using OpenTelemetry.Trace.Sampler;
using System.Net.Http;
using OpenTelemetry.Exporter.Zipkin;
using OpenTelemetry.Trace.Config;
using OpenTelemetry.Trace.Configuration;
namespace TestApp.AspNetCore._2._0
{
@ -53,7 +53,7 @@ namespace TestApp.AspNetCore._2._0
services.AddSingleton<ZipkinTraceExporterOptions>(new ZipkinTraceExporterOptions { ServiceName = "tracing-to-zipkin-service" });
services.AddSingleton<SpanExporter, ZipkinTraceExporter>();
services.AddSingleton<SpanProcessor, BatchingSpanProcessor>();
services.AddSingleton<TraceConfig>();
services.AddSingleton<TracerConfiguration>();
services.AddSingleton<ITracer, Tracer>();
}