Skip to content

fix: backport lineage fix to datadog-lambda-java #90

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
merged 1 commit into from
Mar 21, 2023
Merged

fix: backport lineage fix to datadog-lambda-java #90

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
8 changes: 6 additions & 2 deletions src/main/java/com/datadoghq/datadog_lambda_java/Tracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public XRayTraceContext(){
return;
}
String[] traceParts = traceId.split(";");
if(traceParts.length != 3){
if(hasInvalidXrayHeader(traceParts)){
DDLogger.getLoggerImpl().error ("Malformed _X_AMZN_TRACE_ID value: "+ traceId);
return;
}
Expand All @@ -388,13 +388,17 @@ public XRayTraceContext(){
this.traceIdHeader = traceId;
}

private static boolean hasInvalidXrayHeader(String[] traceParts) {
return traceParts.length < 3;
}

/**
* Test constructor that can take a dummy _X_AMZN_TRACE_ID value rather than reading from env vars
* @param traceId
*/
protected XRayTraceContext(String traceId){
String[] traceParts = traceId.split(";");
if(traceParts.length != 3){
if(hasInvalidXrayHeader(traceParts)){
DDLogger.getLoggerImpl().error("Malformed _X_AMZN_TRACE_ID value: "+ traceId);
return;
}
Expand Down
35 changes: 28 additions & 7 deletions src/test/java/com/datadoghq/datadog_lambda_java/TracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;

import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

public class TracingTest {

@Test
Expand All @@ -29,10 +32,10 @@ public void makeOutboundHttpTraceHeaders() {

Map<String, String> headers = t.makeOutboundHttpTraceHeaders();

Assert.assertEquals(3, headers.size());
Assert.assertEquals("2", headers.get(cxt.ddSamplingKey));
Assert.assertEquals("12344567890", headers.get(cxt.ddTraceKey));
Assert.assertEquals("6023947403358210776", headers.get(cxt.ddParentKey));
assertEquals(3, headers.size());
assertEquals("2", headers.get(cxt.ddSamplingKey));
assertEquals("12344567890", headers.get(cxt.ddTraceKey));
assertEquals("6023947403358210776", headers.get(cxt.ddParentKey));
}

@Test
Expand All @@ -53,7 +56,7 @@ public void makeOutboundHttpTraceHeaders_no_parent() {

Map<String, String> headers = t.makeOutboundHttpTraceHeaders();

Assert.assertEquals(0, headers.size());
assertEquals(0, headers.size());
}

@Test
Expand Down Expand Up @@ -83,6 +86,24 @@ public void makeOutboundJson() {
expectedTracingInfo.put(cxt.ddParentKey, "6023947403358210776");
expectedTracingInfo.put(cxt.ddSamplingKey, cxt.samplingPriority);

Assert.assertEquals(expectedTracingInfo, tracingInfo);
assertEquals(expectedTracingInfo, tracingInfo);
}

@Test
public void shouldSupportAtLeastThreePartsIn_X_AMZN_TRACE_ID() {
XRayTraceContext xRayTraceContextBefore2023March14 = new XRayTraceContext("Root=1-5e41a79d-e6a0db584029dba86a594b7e;Parent=8c34f5ad8f92d510;Sampled=1");
assertEquals("1-5e41a79d-e6a0db584029dba86a594b7e", xRayTraceContextBefore2023March14.getTraceId());
assertEquals("8c34f5ad8f92d510", xRayTraceContextBefore2023March14.getParentId());

XRayTraceContext xRayTraceContextSince2023March14 = new XRayTraceContext("Root=1-5e41a79d-e6a0db584029dba86a594b7e;Parent=8c34f5ad8f92d510;Sampled=0;Lineage=f627d631:0");
assertEquals("1-5e41a79d-e6a0db584029dba86a594b7e", xRayTraceContextSince2023March14.getTraceId());
assertEquals("8c34f5ad8f92d510", xRayTraceContextSince2023March14.getParentId());
}

@Test
public void shouldIgnoreLessThanThreePartsIn_X_AMZN_TRACE_ID() {
XRayTraceContext xRayTraceContextLessThanThreeParts = new XRayTraceContext("Root=1-5e41a79d-e6a0db584029dba86a594b7e;Parent=8c34f5ad8f92d510");
assertNull(xRayTraceContextLessThanThreeParts.getTraceId());
assertNull(xRayTraceContextLessThanThreeParts.getParentId());
}
}