Skip to content

Pass the GlobalTracerAccessor into OpenTracingLogger #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2019
Merged

Pass the GlobalTracerAccessor into OpenTracingLogger #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/OpenTracing.Contrib.NetCore/Logging/OpenTracingLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
using System.Collections.Generic;
using Microsoft.Extensions.Logging;
using OpenTracing.Contrib.NetCore.Internal;
using OpenTracing.Noop;
using OpenTracing.Util;

namespace OpenTracing.Contrib.NetCore.Logging
{
internal class OpenTracingLogger : ILogger
{
private const string OriginalFormatPropertyName = "{OriginalFormat}";

private readonly ITracer _tracer;
private readonly string _categoryName;
private readonly IGlobalTracerAccessor _globalTracerAccessor;

public OpenTracingLogger(ITracer tracer, string categoryName)
public OpenTracingLogger(IGlobalTracerAccessor globalTracerAccessor, string categoryName)
{
_tracer = tracer;
_globalTracerAccessor = globalTracerAccessor;
_categoryName = categoryName;
}

Expand All @@ -26,8 +28,10 @@ public IDisposable BeginScope<TState>(TState state)
public bool IsEnabled(LogLevel logLevel)
{
// Filtering should be done via the general Logging filtering feature.

return !_tracer.IsNoopTracer();
ITracer tracer = _globalTracerAccessor.GetGlobalTracer();
return !(
(tracer is NoopTracer) ||
(tracer is GlobalTracer && !GlobalTracer.IsRegistered()));
}

public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
Expand All @@ -38,7 +42,8 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
return;
}

ISpan span = _tracer.ActiveSpan;
ITracer tracer = _globalTracerAccessor.GetGlobalTracer();
ISpan span = tracer.ActiveSpan;

if (span == null)
{
Expand Down
13 changes: 3 additions & 10 deletions src/OpenTracing.Contrib.NetCore/Logging/OpenTracingLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@ namespace OpenTracing.Contrib.NetCore.Logging
[ProviderAlias("OpenTracing")]
internal class OpenTracingLoggerProvider : ILoggerProvider
{
private readonly ITracer _tracer;
private readonly IGlobalTracerAccessor _globalTracerAccessor;

public OpenTracingLoggerProvider(IGlobalTracerAccessor globalTracerAccessor)
{
// HACK: We can't use ITracer directly here because this would lead to a StackOverflowException
// (due to a circular dependency) if the ITracer needs a ILoggerFactory.
// https://github.com/opentracing-contrib/csharp-netcore/issues/14

if (globalTracerAccessor == null)
throw new ArgumentNullException(nameof(globalTracerAccessor));

_tracer = globalTracerAccessor.GetGlobalTracer();
_globalTracerAccessor = globalTracerAccessor ?? throw new ArgumentNullException(nameof(globalTracerAccessor));
}

/// <inheritdoc/>
public ILogger CreateLogger(string categoryName)
{
return new OpenTracingLogger(_tracer, categoryName);
return new OpenTracingLogger(_globalTracerAccessor, categoryName);
}

public void Dispose()
Expand Down