Skip to content

Commit 9abb9f8

Browse files
committed
add more tests
1 parent 72beabe commit 9abb9f8

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void map(final List<? extends CoreSpan<?>> trace, final Writable writable
7979
span.processTagsAndBaggage(
8080
metaWriter
8181
.withWritable(writable)
82-
.forLastSpanInChunk(i == 0)
82+
.forFirstSpanInChunk(i == 0)
8383
.forLastSpanInChunk(i == trace.size() - 1));
8484
/* 12 */
8585
writeDictionaryEncoded(writable, span.getType());

dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
239239
if (expectedTraces.isEmpty() && messageCount == 0) {
240240
return
241241
}
242+
boolean hasProcessTags = false
242243
try {
243244
Payload payload = mapper.newPayload().withBody(messageCount, buffer)
244245
payload.writeTo(this)
@@ -350,6 +351,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
350351
assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
351352
assertEquals(0, k)
352353
assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
354+
hasProcessTags = true
353355
} else {
354356
Object tag = expectedSpan.getTag(entry.getKey())
355357
if (null != tag) {
@@ -377,6 +379,7 @@ class TraceMapperV04PayloadTest extends DDSpecification {
377379
} catch (IOException e) {
378380
Assertions.fail(e.getMessage())
379381
} finally {
382+
assert hasProcessTags == Config.get().isExperimentalPropagateProcessTagsEnabled()
380383
mapper.reset()
381384
captured.position(0)
382385
captured.limit(captured.capacity())

dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces
2929
import static org.junit.Assert.assertEquals
3030
import static org.junit.Assert.assertFalse
3131
import static org.junit.Assert.assertNotNull
32+
import static org.junit.Assert.assertTrue
3233
import static org.msgpack.core.MessageFormat.*
3334

3435
class TraceMapperV05PayloadTest extends DDSpecification {
@@ -197,6 +198,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
197198

198199
@Override
199200
void accept(int messageCount, ByteBuffer buffer) {
201+
def hasProcessTags = false
200202
try {
201203
Payload payload = mapper.newPayload().withBody(messageCount, buffer)
202204
payload.writeTo(this)
@@ -248,6 +250,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
248250
} else if(DDTags.ORIGIN_KEY.equals(entry.getKey())) {
249251
assertEquals(expectedSpan.getOrigin(), entry.getValue())
250252
} else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) {
253+
hasProcessTags = true
251254
assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled())
252255
assertEquals(0, k)
253256
assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue())
@@ -317,6 +320,7 @@ class TraceMapperV05PayloadTest extends DDSpecification {
317320
} catch (IOException e) {
318321
Assert.fail(e.getMessage())
319322
} finally {
323+
assert hasProcessTags == Config.get().isExperimentalPropagateProcessTagsEnabled()
320324
mapper.reset()
321325
captured.position(0)
322326
captured.limit(captured.capacity())

0 commit comments

Comments
 (0)