Skip to content

Updates for the latest version of Java Lambda PowerTools #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

Updates for the latest version of Java Lambda PowerTools #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions unicorn_approvals/ApprovalsService/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>approval</groupId>
<artifactId>ApprovalsService</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>Unicorn Approvals Service module</name>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<aws.java.sdk.version>2.32.29</aws.java.sdk.version>
<aws.java.powertool.version>1.20.2</aws.java.powertool.version>
<aws.java.powertool.version>2.4.0</aws.java.powertool.version>
<aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
<mockito-core.version>5.18.0</mockito-core.version>
<junit.version>4.13.2</junit.version>
Expand All @@ -35,6 +36,16 @@
<artifactId>powertools-metrics</artifactId>
<version>${aws.java.powertool.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-logging-log4j</artifactId>
<version>${aws.java.powertool.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.22</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
Expand Down Expand Up @@ -93,7 +104,7 @@
<artifactId>jackson-annotations</artifactId>
<version>2.18.4</version>
</dependency>

<!-- Log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -137,6 +148,7 @@
<environmentVariables>
<LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
<CONTRACT_STATUS_TABLE>test-table</CONTRACT_STATUS_TABLE>
<POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
</environmentVariables>
</configuration>
<dependencies>
Expand Down Expand Up @@ -165,10 +177,11 @@
<plugin>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.1</version>
<version>1.14</version>
<configuration>
<complianceLevel>17</complianceLevel>
<release>17</release>
<source>21</source>
<target>21</target>
<complianceLevel>21</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>software.amazon.lambda</groupId>
Expand All @@ -182,32 +195,37 @@
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-metrics</artifactId>
</aspectLibrary>
<aspectLibrary>
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-logging</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<!-- AspectJ compiler version, in sync with runtime -->
<version>1.9.22</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.9.24</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<source>17</source>
<target>17</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions ...rovals/ApprovalsService/src/main/java/approvals/ContractStatusChangedHandlerFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
import software.amazon.lambda.powertools.logging.Logging;
import software.amazon.lambda.powertools.metrics.Metrics;
import software.amazon.lambda.powertools.tracing.Tracing;
import software.amazon.lambda.powertools.metrics.FlushMetrics;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -42,7 +42,7 @@ public class ContractStatusChangedHandlerFunction {
* @throws IOException if there's an error processing the event
*/
@Tracing
@Metrics(captureColdStart = true)
@FlushMetrics(captureColdStart = true)
@Logging(logEvent = true)
public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
logger.info("TABLE_NAME environment variable: {}", TABLE_NAME);
Expand Down
4 changes: 2 additions & 2 deletions ...rn_approvals/ApprovalsService/src/main/java/approvals/PropertiesApprovalSyncFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import software.amazon.awssdk.services.sfn.SfnAsyncClient;
import software.amazon.awssdk.services.sfn.model.SendTaskSuccessRequest;
import software.amazon.lambda.powertools.logging.Logging;
import software.amazon.lambda.powertools.metrics.Metrics;
import software.amazon.lambda.powertools.metrics.FlushMetrics;
import software.amazon.lambda.powertools.tracing.Tracing;

import java.io.Serializable;
Expand All @@ -40,7 +40,7 @@ public class PropertiesApprovalSyncFunction implements RequestHandler<DynamodbEv
.build();

@Tracing
@Metrics(captureColdStart = true)
@FlushMetrics(captureColdStart = true)
@Logging(logEvent = true)
public StreamsEventResponse handleRequest(DynamodbEvent input, Context context) {
List<StreamsEventResponse.BatchItemFailure> batchItemFailures = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions ...n_approvals/ApprovalsService/src/main/java/approvals/WaitForContractApprovalFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
import software.amazon.lambda.powertools.logging.Logging;
import software.amazon.lambda.powertools.metrics.Metrics;
import software.amazon.lambda.powertools.metrics.FlushMetrics;
import software.amazon.lambda.powertools.tracing.Tracing;

import java.io.IOException;
Expand All @@ -38,7 +38,7 @@ public class WaitForContractApprovalFunction {
.build();

@Tracing
@Metrics(captureColdStart = true)
@FlushMetrics(captureColdStart = true)
@Logging(logEvent = true)
public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
throws IOException, ContractStatusNotFoundException {
Expand Down
49 changes: 33 additions & 16 deletions unicorn_contracts/ContractsService/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>contracts</groupId>
<artifactId>ContractsService</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>Unicorn Contracts Service module</name>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<aws.java.sdk.version>2.32.29</aws.java.sdk.version>
<aws.java.powertool.version>1.20.2</aws.java.powertool.version>
<aws.java.powertool.version>2.4.0</aws.java.powertool.version>
<aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
<mockito-core.version>5.18.0</mockito-core.version>
<junit.version>4.13.2</junit.version>
Expand All @@ -32,14 +33,24 @@
<artifactId>powertools-metrics</artifactId>
<version>${aws.java.powertool.version}</version>
</dependency>

<dependency>
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-logging-log4j</artifactId>
<version>${aws.java.powertool.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.22</version>
</dependency>

<!-- AWS Lambda Core -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.3.0</version>
</dependency>

<!-- Jackson for JSON processing -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -56,7 +67,7 @@
<artifactId>jackson-annotations</artifactId>
<version>2.18.4</version>
</dependency>

<!-- Log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -128,6 +139,7 @@
<useSystemClassLoader>false</useSystemClassLoader>
<environmentVariables>
<LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
<POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
</environmentVariables>
</configuration>
<dependencies>
Expand All @@ -154,13 +166,13 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.15.0</version>
<version>1.14</version>
<configuration>
<complianceLevel>17</complianceLevel>
<source>17</source>
<target>17</target>
<source>21</source>
<target>21</target>
<complianceLevel>21</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>software.amazon.lambda</groupId>
Expand All @@ -174,13 +186,18 @@
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-metrics</artifactId>
</aspectLibrary>
<aspectLibrary>
<groupId>software.amazon.lambda</groupId>
<artifactId>powertools-logging</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.9.22.1</version>
<!-- AspectJ compiler version, in sync with runtime -->
<version>1.9.22</version>
</dependency>
</dependencies>
<executions>
Expand All @@ -196,10 +213,10 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<source>17</source>
<target>17</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 4 additions & 0 deletions unicorn_contracts/ContractsService/src/main/java/contracts/ContractEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
import org.apache.logging.log4j.Logger;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.*;
import software.amazon.lambda.powertools.logging.Logging;
import software.amazon.lambda.powertools.tracing.Tracing;
import software.amazon.lambda.powertools.metrics.FlushMetrics;

import java.time.Instant;
import java.util.Map;
Expand All @@ -38,6 +40,8 @@ public ContractEventHandler(DynamoDbClient dynamodbClient) {

@Override
@Tracing
@FlushMetrics(captureColdStart = true)
@Logging(logEvent = true)
public Void handleRequest(SQSEvent event, Context context) {
if (event == null || event.getRecords() == null) {
LOGGER.warn("Received null or empty SQS event");
Expand Down
Loading
Loading