Skip to content

[sdk.logging] More consistent handling of StateValues/Attributes #4334

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
utpilla merged 22 commits into from
Apr 20, 2023
Merged

[sdk.logging] More consistent handling of StateValues/Attributes #4334

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cd70d9f
Bring back some of the logging enhancements done in the main-logs bra…
CodeBlanch Mar 21, 2023
7f2b483
Code review.
CodeBlanch Mar 28, 2023
2bb97b6
Fixes and cleanup.
CodeBlanch Mar 28, 2023
2b39d48
Test fixes WIP.
CodeBlanch Mar 30, 2023
ba21e1f
Test fixes.
CodeBlanch Mar 30, 2023
9a681e1
Code review.
CodeBlanch Mar 30, 2023
c25e48f
Tweak.
CodeBlanch Mar 30, 2023
8988973
Update commented out code for better perf in the future.
CodeBlanch Mar 30, 2023
162e8c1
Test updates.
CodeBlanch Mar 30, 2023
054cfef
CHANGELOG updates.
CodeBlanch Mar 30, 2023
4fddbde
Merge branch 'main' into logging-improvements
CodeBlanch Mar 30, 2023
23142c5
Merge from main.
CodeBlanch Apr 5, 2023
c037345
Code review.
CodeBlanch Apr 5, 2023
dff71fa
Code review.
CodeBlanch Apr 5, 2023
f061d69
Code review.
CodeBlanch Apr 5, 2023
ad67d6c
Test updates.
CodeBlanch Apr 5, 2023
755c1ab
Merge branch 'main' into logging-improvements
CodeBlanch Apr 5, 2023
841bfe1
Made new options internal.
CodeBlanch Apr 10, 2023
602449c
Merge from main.
CodeBlanch Apr 18, 2023
b065a05
Code review.
CodeBlanch Apr 18, 2023
27ee661
Merge branch 'main' into logging-improvements
utpilla Apr 19, 2023
32e48de
Merge branch 'main' into logging-improvements
cijothomas Apr 20, 2023
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
Prev Previous commit
Next Next commit
Tweak.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Mar 30, 2023
commit c25e48f9f529c9f21518b2a4c7993236092bd300
8 changes: 5 additions & 3 deletions src/OpenTelemetry/Logs/OpenTelemetryLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
LogRecordData.SetActivityContext(ref data, activity);

var attributes = record.Attributes = provider.IncludeState
? ProcessState(record, ref iloggerData, state, provider.ParseStateValues)
? ProcessState(record, ref iloggerData, in state, provider.ParseStateValues)
: null;

if (!TryGetOriginalFormatFromAttributes(attributes, out var originalFormat))
Expand Down Expand Up @@ -117,7 +117,7 @@ public bool IsEnabled(LogLevel logLevel)
private static IReadOnlyList<KeyValuePair<string, object?>>? ProcessState<TState>(
LogRecord logRecord,
ref LogRecord.LogRecordILoggerData iLoggerData,
TState state,
in TState state,
bool parseStateValues)
{
iLoggerData.State = null;
Expand Down Expand Up @@ -188,7 +188,9 @@ public bool IsEnabled(LogLevel logLevel)
}
}

private static bool TryGetOriginalFormatFromAttributes(IReadOnlyList<KeyValuePair<string, object?>>? attributes, [NotNullWhen(true)] out string? originalFormat)
private static bool TryGetOriginalFormatFromAttributes(
IReadOnlyList<KeyValuePair<string, object?>>? attributes,
[NotNullWhen(true)] out string? originalFormat)
{
if (attributes != null && attributes.Count > 0)
{
Expand Down