Skip to content

Collect process tags for tracing #8698

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 12 commits into from
Apr 29, 2025
Merged

Collect process tags for tracing #8698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc6d1ba
Collect process tags for tracing
amarziali Apr 15, 2025
d32eda5
fix tests and experimental features
amarziali Apr 15, 2025
60a0f48
Only add to first span in chunk
amarziali Apr 16, 2025
7a3e60e
fix tests
amarziali Apr 17, 2025
6dbbd0d
use the good tag name
amarziali Apr 17, 2025
8965370
target all spring boot advices
amarziali Apr 17, 2025
96a9dd0
fix coverage
amarziali Apr 17, 2025
3289fef
Add process tags to client stats payload (#8704)
amarziali Apr 28, 2025
cae62d9
Use the correct setting name
amarziali Apr 28, 2025
6c15513
update system test commit
amarziali Apr 28, 2025
72beabe
refactor
amarziali Apr 28, 2025
9abb9f8
add more tests
amarziali Apr 29, 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
Prev Previous commit
add more tests
  • Loading branch information
@amarziali
amarziali committed Apr 29, 2025
commit 9abb9f8cdb62a223fccb04f22e2f7d32afb6872a
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void map(final List<? extends CoreSpan<?>> trace, final Writable writable
span.processTagsAndBaggage(
metaWriter
.withWritable(writable)
.forLastSpanInChunk(i == 0)
.forFirstSpanInChunk(i == 0)
.forLastSpanInChunk(i == trace.size() - 1));
/* 12 */
writeDictionaryEncoded(writable, span.getType());
Expand Down
3 changes: 3 additions & 0 deletions ...core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
if (expectedTraces.isEmpty() && messageCount == 0) {
return
}
boolean hasProcessTags = false
try {
Payload payload = mapper.newPayload().withBody(messageCount, buffer)
payload.writeTo(this)
Expand Down Expand Up @@ -350,6 +351,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
assertEquals(0, k)
assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
hasProcessTags = true
} else {
Object tag = expectedSpan.getTag(entry.getKey())
if (null != tag) {
Expand Down Expand Up @@ -377,6 +379,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
} catch (IOException e) {
Assertions.fail(e.getMessage())
} finally {
assert hasProcessTags == Config.get().isExperimentalPropagateProcessTagsEnabled()
mapper.reset()
captured.position(0)
captured.limit(captured.capacity())
Expand Down
4 changes: 4 additions & 0 deletions ...core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces
import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertFalse
import static org.junit.Assert.assertNotNull
import static org.junit.Assert.assertTrue
import static org.msgpack.core.MessageFormat.*

class TraceMapperV05PayloadTest extends DDSpecification {
Expand Down Expand Up @@ -197,6 +198,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {

@Override
void accept(int messageCount, ByteBuffer buffer) {
def hasProcessTags = false
try {
Payload payload = mapper.newPayload().withBody(messageCount, buffer)
payload.writeTo(this)
Expand Down Expand Up @@ -248,6 +250,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
} else if(DDTags.ORIGIN_KEY.equals(entry.getKey())) {
assertEquals(expectedSpan.getOrigin(), entry.getValue())
} else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
hasProcessTags = true
assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
assertEquals(0, k)
assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
Expand Down Expand Up @@ -317,6 +320,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
} catch (IOException e) {
Assert.fail(e.getMessage())
} finally {
assert hasProcessTags == Config.get().isExperimentalPropagateProcessTagsEnabled()
mapper.reset()
captured.position(0)
captured.limit(captured.capacity())
Expand Down