Skip to content

chore: consistent field names for trace and req id with logger #309

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 2, 2021
Merged

chore: consistent field names for trace and req id with logger #309

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
4 changes: 2 additions & 2 deletions ...src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
@Aspect
public class LambdaMetricsAspect {
private static final String NAMESPACE = System.getenv("POWERTOOLS_METRICS_NAMESPACE");
public static final String TRACE_ID_PROPERTY = "XrayTraceId";
public static final String REQUEST_ID_PROPERTY = "AwsRequestId";
public static final String TRACE_ID_PROPERTY = "xray_trace_id";
public static final String REQUEST_ID_PROPERTY = "function_request_id";

@SuppressWarnings({"EmptyMethod"})
@Pointcut("@annotation(metrics)")
Expand Down
4 changes: 2 additions & 2 deletions ...ls-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void singleMetricsCaptureUtility() {
.containsEntry("Metric1", 1.0)
.containsEntry("Dimension1", "Value1")
.containsKey("_aws")
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
});
}
}
Expand All @@ -85,7 +85,7 @@ void singleMetricsCaptureUtilityWithDefaultNameSpace() {
.containsEntry("Metric1", 1.0)
.containsEntry("Dimension1", "Value1")
.containsKey("_aws")
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");

Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");

Expand Down
20 changes: 10 additions & 10 deletions ...test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ public void metricsWithoutColdStart() {
.containsEntry("Metric2", 1.0)
.containsEntry("Dimension1", "Value1")
.containsKey("_aws")
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793")
.containsEntry("AwsRequestId", "123ABC");
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793")
.containsEntry("function_request_id", "123ABC");

Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");

Expand All @@ -103,7 +103,7 @@ public void metricsWithoutColdStart() {
assertThat(logAsJson)
.containsEntry("Metric1", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");
});
}
Expand All @@ -127,7 +127,7 @@ public void metricsWithColdStart() {
.doesNotContainKey("Metric1")
.containsEntry("ColdStart", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");

logAsJson = readAsJson(s[1]);
Expand All @@ -136,7 +136,7 @@ public void metricsWithColdStart() {
.doesNotContainKey("ColdStart")
.containsEntry("Metric1", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");
});
}
Expand All @@ -160,7 +160,7 @@ public void noColdStartMetricsWhenColdStartDone() {
.doesNotContainKey("Metric1")
.containsEntry("ColdStart", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");

logAsJson = readAsJson(s[1]);
Expand All @@ -169,7 +169,7 @@ public void noColdStartMetricsWhenColdStartDone() {
.doesNotContainKey("ColdStart")
.containsEntry("Metric1", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");

logAsJson = readAsJson(s[2]);
Expand All @@ -178,7 +178,7 @@ public void noColdStartMetricsWhenColdStartDone() {
.doesNotContainKey("ColdStart")
.containsEntry("Metric1", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");
});
}
Expand All @@ -200,7 +200,7 @@ public void metricsWithStreamHandler() throws IOException {
assertThat(logAsJson)
.containsEntry("Metric1", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");
});
}
Expand Down Expand Up @@ -277,7 +277,7 @@ public void metricsPublishedEvenHandlerThrowsException() {
assertThat(logAsJson)
.containsEntry("CoolMetric", 1.0)
.containsEntry("Service", "booking")
.containsEntry("AwsRequestId", "123ABC")
.containsEntry("function_request_id", "123ABC")
.containsKey("_aws");
});
}
Expand Down