diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java index 100c53dbba6..bdd4e99a178 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java @@ -12,8 +12,8 @@ public final class SerializingMetricWriter implements MetricWriter { - private static final byte[] SEQUENCE = "Seq".getBytes(ISO_8859_1); - private static final byte[] RUNTIME_ID = "RuntimeId".getBytes(ISO_8859_1); + private static final byte[] SEQUENCE = "Sequence".getBytes(ISO_8859_1); + private static final byte[] RUNTIME_ID = "RuntimeID".getBytes(ISO_8859_1); private static final byte[] HOSTNAME = "Hostname".getBytes(ISO_8859_1); private static final byte[] NAME = "Name".getBytes(ISO_8859_1); private static final byte[] ENV = "Env".getBytes(ISO_8859_1); @@ -61,7 +61,7 @@ public SerializingMetricWriter(WellKnownTags wellKnownTags, Sink sink, int initi public void startBucket(int metricCount, long start, long duration) { final UTF8BytesString processTags = ProcessTags.getTagsForSerialization(); final boolean writeProcessTags = processTags != null; - writer.startMap(6 + (writeProcessTags ? 1 : 0)); + writer.startMap(7 + (writeProcessTags ? 1 : 0)); writer.writeUTF8(RUNTIME_ID); writer.writeUTF8(wellKnownTags.getRuntimeId()); @@ -72,6 +72,9 @@ public void startBucket(int metricCount, long start, long duration) { writer.writeUTF8(HOSTNAME); writer.writeUTF8(wellKnownTags.getHostname()); + writer.writeUTF8(SERVICE); + writer.writeUTF8(wellKnownTags.getService()); + writer.writeUTF8(ENV); writer.writeUTF8(wellKnownTags.getEnv()); diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy index 64874c62ab7..88ef1cbc66a 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy @@ -125,13 +125,15 @@ class SerializingMetricWriterTest extends DDSpecification { void accept(int messageCount, ByteBuffer buffer) { MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer) int mapSize = unpacker.unpackMapHeader() - assert mapSize == (6 + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0)) - assert unpacker.unpackString() == "RuntimeId" + assert mapSize == (7 + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0)) + assert unpacker.unpackString() == "RuntimeID" assert unpacker.unpackString() == wellKnownTags.getRuntimeId() as String - assert unpacker.unpackString() == "Seq" + assert unpacker.unpackString() == "Sequence" assert unpacker.unpackLong() == 0L assert unpacker.unpackString() == "Hostname" assert unpacker.unpackString() == wellKnownTags.getHostname() as String + assert unpacker.unpackString() == "Service" + assert unpacker.unpackString() == wellKnownTags.getService() as String assert unpacker.unpackString() == "Env" assert unpacker.unpackString() == wellKnownTags.getEnv() as String assert unpacker.unpackString() == "Version"