Skip to content

Commit 89f379a

Browse files
committed
chore(metrics): deprecated MetricsUtils.withMetricLogger in favor of MetricsUtils.withMetricsLogger
closes aws-powertools#1059
1 parent 3037898 commit 89f379a

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static void withSingleMetric(final String name,
8181
final double value,
8282
final Unit unit,
8383
final Consumer<MetricsLogger> logger) {
84-
withMetricLogger(metricsLogger -> {
84+
withMetricsLogger(metricsLogger -> {
8585
metricsLogger.putMetric(name, value, unit);
8686
logger.accept(metricsLogger);
8787
});
@@ -103,7 +103,7 @@ public static void withSingleMetric(final String name,
103103
final Unit unit,
104104
final String namespace,
105105
final Consumer<MetricsLogger> logger) {
106-
withMetricLogger(metricsLogger -> {
106+
withMetricsLogger(metricsLogger -> {
107107
metricsLogger.setNamespace(namespace);
108108
metricsLogger.putMetric(name, value, unit);
109109
logger.accept(metricsLogger);
@@ -118,7 +118,7 @@ public static void withSingleMetric(final String name,
118118
*
119119
* @param logger the MetricsLogger
120120
*/
121-
public static void withMetricLogger(final Consumer<MetricsLogger> logger) {
121+
public static void withMetricsLogger(final Consumer<MetricsLogger> logger) {
122122
MetricsLogger metricsLogger = logger();
123123

124124
try {
@@ -130,6 +130,20 @@ public static void withMetricLogger(final Consumer<MetricsLogger> logger) {
130130
}
131131
}
132132

133+
/**
134+
* Provide and immediately flush a {@link MetricsLogger}. It uses the default namespace
135+
* specified either on {@link Metrics} annotation or via POWERTOOLS_METRICS_NAMESPACE env var.
136+
* It by default captures function_request_id as property if used together with {@link Metrics} annotation. It will also
137+
* capture xray_trace_id as property if tracing is enabled.
138+
*
139+
* @param logger the MetricsLogger
140+
*
141+
* @deprecated use {@link MetricsUtils#withMetricsLogger} instead
142+
*/
143+
public static void withMetricLogger(final Consumer<MetricsLogger> logger) {
144+
withMetricLogger(logger);
145+
}
146+
133147
public static DimensionSet[] getDefaultDimensions() {
134148
return Arrays.copyOf(defaultDimensions, defaultDimensions.length);
135149
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void metricsLoggerCaptureUtilityWithDefaultNameSpace() {
130130
mocked.when(() -> SystemWrapper.getenv("POWERTOOLS_METRICS_NAMESPACE")).thenReturn("GlobalName");
131131
internalWrapper.when(() -> getenv("_X_AMZN_TRACE_ID")).thenReturn("Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1\"");
132132

133-
MetricsUtils.withMetricLogger(metricsLogger -> {
133+
MetricsUtils.withMetricsLogger(metricsLogger -> {
134134
metricsLogger.setDimensions(DimensionSet.of("Dimension1", "Value1"));
135135
metricsLogger.putMetric("Metric1", 1, Unit.COUNT);
136136
});

0 commit comments

Comments
 (0)