Skip to content

Commit ca7f1a1

Browse files
pankajagrawal16Pankaj Agrawal
pankajagrawal16
and
Pankaj Agrawal
authored
chore: consistent field names for trace and req id with logger (#309)
Co-authored-by: Pankaj Agrawal <pankaagr@amazon.com>
1 parent 86d7448 commit ca7f1a1

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
@Aspect
2929
public class LambdaMetricsAspect {
3030
private static final String NAMESPACE = System.getenv("POWERTOOLS_METRICS_NAMESPACE");
31-
public static final String TRACE_ID_PROPERTY = "XrayTraceId";
32-
public static final String REQUEST_ID_PROPERTY = "AwsRequestId";
31+
public static final String TRACE_ID_PROPERTY = "xray_trace_id";
32+
public static final String REQUEST_ID_PROPERTY = "function_request_id";
3333

3434
@SuppressWarnings({"EmptyMethod"})
3535
@Pointcut("@annotation(metrics)")

‎powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void singleMetricsCaptureUtility() {
6161
.containsEntry("Metric1", 1.0)
6262
.containsEntry("Dimension1", "Value1")
6363
.containsKey("_aws")
64-
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
64+
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
6565
});
6666
}
6767
}
@@ -85,7 +85,7 @@ void singleMetricsCaptureUtilityWithDefaultNameSpace() {
8585
.containsEntry("Metric1", 1.0)
8686
.containsEntry("Dimension1", "Value1")
8787
.containsKey("_aws")
88-
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
88+
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
8989

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

‎powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public void metricsWithoutColdStart() {
8989
.containsEntry("Metric2", 1.0)
9090
.containsEntry("Dimension1", "Value1")
9191
.containsKey("_aws")
92-
.containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793")
93-
.containsEntry("AwsRequestId", "123ABC");
92+
.containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793")
93+
.containsEntry("function_request_id", "123ABC");
9494

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

@@ -103,7 +103,7 @@ public void metricsWithoutColdStart() {
103103
assertThat(logAsJson)
104104
.containsEntry("Metric1", 1.0)
105105
.containsEntry("Service", "booking")
106-
.containsEntry("AwsRequestId", "123ABC")
106+
.containsEntry("function_request_id", "123ABC")
107107
.containsKey("_aws");
108108
});
109109
}
@@ -127,7 +127,7 @@ public void metricsWithColdStart() {
127127
.doesNotContainKey("Metric1")
128128
.containsEntry("ColdStart", 1.0)
129129
.containsEntry("Service", "booking")
130-
.containsEntry("AwsRequestId", "123ABC")
130+
.containsEntry("function_request_id", "123ABC")
131131
.containsKey("_aws");
132132

133133
logAsJson = readAsJson(s[1]);
@@ -136,7 +136,7 @@ public void metricsWithColdStart() {
136136
.doesNotContainKey("ColdStart")
137137
.containsEntry("Metric1", 1.0)
138138
.containsEntry("Service", "booking")
139-
.containsEntry("AwsRequestId", "123ABC")
139+
.containsEntry("function_request_id", "123ABC")
140140
.containsKey("_aws");
141141
});
142142
}
@@ -160,7 +160,7 @@ public void noColdStartMetricsWhenColdStartDone() {
160160
.doesNotContainKey("Metric1")
161161
.containsEntry("ColdStart", 1.0)
162162
.containsEntry("Service", "booking")
163-
.containsEntry("AwsRequestId", "123ABC")
163+
.containsEntry("function_request_id", "123ABC")
164164
.containsKey("_aws");
165165

166166
logAsJson = readAsJson(s[1]);
@@ -169,7 +169,7 @@ public void noColdStartMetricsWhenColdStartDone() {
169169
.doesNotContainKey("ColdStart")
170170
.containsEntry("Metric1", 1.0)
171171
.containsEntry("Service", "booking")
172-
.containsEntry("AwsRequestId", "123ABC")
172+
.containsEntry("function_request_id", "123ABC")
173173
.containsKey("_aws");
174174

175175
logAsJson = readAsJson(s[2]);
@@ -178,7 +178,7 @@ public void noColdStartMetricsWhenColdStartDone() {
178178
.doesNotContainKey("ColdStart")
179179
.containsEntry("Metric1", 1.0)
180180
.containsEntry("Service", "booking")
181-
.containsEntry("AwsRequestId", "123ABC")
181+
.containsEntry("function_request_id", "123ABC")
182182
.containsKey("_aws");
183183
});
184184
}
@@ -200,7 +200,7 @@ public void metricsWithStreamHandler() throws IOException {
200200
assertThat(logAsJson)
201201
.containsEntry("Metric1", 1.0)
202202
.containsEntry("Service", "booking")
203-
.containsEntry("AwsRequestId", "123ABC")
203+
.containsEntry("function_request_id", "123ABC")
204204
.containsKey("_aws");
205205
});
206206
}
@@ -277,7 +277,7 @@ public void metricsPublishedEvenHandlerThrowsException() {
277277
assertThat(logAsJson)
278278
.containsEntry("CoolMetric", 1.0)
279279
.containsEntry("Service", "booking")
280-
.containsEntry("AwsRequestId", "123ABC")
280+
.containsEntry("function_request_id", "123ABC")
281281
.containsKey("_aws");
282282
});
283283
}

0 commit comments

Comments
 (0)