Skip to content

Commit cf8ca09

Browse files
authored
[shared] Remove TagTransformer and improve TagWriter (#5602)
1 parent a578ed3 commit cf8ca09

File tree

14 files changed

+416
-468
lines changed

14 files changed

+416
-468
lines changed

OpenTelemetry.sln

-2
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A49299
259259
src\Shared\SemanticConventions.cs = src\Shared\SemanticConventions.cs
260260
src\Shared\SpanAttributeConstants.cs = src\Shared\SpanAttributeConstants.cs
261261
src\Shared\StatusHelper.cs = src\Shared\StatusHelper.cs
262-
src\Shared\TagTransformer.cs = src\Shared\TagTransformer.cs
263-
src\Shared\TagTransformerJsonHelper.cs = src\Shared\TagTransformerJsonHelper.cs
264262
src\Shared\ThreadSafeRandom.cs = src\Shared\ThreadSafeRandom.cs
265263
EndProjectSection
266264
EndProject

src/OpenTelemetry.Exporter.Console/Implementation/ConsoleTagWriter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ protected override void WriteBooleanTag(ref ConsoleTag consoleTag, string key, b
5151
consoleTag.Value = value ? "true" : "false";
5252
}
5353

54-
protected override void WriteStringTag(ref ConsoleTag consoleTag, string key, string value)
54+
protected override void WriteStringTag(ref ConsoleTag consoleTag, string key, ReadOnlySpan<char> value)
5555
{
5656
consoleTag.Key = key;
57-
consoleTag.Value = value;
57+
consoleTag.Value = value.ToString();
5858
}
5959

6060
protected override void WriteArrayTag(ref ConsoleTag consoleTag, string key, ArraySegment<byte> arrayUtf8JsonBytes)

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OtlpTagWriter.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ protected override void WriteBooleanTag(ref RepeatedField<OtlpCommon.KeyValue> t
4545
tags.Add(new OtlpCommon.KeyValue { Key = key, Value = ToAnyValue(value) });
4646
}
4747

48-
protected override void WriteStringTag(ref RepeatedField<OtlpCommon.KeyValue> tags, string key, string value)
48+
protected override void WriteStringTag(ref RepeatedField<OtlpCommon.KeyValue> tags, string key, ReadOnlySpan<char> value)
4949
{
50-
tags.Add(new OtlpCommon.KeyValue { Key = key, Value = ToAnyValue(value) });
50+
tags.Add(new OtlpCommon.KeyValue { Key = key, Value = ToAnyValue(value.ToString()) });
5151
}
5252

5353
protected override void WriteArrayTag(ref RepeatedField<OtlpCommon.KeyValue> tags, string key, ref OtlpCommon.ArrayValue value)
@@ -95,9 +95,9 @@ public override void WriteBooleanValue(ref OtlpCommon.ArrayValue array, bool val
9595
array.Values.Add(ToAnyValue(value));
9696
}
9797

98-
public override void WriteStringValue(ref OtlpCommon.ArrayValue array, string value)
98+
public override void WriteStringValue(ref OtlpCommon.ArrayValue array, ReadOnlySpan<char> value)
9999
{
100-
array.Values.Add(ToAnyValue(value));
100+
array.Values.Add(ToAnyValue(value.ToString()));
101101
}
102102

103103
public override void EndWriteArray(ref OtlpCommon.ArrayValue array)

src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagWriter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected override void WriteFloatingPointTag(ref Utf8JsonWriter writer, string
4949
protected override void WriteBooleanTag(ref Utf8JsonWriter writer, string key, bool value)
5050
=> writer.WriteString(key, value ? "true" : "false");
5151

52-
protected override void WriteStringTag(ref Utf8JsonWriter writer, string key, string value)
52+
protected override void WriteStringTag(ref Utf8JsonWriter writer, string key, ReadOnlySpan<char> value)
5353
=> writer.WriteString(key, value);
5454

5555
protected override void WriteArrayTag(ref Utf8JsonWriter writer, string key, ArraySegment<byte> arrayUtf8JsonBytes)

src/Shared/TagTransformer.cs

-208
This file was deleted.

src/Shared/TagTransformerJsonHelper.cs

-53
This file was deleted.

src/Shared/TagWriter/ArrayTagWriter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal abstract class ArrayTagWriter<TArrayState>
1818

1919
public abstract void WriteBooleanValue(ref TArrayState state, bool value);
2020

21-
public abstract void WriteStringValue(ref TArrayState state, string value);
21+
public abstract void WriteStringValue(ref TArrayState state, ReadOnlySpan<char> value);
2222

2323
public abstract void EndWriteArray(ref TArrayState state);
2424
}

src/Shared/TagWriter/JsonStringArrayTagWriter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public override void WriteNullValue(ref JsonArrayTagWriterState state)
7575
state.Writer.WriteNullValue();
7676
}
7777

78-
public override void WriteStringValue(ref JsonArrayTagWriterState state, string value)
78+
public override void WriteStringValue(ref JsonArrayTagWriterState state, ReadOnlySpan<char> value)
7979
{
8080
state.Writer.WriteStringValue(value);
8181
}

0 commit comments

Comments
 (0)