Skip to content

Fix client stats payload #9743

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
amarziali merged 1 commit into from
Oct 13, 2025
Merged

Fix client stats payload #9743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand All @@ -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());

Expand Down
8 changes: 5 additions & 3 deletions ...race-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down