Skip to content

Commit 1f44294

Browse files
committed
fix: PR Review
1 parent 4fb6543 commit 1f44294

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package datadog.trace.common.metrics;
22

3+
import static java.nio.charset.StandardCharsets.ISO_8859_1;
4+
35
import datadog.communication.serialization.GrowableBuffer;
46
import datadog.communication.serialization.WritableFormatter;
57
import datadog.communication.serialization.msgpack.MsgPackWriter;
68
import datadog.trace.api.ProcessTags;
79
import datadog.trace.api.WellKnownTags;
810
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
9-
1011
import java.util.List;
1112

12-
import static java.nio.charset.StandardCharsets.ISO_8859_1;
13-
1413
public final class SerializingMetricWriter implements MetricWriter {
1514

1615
private static final byte[] SEQUENCE = "Seq".getBytes(ISO_8859_1);
@@ -36,9 +35,10 @@ public final class SerializingMetricWriter implements MetricWriter {
3635
private static final byte[] IS_TRACE_ROOT = "IsTraceRoot".getBytes(ISO_8859_1);
3736
private static final byte[] SPAN_KIND = "SpanKind".getBytes(ISO_8859_1);
3837
private static final byte[] PEER_TAGS = "PeerTags".getBytes(ISO_8859_1);
39-
// Is trace root is a tristate (0 unknown, 1 true, 2 false)
40-
public static final int IS_TRACE_ROOT_TRUE = 1;
41-
public static final int IS_TRACE_ROOT_FALSE = 2;
38+
@SuppressWarnings("unused") // Kept for representing all possible states
39+
public static final int TRISTATE_UNKNOWN = 0;
40+
public static final int TRISTATE_TRUE = 1;
41+
public static final int TRISTATE_FALSE = 2;
4242

4343
private final WellKnownTags wellKnownTags;
4444
private final WritableFormatter writer;
@@ -122,7 +122,7 @@ public void add(MetricKey key, AggregateMetric aggregate) {
122122
writer.writeBoolean(key.isSynthetics());
123123

124124
writer.writeUTF8(IS_TRACE_ROOT);
125-
writer.writeInt(key.isTraceRoot() ? IS_TRACE_ROOT_TRUE : IS_TRACE_ROOT_FALSE);
125+
writer.writeInt(key.isTraceRoot() ? TRISTATE_TRUE : TRISTATE_FALSE);
126126

127127
writer.writeUTF8(SPAN_KIND);
128128
writer.writeUTF8(key.getSpanKind());

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import static java.util.concurrent.TimeUnit.SECONDS
1818

1919
class SerializingMetricWriterTest extends DDSpecification {
2020

21-
public static final int IS_TRACE_ROOT_TRUE = 1
22-
public static final int IS_TRACE_ROOT_FALSE = 2
21+
public static final int TRISTATE_TRUE = 1
22+
public static final int TRISTATE_FALSE = 2
2323

2424
def "should produce correct message #iterationIndex with process tags enabled #withProcessTags" () {
2525
setup:
@@ -180,7 +180,7 @@ class SerializingMetricWriterTest extends DDSpecification {
180180
assert unpacker.unpackBoolean() == key.isSynthetics()
181181
++elementCount
182182
assert unpacker.unpackString() == "IsTraceRoot"
183-
assert unpacker.unpackInt() == (key.isTraceRoot() ? IS_TRACE_ROOT_TRUE : IS_TRACE_ROOT_FALSE)
183+
assert unpacker.unpackInt() == (key.isTraceRoot() ? TRISTATE_TRUE : TRISTATE_FALSE)
184184
++elementCount
185185
assert unpacker.unpackString() == "SpanKind"
186186
assert unpacker.unpackString() == key.getSpanKind() as String

0 commit comments

Comments
 (0)