Skip to content

Use the application service name in ILogger log injection #1798

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
andrewlock merged 1 commit into from
Sep 22, 2021
Merged

Use the application service name in ILogger log injection #1798

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
14 changes: 6 additions & 8 deletions .../src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/ILogger/DatadogLoggingScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public KeyValuePair<string, object> this[int index]
{
return index switch
{
0 => new KeyValuePair<string, object>("dd_service", _tracer.ActiveScope?.Span.ServiceName ?? _service),
0 => new KeyValuePair<string, object>("dd_service", _service),
1 => new KeyValuePair<string, object>("dd_env", _env),
2 => new KeyValuePair<string, object>("dd_version", _version),
3 => new KeyValuePair<string, object>("dd_trace_id", (_tracer.ActiveScope?.Span.TraceId ?? 0).ToString()),
Expand All @@ -65,18 +65,16 @@ public override string ToString()

return string.Format(
CultureInfo.InvariantCulture,
"dd_service:\"{0}\", dd_env:\"{1}\", dd_version:\"{2}\", dd_trace_id:\"{3}\", dd_span_id:\"{4}\"",
span?.ServiceName ?? _service,
_env,
_version,
_tracer.ActiveScope?.Span.TraceId,
_tracer.ActiveScope?.Span.SpanId);
"{0}, dd_trace_id:\"{1}\", dd_span_id:\"{2}\"",
_cachedFormat,
span.TraceId,
span.SpanId);
}

public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{
var span = _tracer.ActiveScope?.Span;
yield return new KeyValuePair<string, object>("dd_service", span?.ServiceName ?? _service);
yield return new KeyValuePair<string, object>("dd_service", _service);
yield return new KeyValuePair<string, object>("dd_env", _env);
yield return new KeyValuePair<string, object>("dd_version", _version);

Expand Down