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-logging YOUR_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-logging YOUR_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-logging 0.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.0 software.amazon.lambda - aws-lambda-powertools-java + powertools-parent 0.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.6 2.4.0 UTF-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.plugins maven-compiler-plugin - 3.8.1 ${maven.compiler.source} ${maven.compiler.target} @@ -161,7 +239,6 @@ com.nickwongdev aspectj-maven-plugin - 1.12.1 ${maven.compiler.source} ${maven.compiler.target} @@ -189,12 +266,10 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 org.jacoco jacoco-maven-plugin - 0.8.5 @@ -214,7 +289,6 @@ org.codehaus.mojo cobertura-maven-plugin - 2.7 html @@ -226,7 +300,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 true sonatype-nexus-staging @@ -245,7 +318,6 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 sign-artifacts @@ -275,7 +347,6 @@ org.apache.maven.plugins maven-source-plugin - 2.4 attach-sources @@ -288,7 +359,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 -Xdoclint:none false 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 { private final Logger LOG = LogManager.getLogger(PowerToolLogEventEnabled.class); diff --git a/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabledForStream.java similarity index 88% rename from src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabledForStream.java index 73895914f..ccc5807a1 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabledForStream.java @@ -11,14 +11,14 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.logging.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.amazon.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.powertools.logging.PowerToolsLogging; public class PowerLogToolEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabled.java similarity index 93% rename from src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabled.java index bff24cedc..0391a5177 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabled.java @@ -11,7 +11,7 @@ * 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; diff --git a/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabledForStream.java similarity index 94% rename from src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabledForStream.java index e7b24135e..f0f7f676e 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolDisabledForStream.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.logging.handlers; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabled.java similarity index 88% rename from src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabled.java index 471d92e58..0a221e06b 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabled.java @@ -11,11 +11,11 @@ * 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 software.amazon.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.powertools.logging.PowerToolsLogging; public class PowerToolLogEventEnabled implements RequestHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabledForStream.java similarity index 90% rename from src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabledForStream.java index eed467e09..6750fd392 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerToolLogEventEnabledForStream.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.logging.handlers; import java.io.IOException; import java.io.InputStream; @@ -21,7 +21,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 PowerToolLogEventEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java similarity index 91% rename from src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java rename to powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java index 06599f407..ecf1eeea5 100644 --- a/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java +++ b/powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.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; @@ -28,13 +28,13 @@ 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.handlers.PowerLogToolEnabledForStream; -import software.amazon.lambda.handlers.PowerToolDisabled; -import software.amazon.lambda.handlers.PowerToolDisabledForStream; -import software.amazon.lambda.handlers.PowerToolLogEventEnabled; -import software.amazon.lambda.handlers.PowerToolLogEventEnabledForStream; -import software.amazon.lambda.internal.LambdaHandlerProcessor; +import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor; +import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabled; +import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabledForStream; +import software.amazon.lambda.powertools.logging.handlers.PowerToolDisabled; +import software.amazon.lambda.powertools.logging.handlers.PowerToolDisabledForStream; +import software.amazon.lambda.powertools.logging.handlers.PowerToolLogEventEnabled; +import software.amazon.lambda.powertools.logging.handlers.PowerToolLogEventEnabledForStream; import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/resources/log4j2.xml b/powertools-logging/src/test/resources/log4j2.xml similarity index 100% rename from src/test/resources/log4j2.xml rename to powertools-logging/src/test/resources/log4j2.xml diff --git a/powertools-tracing/pom.xml b/powertools-tracing/pom.xml new file mode 100644 index 000000000..4d7ea5627 --- /dev/null +++ b/powertools-tracing/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + powertools-tracing + jar + + + powertools-parent + software.amazon.lambda + 0.1.0-SNAPSHOT + + + AWS Lambda Powertools Java library Tracing + + 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 + + + com.amazonaws + aws-xray-recorder-sdk-core + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk-instrumentor + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk-v2 + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk-v2-instrumentor + + + + + 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/tracing/PowerToolsTracing.java b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerToolsTracing.java similarity index 95% rename from src/main/java/software/amazon/lambda/tracing/PowerToolsTracing.java rename to powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerToolsTracing.java index 2aee6d061..c1b671e36 100644 --- a/src/main/java/software/amazon/lambda/tracing/PowerToolsTracing.java +++ b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerToolsTracing.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.tracing; +package software.amazon.lambda.powertools.tracing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/software/amazon/lambda/tracing/PowerTracer.java b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerTracer.java similarity index 94% rename from src/main/java/software/amazon/lambda/tracing/PowerTracer.java rename to powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerTracer.java index 3269f1a02..05587a045 100644 --- a/src/main/java/software/amazon/lambda/tracing/PowerTracer.java +++ b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowerTracer.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.tracing; +package software.amazon.lambda.powertools.tracing; import java.util.function.Consumer; @@ -19,7 +19,7 @@ import com.amazonaws.xray.entities.Entity; import com.amazonaws.xray.entities.Subsegment; -import static software.amazon.lambda.internal.LambdaHandlerProcessor.serviceName; +import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName; public final class PowerTracer { diff --git a/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java similarity index 78% rename from src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java rename to powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java index bb894ca54..6e09f3305 100644 --- a/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java +++ b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.tracing.internal; +package software.amazon.lambda.powertools.tracing.internal; import com.amazonaws.xray.AWSXRay; import com.amazonaws.xray.entities.Subsegment; @@ -19,14 +19,14 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; -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 LambdaTracingAspect { diff --git a/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/PowerTracerTest.java similarity index 97% rename from src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/PowerTracerTest.java index 8dc86439f..1386b0a1d 100644 --- a/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/PowerTracerTest.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.tracing; +package software.amazon.lambda.powertools.tracing; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.xray.AWSXRay; @@ -19,11 +19,12 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import software.amazon.lambda.powertools.tracing.PowerTracer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment; +import static software.amazon.lambda.powertools.tracing.PowerTracer.withEntitySubsegment; class PowerTracerTest { diff --git a/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabled.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabled.java new file mode 100644 index 000000000..78878ffe5 --- /dev/null +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabled.java @@ -0,0 +1,25 @@ +/* + * Copyright 2020 Amazon.com, Inc. or its affiliates. + * Licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package software.amazon.lambda.powertools.tracing.handlers; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +public class PowerToolDisabled implements RequestHandler { + + @Override + public Object handleRequest(Object input, Context context) { + return null; + } +} diff --git a/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabledForStream.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabledForStream.java new file mode 100644 index 000000000..80f37b8b6 --- /dev/null +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerToolDisabledForStream.java @@ -0,0 +1,28 @@ +/* + * Copyright 2020 Amazon.com, Inc. or its affiliates. + * Licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package software.amazon.lambda.powertools.tracing.handlers; + +import java.io.InputStream; +import java.io.OutputStream; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestStreamHandler; + +public class PowerToolDisabledForStream implements RequestStreamHandler { + + @Override + public void handleRequest(InputStream input, OutputStream output, Context context) { + + } +} diff --git a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabled.java similarity index 88% rename from src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabled.java index 8bd2ba820..6c24a2c1b 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabled.java @@ -11,11 +11,11 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.tracing.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; public class PowerTracerToolEnabled implements RequestHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStream.java similarity index 89% rename from src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStream.java index dec58a1f7..0f92a0fe9 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStream.java @@ -11,14 +11,14 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.tracing.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; public class PowerTracerToolEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java similarity index 89% rename from src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java index 73fc02f37..30924d782 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java @@ -11,14 +11,14 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.tracing.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithException.java similarity index 88% rename from src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithException.java index 1b27cdc7a..ed4696dad 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithException.java @@ -11,11 +11,11 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.tracing.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; public class PowerTracerToolEnabledWithException implements RequestHandler { diff --git a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithNoMetaData.java similarity index 88% rename from src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithNoMetaData.java index 41054c37d..96e193438 100644 --- a/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/handlers/PowerTracerToolEnabledWithNoMetaData.java @@ -11,11 +11,11 @@ * limitations under the License. * */ -package software.amazon.lambda.handlers; +package software.amazon.lambda.powertools.tracing.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.amazon.lambda.tracing.PowerToolsTracing; +import software.amazon.lambda.powertools.tracing.PowerToolsTracing; public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler { diff --git a/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspectTest.java similarity index 89% rename from src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java rename to powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspectTest.java index fadb737e9..477ceddb4 100644 --- a/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java +++ b/powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspectTest.java @@ -11,7 +11,7 @@ * limitations under the License. * */ -package software.amazon.lambda.tracing.internal; +package software.amazon.lambda.powertools.tracing.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,14 +25,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import software.amazon.lambda.handlers.PowerToolDisabled; -import software.amazon.lambda.handlers.PowerToolDisabledForStream; -import software.amazon.lambda.handlers.PowerTracerToolEnabled; -import software.amazon.lambda.handlers.PowerTracerToolEnabledForStream; -import software.amazon.lambda.handlers.PowerTracerToolEnabledForStreamWithNoMetaData; -import software.amazon.lambda.handlers.PowerTracerToolEnabledWithException; -import software.amazon.lambda.handlers.PowerTracerToolEnabledWithNoMetaData; -import software.amazon.lambda.internal.LambdaHandlerProcessor; +import software.amazon.lambda.powertools.tracing.handlers.PowerToolDisabled; +import software.amazon.lambda.powertools.tracing.handlers.PowerToolDisabledForStream; +import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabled; +import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledForStream; +import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledForStreamWithNoMetaData; +import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledWithException; +import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledWithNoMetaData; +import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor; import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField; import static org.assertj.core.api.Assertions.assertThat; diff --git a/powertools-tracing/src/test/resources/log4j2.xml b/powertools-tracing/src/test/resources/log4j2.xml new file mode 100644 index 000000000..108e32b75 --- /dev/null +++ b/powertools-tracing/src/test/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file