diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index edc5ae661..35bbce70b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,4 +27,4 @@ jobs:
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn -B package -P !build-extras -Dmaven.javadoc.skip=true --file pom.xml
+ run: mvn -B package --file pom.xml
diff --git a/.gitignore b/.gitignore
index 91664c90f..01a12d57f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,4 +97,4 @@ docs/node_modules
docs/.cache
docs/public
/example/.aws-sam/
-/example/HelloWorldFunction/.aws-sam/
\ No newline at end of file
+/example/HelloWorldFunction/.aws-sam/
diff --git a/README.md b/README.md
index 7972922b4..48cd28d9a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,12 @@ Powertools is available in Maven Central. You can use your favourite dependency
...
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-tracing
+ YOUR_REQUIRED_VERSION
+
+
+ software.amazon.lambda
+ powertools-loggingYOUR_REQUIRED_VERSION
...
@@ -40,7 +45,11 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-logging
+
+
+ software.amazon.lambda
+ powertools-tracing
@@ -86,3 +95,10 @@ Powertools extends the functionality of Log4J. Below is an example `log4j2.xml`
## License
This library is licensed under the Apache License, Version 2.0. See the LICENSE file.
+
+
+
+Cold Start
+
+946.58 ms - original
+943.96 ms - power tools
\ No newline at end of file
diff --git a/docs/content/index.mdx b/docs/content/index.mdx
index b544f7fbd..56a95a8ed 100644
--- a/docs/content/index.mdx
+++ b/docs/content/index.mdx
@@ -7,7 +7,7 @@ Powertools is a suite of utilities for AWS Lambda Functions that makes tracing w
## Install
-Powertools is available in Maven Central. You can use your favourite dependency management tool to install it
+Powertools dependencies are available in Maven Central. You can use your favourite dependency management tool to install it
* [maven](https://maven.apache.org/):
```xml
@@ -15,7 +15,12 @@ Powertools is available in Maven Central. You can use your favourite dependency
...
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-tracing
+ YOUR_REQUIRED_VERSION
+
+
+ software.amazon.lambda
+ powertools-loggingYOUR_REQUIRED_VERSION
...
@@ -39,7 +44,11 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-tracing
+
+
+ software.amazon.lambda
+ powertools-logging
diff --git a/example/HelloWorldFunction/pom.xml b/example/HelloWorldFunction/pom.xml
index e24058662..e253b34ff 100644
--- a/example/HelloWorldFunction/pom.xml
+++ b/example/HelloWorldFunction/pom.xml
@@ -15,7 +15,12 @@
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-tracing
+ 0.1.0-SNAPSHOT
+
+
+ software.amazon.lambda
+ powertools-logging0.1.0-SNAPSHOT
@@ -66,7 +71,11 @@
software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-tracing
+
+
+ software.amazon.lambda
+ powertools-logging
diff --git a/example/HelloWorldFunction/src/main/java/helloworld/App.java b/example/HelloWorldFunction/src/main/java/helloworld/App.java
index 5369ffa1c..ab44e5771 100644
--- a/example/HelloWorldFunction/src/main/java/helloworld/App.java
+++ b/example/HelloWorldFunction/src/main/java/helloworld/App.java
@@ -16,13 +16,13 @@
import com.amazonaws.xray.entities.Entity;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import software.amazon.lambda.logging.PowerLogger;
-import software.amazon.lambda.logging.PowerToolsLogging;
-import software.amazon.lambda.tracing.PowerToolsTracing;
-import software.amazon.lambda.tracing.PowerTracer;
+import software.amazon.lambda.powertools.logging.PowerLogger;
+import software.amazon.lambda.powertools.logging.PowerToolsLogging;
+import software.amazon.lambda.powertools.tracing.PowerToolsTracing;
+import software.amazon.lambda.powertools.tracing.PowerTracer;
-import static software.amazon.lambda.tracing.PowerTracer.putMetadata;
-import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment;
+import static software.amazon.lambda.powertools.tracing.PowerTracer.putMetadata;
+import static software.amazon.lambda.powertools.tracing.PowerTracer.withEntitySubsegment;
/**
* Handler for requests to Lambda function.
diff --git a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
index b752f0c05..e0f3bda9f 100644
--- a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
+++ b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
@@ -8,7 +8,7 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import com.fasterxml.jackson.databind.ObjectMapper;
-import software.amazon.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.powertools.logging.PowerToolsLogging;
public class AppStream implements RequestStreamHandler {
private static final ObjectMapper mapper = new ObjectMapper();
diff --git a/pom.xml b/pom.xml
index cb13dc888..1ae0030c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
4.0.0software.amazon.lambda
- aws-lambda-powertools-java
+ powertools-parent0.1.0-SNAPSHOT
- jar
+ pom
- AWS Lambda Powertools Java library
+ AWS Lambda Powertools Java library Parent
A suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
@@ -25,9 +25,17 @@
repo
+
+
+ powertools-core
+ powertools-logging
+ powertools-tracing
+
+
https://github.com/awslabs/aws-lambda-powertools-java.git
+
AWS Lambda Powertools team
@@ -44,6 +52,16 @@
1.9.62.4.0UTF-8
+ 1.2.1
+ 3.8.1
+ 1.12.1
+ 2.22.2
+ 0.8.5
+ 2.7
+ 1.6.8
+ 2.10.3
+ 2.4
+ 1.6
@@ -53,104 +71,164 @@
-
-
- com.amazonaws
- aws-lambda-java-core
- 1.2.1
-
-
- com.fasterxml.jackson.core
- jackson-databind
- ${jackson.version}
-
-
-
- org.apache.logging.log4j
- log4j-core
- ${log4j.version}
-
-
- org.apache.logging.log4j
- log4j-api
- ${log4j.version}
-
-
- org.aspectj
- aspectjrt
- ${aspectj.version}
-
-
- com.amazonaws
- aws-xray-recorder-sdk-core
- ${aws.xray.recorder.version}
-
-
- com.amazonaws
- aws-xray-recorder-sdk-aws-sdk
- ${aws.xray.recorder.version}
-
-
- com.amazonaws
- aws-xray-recorder-sdk-aws-sdk-instrumentor
- ${aws.xray.recorder.version}
-
-
- com.amazonaws
- aws-xray-recorder-sdk-aws-sdk-v2
- ${aws.xray.recorder.version}
-
-
- com.amazonaws
- aws-xray-recorder-sdk-aws-sdk-v2-instrumentor
- ${aws.xray.recorder.version}
-
+
+
+
+ software.amazon.lambda
+ powertools-core
+ ${project.version}
+
+
+ com.amazonaws
+ aws-lambda-java-core
+ ${lambda.core.version}
+
+
+ org.aspectj
+ aspectjrt
+ ${aspectj.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j.version}
+
+
+ org.apache.logging.log4j
+ log4j-api
+ ${log4j.version}
+
+
+ com.amazonaws
+ aws-xray-recorder-sdk-core
+ ${aws.xray.recorder.version}
+
+
+ com.amazonaws
+ aws-xray-recorder-sdk-aws-sdk
+ ${aws.xray.recorder.version}
+
+
+ com.amazonaws
+ aws-xray-recorder-sdk-aws-sdk-instrumentor
+ ${aws.xray.recorder.version}
+
+
+ com.amazonaws
+ aws-xray-recorder-sdk-aws-sdk-v2
+ ${aws.xray.recorder.version}
+
+
+ com.amazonaws
+ aws-xray-recorder-sdk-aws-sdk-v2-instrumentor
+ ${aws.xray.recorder.version}
+
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.6.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- 5.6.2
- test
-
-
- org.apache.commons
- commons-lang3
- 3.11
- test
-
-
- org.mockito
- mockito-core
- 3.3.3
- test
-
-
- org.aspectj
- aspectjweaver
- ${aspectj.version}
- test
-
-
- org.assertj
- assertj-core
- 3.9.1
- test
-
-
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.6.2
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.6.2
+ test
+
+
+ org.apache.commons
+ commons-lang3
+ 3.11
+ test
+
+
+ org.mockito
+ mockito-core
+ 3.3.3
+ test
+
+
+ org.aspectj
+ aspectjweaver
+ ${aspectj.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ 3.9.1
+ test
+
+
+ org.aspectj
+ aspectjtools
+ ${aspectj.version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+
+
+ com.nickwongdev
+ aspectj-maven-plugin
+ ${aspectj-maven-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+ ${cobertura-maven-plugin.version}
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ ${nexus-staging-maven-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${maven-javadoc-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ ${maven-gpg-plugin.version}
+
+
+ org.apache.maven.pluginsmaven-compiler-plugin
- 3.8.1${maven.compiler.source}${maven.compiler.target}
@@ -161,7 +239,6 @@
com.nickwongdevaspectj-maven-plugin
- 1.12.1${maven.compiler.source}${maven.compiler.target}
@@ -189,12 +266,10 @@
org.apache.maven.pluginsmaven-surefire-plugin
- 2.22.2org.jacocojacoco-maven-plugin
- 0.8.5
@@ -214,7 +289,6 @@
org.codehaus.mojocobertura-maven-plugin
- 2.7html
@@ -226,7 +300,6 @@
org.sonatype.pluginsnexus-staging-maven-plugin
- 1.6.8truesonatype-nexus-staging
@@ -245,7 +318,6 @@
org.apache.maven.pluginsmaven-gpg-plugin
- 1.6sign-artifacts
@@ -275,7 +347,6 @@
org.apache.maven.pluginsmaven-source-plugin
- 2.4attach-sources
@@ -288,7 +359,6 @@
org.apache.maven.pluginsmaven-javadoc-plugin
- 2.10.3-Xdoclint:nonefalse
diff --git a/powertools-core/pom.xml b/powertools-core/pom.xml
new file mode 100644
index 000000000..ec6984a95
--- /dev/null
+++ b/powertools-core/pom.xml
@@ -0,0 +1,87 @@
+
+
+ 4.0.0
+
+ powertools-core
+ jar
+
+
+ powertools-parent
+ software.amazon.lambda
+ 0.1.0-SNAPSHOT
+
+
+ AWS Lambda Powertools Java library Core
+
+ A suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
+
+ https://aws.amazon.com/lambda/
+
+ GitHub Issues
+ https://github.com/awslabs/aws-lambda-powertools-java/issues
+
+
+
+ https://github.com/awslabs/aws-lambda-powertools-java.git
+
+
+
+ AWS Lambda Powertools team
+ Amazon Web Services
+ https://aws.amazon.com/
+
+
+
+
+
+ ossrh
+ https://aws.oss.sonatype.org/content/repositories/snapshots
+
+
+
+
+
+ com.amazonaws
+ aws-lambda-java-core
+
+
+ org.aspectj
+ aspectjrt
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.apache.commons
+ commons-lang3
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.aspectj
+ aspectjweaver
+ test
+
+
+ org.assertj
+ assertj-core
+ test
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java b/powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java
similarity index 97%
rename from src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java
rename to powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java
index c265e67ec..99eccea4a 100644
--- a/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java
+++ b/powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.internal;
+package software.amazon.lambda.powertools.core.internal;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/powertools-logging/pom.xml b/powertools-logging/pom.xml
new file mode 100644
index 000000000..a874571fa
--- /dev/null
+++ b/powertools-logging/pom.xml
@@ -0,0 +1,103 @@
+
+
+ 4.0.0
+
+ powertools-logging
+ jar
+
+
+ powertools-parent
+ software.amazon.lambda
+ 0.1.0-SNAPSHOT
+
+
+ AWS Lambda Powertools Java library Logging
+
+ A suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
+
+ https://aws.amazon.com/lambda/
+
+ GitHub Issues
+ https://github.com/awslabs/aws-lambda-powertools-java/issues
+
+
+ https://github.com/awslabs/aws-lambda-powertools-java.git
+
+
+
+ AWS Lambda Powertools team
+ Amazon Web Services
+ https://aws.amazon.com/
+
+
+
+
+
+ ossrh
+ https://aws.oss.sonatype.org/content/repositories/snapshots
+
+
+
+
+
+ software.amazon.lambda
+ powertools-core
+
+
+ com.amazonaws
+ aws-lambda-java-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+ org.aspectj
+ aspectjrt
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.apache.commons
+ commons-lang3
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.aspectj
+ aspectjweaver
+ test
+
+
+ org.assertj
+ assertj-core
+ test
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/org/apache/logging/log4j/core/layout/LambdaJsonLayout.java b/powertools-logging/src/main/java/org/apache/logging/log4j/core/layout/LambdaJsonLayout.java
similarity index 100%
rename from src/main/java/org/apache/logging/log4j/core/layout/LambdaJsonLayout.java
rename to powertools-logging/src/main/java/org/apache/logging/log4j/core/layout/LambdaJsonLayout.java
diff --git a/src/main/java/software/amazon/lambda/logging/PowerLogger.java b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerLogger.java
similarity index 95%
rename from src/main/java/software/amazon/lambda/logging/PowerLogger.java
rename to powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerLogger.java
index d52d8e6e8..a161c7b8e 100644
--- a/src/main/java/software/amazon/lambda/logging/PowerLogger.java
+++ b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerLogger.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.logging;
+package software.amazon.lambda.powertools.logging;
import org.apache.logging.log4j.ThreadContext;
diff --git a/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerToolsLogging.java
similarity index 95%
rename from src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java
rename to powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerToolsLogging.java
index 8ff0d3752..ca6288d16 100644
--- a/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java
+++ b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowerToolsLogging.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.logging;
+package software.amazon.lambda.powertools.logging;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -53,7 +53,7 @@
*
By default {@code PowerToolsLogging} will not log the event which has trigger the invoke of the Lambda function.
* This can be enabled using {@code @PowerToolsLogging(logEvent = true)}.
*
- *
To append additional keys to each log entry you can use {@link software.amazon.lambda.logging.PowerLogger#appendKey(String, String)}
+ *
To append additional keys to each log entry you can use {@link PowerLogger#appendKey(String, String)}
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
diff --git a/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/DefaultLambdaFields.java
similarity index 96%
rename from src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java
rename to powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/DefaultLambdaFields.java
index bf1a6e135..8a5d3a289 100644
--- a/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java
+++ b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/DefaultLambdaFields.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.logging.internal;
+package software.amazon.lambda.powertools.logging.internal;
import com.amazonaws.services.lambda.runtime.Context;
diff --git a/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java
similarity index 85%
rename from src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java
rename to powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java
index 55363646d..643627d2d 100644
--- a/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java
+++ b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.logging.internal;
+package software.amazon.lambda.powertools.logging.internal;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,16 +32,16 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
-import software.amazon.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.powertools.logging.PowerToolsLogging;
import static java.util.Optional.empty;
import static java.util.Optional.of;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.coldStartDone;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.isColdStart;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
-import static software.amazon.lambda.internal.LambdaHandlerProcessor.serviceName;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.coldStartDone;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isColdStart;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isHandlerMethod;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnStreamHandler;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName;
@Aspect
public final class LambdaLoggingAspect {
diff --git a/src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java b/powertools-logging/src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java
similarity index 97%
rename from src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java
rename to powertools-logging/src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java
index fc98bfc6c..4823bce75 100644
--- a/src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java
+++ b/powertools-logging/src/test/java/org/apache/logging/log4j/core/layout/LambdaJsonLayoutTest.java
@@ -19,7 +19,6 @@
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Map;
-import java.util.stream.Stream;
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -28,7 +27,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import software.amazon.lambda.handlers.PowerLogToolEnabled;
+import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabled;
import static java.util.Collections.emptyMap;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/PowerLoggerTest.java
similarity index 95%
rename from src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java
rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/PowerLoggerTest.java
index 553420c5c..2a1b1c16f 100644
--- a/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java
+++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/PowerLoggerTest.java
@@ -11,7 +11,7 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.logging;
+package software.amazon.lambda.powertools.logging;
import org.apache.logging.log4j.ThreadContext;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabled.java
similarity index 90%
rename from src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java
rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabled.java
index c1fd75fd9..e9b1ed952 100644
--- a/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java
+++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabled.java
@@ -11,13 +11,13 @@
* limitations under the License.
*
*/
-package software.amazon.lambda.handlers;
+package software.amazon.lambda.powertools.logging.handlers;
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import software.amazon.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.powertools.logging.PowerToolsLogging;
public class PowerLogToolEnabled implements RequestHandler