Skip to content

Commit 50e7b56

Browse files
scottgerringscottgerring
authored
chore: [V2] rename 'core' module to 'common' (#1364)
* First rename * POM updates * Rename namespace * Fix * Fix? * More namespace changes * Rename core examples to core utilities * Finish renaming core utilities * Clean up name/description of module * More change * Fix readme
1 parent 69eafe6 commit 50e7b56

File tree

60 files changed

+99
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+99
-97
lines changed

‎examples/README.md

+4-4

‎examples/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</description>
3030

3131
<modules>
32-
<module>powertools-examples-core/sam</module>
33-
<module>powertools-examples-core/cdk/app</module>
34-
<module>powertools-examples-core/cdk/infra</module>
32+
<module>powertools-examples-core-utilities/sam</module>
33+
<module>powertools-examples-core-utilities/cdk/app</module>
34+
<module>powertools-examples-core-utilities/cdk/infra</module>
3535
<module>powertools-examples-idempotency</module>
3636
<module>powertools-examples-parameters</module>
3737
<module>powertools-examples-serialization</module>

‎examples/powertools-examples-core-utilities/.gitignore

Whitespace-only changes.

‎examples/powertools-examples-core/README.md renamed to ‎examples/powertools-examples-core-utilities/README.md

‎examples/powertools-examples-core/cdk/README.md renamed to ‎examples/powertools-examples-core-utilities/cdk/README.md

+5-5

‎examples/powertools-examples-core/cdk/app/events/event.json renamed to ‎examples/powertools-examples-core-utilities/cdk/app/events/event.json

File renamed without changes.

‎examples/powertools-examples-core/cdk/app/pom.xml renamed to ‎examples/powertools-examples-core-utilities/cdk/app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>software.amazon.lambda.examples</groupId>
66
<version>1.16.1</version>
7-
<artifactId>powertools-examples-core-cdk</artifactId>
7+
<artifactId>powertools-examples-core-utilities-cdk</artifactId>
88
<packaging>jar</packaging>
99

1010
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>

‎examples/powertools-examples-core/cdk/app/src/main/java/helloworld/App.java renamed to ‎examples/powertools-examples-core-utilities/cdk/app/src/main/java/helloworld/App.java

File renamed without changes.

‎examples/powertools-examples-core/cdk/app/src/main/java/helloworld/AppStream.java renamed to ‎examples/powertools-examples-core-utilities/cdk/app/src/main/java/helloworld/AppStream.java

File renamed without changes.

‎examples/powertools-examples-core/cdk/app/src/main/resources/log4j2.xml renamed to ‎examples/powertools-examples-core-utilities/cdk/app/src/main/resources/log4j2.xml

File renamed without changes.

‎examples/powertools-examples-core/cdk/app/src/test/java/helloworld/AppTest.java renamed to ‎examples/powertools-examples-core-utilities/cdk/app/src/test/java/helloworld/AppTest.java

File renamed without changes.

‎examples/powertools-examples-core/cdk/infra/cdk.json renamed to ‎examples/powertools-examples-core-utilities/cdk/infra/cdk.json

File renamed without changes.

‎examples/powertools-examples-core/cdk/infra/pom.xml renamed to ‎examples/powertools-examples-core-utilities/cdk/infra/pom.xml

File renamed without changes.

‎examples/powertools-examples-core/cdk/infra/src/main/java/cdk/CdkApp.java renamed to ‎examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkApp.java

File renamed without changes.

‎examples/powertools-examples-core/cdk/infra/src/main/java/cdk/CdkStack.java renamed to ‎examples/powertools-examples-core-utilities/cdk/infra/src/main/java/cdk/CdkStack.java

File renamed without changes.

‎examples/powertools-examples-core/cdk/infra/src/test/java/cdk/CdkStackTest.java renamed to ‎examples/powertools-examples-core-utilities/cdk/infra/src/test/java/cdk/CdkStackTest.java

File renamed without changes.

‎examples/powertools-examples-core/sam/README.md renamed to ‎examples/powertools-examples-core-utilities/sam/README.md

‎examples/powertools-examples-core/sam/events/event.json renamed to ‎examples/powertools-examples-core-utilities/sam/events/event.json

File renamed without changes.

‎examples/powertools-examples-core/sam/pom.xml renamed to ‎examples/powertools-examples-core-utilities/sam/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
<groupId>software.amazon.lambda.examples</groupId>
66
<version>2.0.0-SNAPSHOT</version>
7-
<artifactId>powertools-examples-core</artifactId>
7+
<artifactId>powertools-examples-core-utilities</artifactId>
88
<packaging>jar</packaging>
99

10-
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
10+
<name>Powertools for AWS Lambda (Java) library Examples - Core Utilities (logging, tracing, metrics)</name>
1111

1212
<properties>
1313
<log4j.version>2.20.0</log4j.version>

‎examples/powertools-examples-core/sam/src/main/java/helloworld/App.java renamed to ‎examples/powertools-examples-core-utilities/sam/src/main/java/helloworld/App.java

File renamed without changes.

‎examples/powertools-examples-core/sam/src/main/java/helloworld/AppStream.java renamed to ‎examples/powertools-examples-core-utilities/sam/src/main/java/helloworld/AppStream.java

File renamed without changes.

‎examples/powertools-examples-core/sam/src/main/resources/log4j2.xml renamed to ‎examples/powertools-examples-core-utilities/sam/src/main/resources/log4j2.xml

File renamed without changes.

‎examples/powertools-examples-core/sam/src/test/java/helloworld/AppTest.java renamed to ‎examples/powertools-examples-core-utilities/sam/src/test/java/helloworld/AppTest.java

File renamed without changes.

‎examples/powertools-examples-core/sam/template.yaml renamed to ‎examples/powertools-examples-core-utilities/sam/template.yaml

File renamed without changes.

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</licenses>
4242

4343
<modules>
44-
<module>powertools-core</module>
44+
<module>powertools-common</module>
4545
<module>powertools-serialization</module>
4646
<module>powertools-logging</module>
4747
<module>powertools-tracing</module>
@@ -105,7 +105,7 @@
105105
<dependencies>
106106
<dependency>
107107
<groupId>software.amazon.lambda</groupId>
108-
<artifactId>powertools-core</artifactId>
108+
<artifactId>powertools-common</artifactId>
109109
<version>${project.version}</version>
110110
</dependency>
111111
<dependency>

‎powertools-core/pom.xml renamed to ‎powertools-common/pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
2020

21-
<artifactId>powertools-core</artifactId>
21+
<artifactId>powertools-common</artifactId>
2222
<packaging>jar</packaging>
2323

2424
<parent>
@@ -27,10 +27,8 @@
2727
<version>2.0.0-SNAPSHOT</version>
2828
</parent>
2929

30-
<name>Powertools for AWS Lambda (Java) library Core</name>
31-
<description>
32-
A suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
33-
</description>
30+
<name>Powertools for AWS Lambda (Java) library Common Internal Utilities</name>
31+
<description>Internal utilities shared by the Powertools for AWS Lambda (Java) modules. Do not use directly in your project.</description>
3432
<url>https://aws.amazon.com/lambda/</url>
3533
<issueManagement>
3634
<system>GitHub Issues</system>
@@ -123,4 +121,4 @@
123121
</plugins>
124122
</build>
125123

126-
</project>
124+
</project>

‎powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaConstants.java renamed to ‎powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/LambdaConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

1717
public class LambdaConstants {
1818
public static final String LAMBDA_FUNCTION_NAME_ENV = "AWS_LAMBDA_FUNCTION_NAME";

‎powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java renamed to ‎powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/LambdaHandlerProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

1717
import static java.util.Optional.empty;
1818
import static java.util.Optional.of;
19-
import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
19+
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2020

2121
import com.amazonaws.services.lambda.runtime.Context;
2222
import com.amazonaws.services.lambda.runtime.RequestHandler;

‎powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/SystemWrapper.java renamed to ‎powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/SystemWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

1717
public class SystemWrapper {
1818
private SystemWrapper() {

‎powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/UserAgentConfigurator.java renamed to ‎powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/UserAgentConfigurator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

17-
import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
17+
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
1818

1919
import java.io.FileInputStream;
2020
import java.io.IOException;

‎powertools-core/src/main/resources-filtered/version.properties renamed to ‎powertools-common/src/main/resources-filtered/version.properties

File renamed without changes.

‎powertools-core/src/test/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessorTest.java renamed to ‎powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/LambdaHandlerProcessorTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
1818
import static org.junit.jupiter.api.Assertions.assertNotNull;
1919
import static org.mockito.Mockito.mock;
2020
import static org.mockito.Mockito.mockStatic;
2121
import static org.mockito.Mockito.when;
22-
import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
22+
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2323

2424
import com.amazonaws.services.lambda.runtime.Context;
2525
import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -31,6 +31,9 @@
3131
import org.aspectj.lang.Signature;
3232
import org.junit.jupiter.api.Test;
3333
import org.mockito.MockedStatic;
34+
import software.amazon.lambda.powertools.common.internal.LambdaConstants;
35+
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
36+
import software.amazon.lambda.powertools.common.internal.SystemWrapper;
3437

3538
class LambdaHandlerProcessorTest {
3639

‎powertools-core/src/test/java/software/amazon/lambda/powertools/core/internal/UserAgentConfiguratorTest.java renamed to ‎powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/UserAgentConfiguratorTest.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
*
1313
*/
1414

15-
package software.amazon.lambda.powertools.core.internal;
15+
package software.amazon.lambda.powertools.common.internal;
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
1818
import static org.mockito.Mockito.mockStatic;
19-
import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
20-
import static software.amazon.lambda.powertools.core.internal.UserAgentConfigurator.AWS_EXECUTION_ENV;
21-
import static software.amazon.lambda.powertools.core.internal.UserAgentConfigurator.VERSION_KEY;
22-
import static software.amazon.lambda.powertools.core.internal.UserAgentConfigurator.VERSION_PROPERTIES_FILENAME;
23-
import static software.amazon.lambda.powertools.core.internal.UserAgentConfigurator.getVersionFromProperties;
19+
import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.AWS_EXECUTION_ENV;
20+
import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.VERSION_KEY;
21+
import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.VERSION_PROPERTIES_FILENAME;
22+
import static software.amazon.lambda.powertools.common.internal.UserAgentConfigurator.getVersionFromProperties;
23+
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
24+
2425

2526
import java.io.File;
2627
import java.util.Objects;

‎powertools-core/src/test/resources/test.properties renamed to ‎powertools-common/src/test/resources/test.properties

File renamed without changes.

‎powertools-core/src/test/resources/unreadable.properties renamed to ‎powertools-common/src/test/resources/unreadable.properties

File renamed without changes.

‎powertools-idempotency/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependencies>
5858
<dependency>
5959
<groupId>software.amazon.lambda</groupId>
60-
<artifactId>powertools-core</artifactId>
60+
<artifactId>powertools-common</artifactId>
6161
</dependency>
6262
<dependency>
6363
<groupId>software.amazon.lambda</groupId>

‎powertools-idempotency/src/main/java/software/amazon/lambda/powertools/idempotency/internal/IdempotentAspect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package software.amazon.lambda.powertools.idempotency.internal;
1616

17-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
17+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.placedOnRequestHandler;
1818

1919
import com.amazonaws.services.lambda.runtime.Context;
2020
import com.fasterxml.jackson.databind.JsonNode;

‎powertools-idempotency/src/main/java/software/amazon/lambda/powertools/idempotency/persistence/BasePersistenceStore.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package software.amazon.lambda.powertools.idempotency.persistence;
1616

17-
import static software.amazon.lambda.powertools.core.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
17+
import static software.amazon.lambda.powertools.common.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
1818

1919
import com.fasterxml.jackson.core.JsonProcessingException;
2020
import com.fasterxml.jackson.databind.JsonNode;

‎powertools-idempotency/src/main/java/software/amazon/lambda/powertools/idempotency/persistence/DynamoDBPersistenceStore.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
package software.amazon.lambda.powertools.idempotency.persistence;
1616

17-
import static software.amazon.lambda.powertools.core.internal.LambdaConstants.AWS_REGION_ENV;
18-
import static software.amazon.lambda.powertools.core.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
17+
import static software.amazon.lambda.powertools.common.internal.LambdaConstants.AWS_REGION_ENV;
18+
import static software.amazon.lambda.powertools.common.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
1919
import static software.amazon.lambda.powertools.idempotency.persistence.DataRecord.Status.INPROGRESS;
2020

2121
import java.time.Instant;
@@ -40,7 +40,7 @@
4040
import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
4141
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
4242
import software.amazon.awssdk.utils.StringUtils;
43-
import software.amazon.lambda.powertools.core.internal.UserAgentConfigurator;
43+
import software.amazon.lambda.powertools.common.internal.UserAgentConfigurator;
4444
import software.amazon.lambda.powertools.idempotency.Constants;
4545
import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemAlreadyExistsException;
4646
import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemNotFoundException;

‎powertools-large-messages/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependencies>
5757
<dependency>
5858
<groupId>software.amazon.lambda</groupId>
59-
<artifactId>powertools-core</artifactId>
59+
<artifactId>powertools-common</artifactId>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.aspectj</groupId>

‎powertools-large-messages/src/main/java/software/amazon/lambda/powertools/largemessages/LargeMessageConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package software.amazon.lambda.powertools.largemessages;
1616

17-
import static software.amazon.lambda.powertools.core.internal.LambdaConstants.AWS_REGION_ENV;
17+
import static software.amazon.lambda.powertools.common.internal.LambdaConstants.AWS_REGION_ENV;
1818

1919
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
2020
import software.amazon.awssdk.regions.Region;

‎powertools-logging/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependencies>
5858
<dependency>
5959
<groupId>software.amazon.lambda</groupId>
60-
<artifactId>powertools-core</artifactId>
60+
<artifactId>powertools-common</artifactId>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.amazonaws</groupId>

‎powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
import static java.nio.charset.StandardCharsets.UTF_8;
1818
import static java.util.Optional.empty;
1919
import static java.util.Optional.ofNullable;
20-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.coldStartDone;
21-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.extractContext;
22-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.getXrayTraceId;
23-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isColdStart;
24-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isHandlerMethod;
25-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
26-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnStreamHandler;
27-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName;
20+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.coldStartDone;
21+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.extractContext;
22+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.getXrayTraceId;
23+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isColdStart;
24+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isHandlerMethod;
25+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.placedOnRequestHandler;
26+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.placedOnStreamHandler;
27+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.serviceName;
2828
import static software.amazon.lambda.powertools.logging.LoggingUtils.appendKey;
2929
import static software.amazon.lambda.powertools.logging.LoggingUtils.appendKeys;
3030
import static software.amazon.lambda.powertools.logging.LoggingUtils.objectMapper;

‎powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static org.mockito.Mockito.when;
2525
import static org.mockito.MockitoAnnotations.openMocks;
2626
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
27-
import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
27+
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2828

2929
import com.amazonaws.services.lambda.runtime.Context;
3030
import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -59,8 +59,8 @@
5959
import org.junit.jupiter.params.ParameterizedTest;
6060
import org.mockito.Mock;
6161
import org.mockito.MockedStatic;
62-
import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
63-
import software.amazon.lambda.powertools.core.internal.SystemWrapper;
62+
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
63+
import software.amazon.lambda.powertools.common.internal.SystemWrapper;
6464
import software.amazon.lambda.powertools.logging.handlers.PowerLogToolApiGatewayHttpApiCorrelationId;
6565
import software.amazon.lambda.powertools.logging.handlers.PowerLogToolApiGatewayRestApiCorrelationId;
6666
import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabled;

‎powertools-metrics/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependencies>
5959
<dependency>
6060
<groupId>software.amazon.lambda</groupId>
61-
<artifactId>powertools-core</artifactId>
61+
<artifactId>powertools-common</artifactId>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.amazonaws</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import static java.util.Objects.requireNonNull;
1818
import static java.util.Optional.ofNullable;
19-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.getXrayTraceId;
19+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.getXrayTraceId;
2020
import static software.amazon.lambda.powertools.metrics.internal.LambdaMetricsAspect.REQUEST_ID_PROPERTY;
2121
import static software.amazon.lambda.powertools.metrics.internal.LambdaMetricsAspect.TRACE_ID_PROPERTY;
2222

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import static software.amazon.cloudwatchlogs.emf.model.MetricsLoggerHelper.dimensionsCount;
1818
import static software.amazon.cloudwatchlogs.emf.model.MetricsLoggerHelper.hasNoMetrics;
19-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.coldStartDone;
20-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.extractContext;
21-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isColdStart;
22-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isHandlerMethod;
23-
import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName;
19+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.coldStartDone;
20+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.extractContext;
21+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isColdStart;
22+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isHandlerMethod;
23+
import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.serviceName;
2424
import static software.amazon.lambda.powertools.metrics.MetricsUtils.hasDefaultDimension;
2525
import static software.amazon.lambda.powertools.metrics.MetricsUtils.metricsLogger;
2626

@@ -34,7 +34,7 @@
3434
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
3535
import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
3636
import software.amazon.cloudwatchlogs.emf.model.Unit;
37-
import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
37+
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
3838
import software.amazon.lambda.powertools.metrics.Metrics;
3939
import software.amazon.lambda.powertools.metrics.MetricsUtils;
4040
import software.amazon.lambda.powertools.metrics.ValidationException;

0 commit comments

Comments
 (0)