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

clean up TracerProviderSdk (#1045) 

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
This commit is contained in:
Reiley Yang 2020-08-11 06:29:59 -07:00 committed by GitHub
parent 7a57b84b90
commit f44952a610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,24 +39,7 @@ namespace OpenTelemetry.Trace
throw new ArgumentException($"{nameof(provider)} is not an instance of TracerProviderSdk");
}
if (trait.ActivityProcessor == null)
{
trait.ActivityProcessor = processor;
}
else if (trait.ActivityProcessor is CompositeActivityProcessor compositeProcessor)
{
compositeProcessor.AddProcessor(processor);
}
else
{
trait.ActivityProcessor = new CompositeActivityProcessor(new[]
{
trait.ActivityProcessor,
processor,
});
}
return provider;
return trait.AddProcessor(processor);
}
}
}

69
src/OpenTelemetry/Trace/TracerProviderSdk.cs
View File

@ -25,11 +25,11 @@ namespace OpenTelemetry.Trace
{
internal class TracerProviderSdk : TracerProvider
{
public readonly List<object> Instrumentations;
public Resource Resource;
public ActivityProcessor ActivityProcessor;
public ActivityListener ActivityListener;
public Sampler Sampler;
private readonly List<object> instrumentations;
private readonly ActivityListener listener;
private readonly Resource resource;
private readonly Sampler sampler;
private ActivityProcessor processor;
static TracerProviderSdk()
{
@ -49,18 +49,18 @@ namespace OpenTelemetry.Trace
this.AddProcessor(processor);
}
this.Sampler = sampler;
this.sampler = sampler;
this.Resource = resource;
this.resource = resource;
if (instrumentationFactories != null)
{
// TODO: check if individual element is null
this.Instrumentations = new List<object>();
var adapter = new ActivitySourceAdapter(this.Sampler, this.ActivityProcessor, this.Resource);
this.instrumentations = new List<object>();
var adapter = new ActivitySourceAdapter(sampler, this.processor, resource);
foreach (var instrumentationFactory in instrumentationFactories)
{
this.Instrumentations.Add(instrumentationFactory.Factory(adapter));
this.instrumentations.Add(instrumentationFactory.Factory(adapter));
}
}
@ -71,16 +71,16 @@ namespace OpenTelemetry.Trace
{
if (activity.IsAllDataRequested)
{
activity.SetResource(this.Resource);
activity.SetResource(resource);
}
this.ActivityProcessor?.OnStart(activity);
this.processor?.OnStart(activity);
},
// Callback when Activity is stopped.
ActivityStopped = (activity) =>
{
this.ActivityProcessor?.OnEnd(activity);
this.processor?.OnEnd(activity);
},
// Setting this to true means TraceId will be always
@ -89,7 +89,7 @@ namespace OpenTelemetry.Trace
AutoGenerateRootContextTraceId = true,
// This delegate informs ActivitySource about sampling decision when the parent context is an ActivityContext.
GetRequestedDataUsingContext = (ref ActivityCreationOptions<ActivityContext> options) => ComputeActivityDataRequest(options, this.Sampler),
GetRequestedDataUsingContext = (ref ActivityCreationOptions<ActivityContext> options) => ComputeActivityDataRequest(options, sampler),
};
if (sources != null & sources.Any())
@ -134,28 +134,55 @@ namespace OpenTelemetry.Trace
}
ActivitySource.AddActivityListener(listener);
this.ActivityListener = listener;
this.listener = listener;
}
internal TracerProviderSdk AddProcessor(ActivityProcessor processor)
{
if (processor == null)
{
throw new ArgumentNullException(nameof(processor));
}
if (this.processor == null)
{
this.processor = processor;
}
else if (this.processor is CompositeActivityProcessor compositeProcessor)
{
compositeProcessor.AddProcessor(processor);
}
else
{
this.processor = new CompositeActivityProcessor(new[]
{
this.processor,
processor,
});
}
return this;
}
protected override void Dispose(bool disposing)
{
if (this.Instrumentations != null)
if (this.instrumentations != null)
{
foreach (var item in this.Instrumentations)
foreach (var item in this.instrumentations)
{
(item as IDisposable)?.Dispose();
}
this.Instrumentations.Clear();
this.instrumentations.Clear();
}
(this.Sampler as IDisposable)?.Dispose();
this.ActivityProcessor?.Dispose();
(this.sampler as IDisposable)?.Dispose();
this.processor?.Dispose();
// Shutdown the listener last so that anything created while instrumentation cleans up will still be processed.
// Redis instrumentation, for example, flushes during dispose which creates Activity objects for any profiling
// sessions that were open.
this.ActivityListener?.Dispose();
this.listener?.Dispose();
base.Dispose(disposing);
}