Skip to content
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

[Exporter.Prometheus] remove redundant if in WriteUnicodeNoEscape #6077

Merged
merged 8 commits into from
Jan 24, 2025
Merged

[Exporter.Prometheus] remove redundant if in WriteUnicodeNoEscape #6077

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e92943a
remove redundant if in WriteUnicodeNoEscape
SimonCropp Jan 20, 2025
536aa3b
Merge branch 'main' into remove-redundant-if-in-WriteUnicodeNoEscape
Kielek Jan 22, 2025
ceebdf7
Update src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/Pr…
SimonCropp Jan 22, 2025
4cab2ad
Merge branch 'main' into remove-redundant-if-in-WriteUnicodeNoEscape
SimonCropp Jan 23, 2025
3d11061
Merge branch 'main' into remove-redundant-if-in-WriteUnicodeNoEscape
SimonCropp Jan 24, 2025
f5ead0b
Merge remote-tracking branch 'upstream/main' into remove-redundant-if…
SimonCropp Jan 24, 2025
f6c8fba
Update PrometheusSerializer.cs
SimonCropp Jan 24, 2025
935cb4e
Merge branch 'main' into remove-redundant-if-in-WriteUnicodeNoEscape
CodeBlanch Jan 24, 2025
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
7 changes: 2 additions & 5 deletions src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,13 @@ public static int WriteUnicodeNoEscape(byte[] buffer, int cursor, ushort ordinal
buffer[cursor++] = unchecked((byte)(0b_1100_0000 | (ordinal >> 6)));
buffer[cursor++] = unchecked((byte)(0b_1000_0000 | (ordinal & 0b_0011_1111)));
}
else if (ordinal <= 0xFFFF)
else
SimonCropp marked this conversation as resolved.
Show resolved Hide resolved
{
// all other <= 0xFFFF which is ushort.MaxValue
buffer[cursor++] = unchecked((byte)(0b_1110_0000 | (ordinal >> 12)));
buffer[cursor++] = unchecked((byte)(0b_1000_0000 | ((ordinal >> 6) & 0b_0011_1111)));
buffer[cursor++] = unchecked((byte)(0b_1000_0000 | (ordinal & 0b_0011_1111)));
}
else
{
Debug.Assert(ordinal <= 0xFFFF, ".NET string should not go beyond Unicode BMP.");
}

return cursor;
}
Expand Down
Loading