Skip to content

Commit cdce3e2

Browse files
scottgerringscottgerring
committed
Merge branch 'main' into fix-fifo-batch-failure
2 parents 96d4799 + 3e97bc8 commit cdce3e2

File tree

37 files changed

+554
-196
lines changed

37 files changed

+554
-196
lines changed

‎.github/auto_assign-issues.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ addAssignees: true
33
# The list of users to assign to new issues.
44
# If empty or not provided, the repository owner is assigned
55
assignees:
6+
- scottgerring
7+
- jeromevdl
8+
- mriccia
69
- msailes
7-
- pankajagrawal16
8-
- stevehouel

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
java-version: ${{ matrix.java }}
6262
cache: 'maven'
6363
- name: Build with Maven
64-
run: mvn -Pbuild-without-spotbugs -B package --file pom.xml
64+
run: mvn -B install --file pom.xml
6565
- name: Upload coverage to Codecov
6666
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1
6767
if: ${{ matrix.java == '11' }} # publish results once

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
RELEASE_TAG_VERSION=${{ github.event.release.tag_name }}
2525
echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> $GITHUB_ENV
2626
- name: Publish package
27-
run: mvn -P sign,build-without-spotbugs clean deploy -DskipTests
27+
run: mvn -Prelease clean deploy -DskipTests
2828
env:
2929
MAVEN_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
3030
MAVEN_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}

‎.github/workflows/run-e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }}
4646
aws-region: ${{ env.AWS_DEFAULT_REGION }}
4747
- name: Run e2e test with Maven
48-
run: mvn -Pbuild-without-spotbugs -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml
48+
run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,23 @@ This project follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) fo
88

99
## [Unreleased]
1010

11+
## [1.16.0] - 2023-06-29
12+
13+
14+
### Added
15+
* Feature: Add AppConfig provider to parameters module (#1104) by @scottgerring
16+
17+
### Maintenance
18+
* Fix: missing idempotency key should not persist any data (#1201) by @jeromevdl
19+
* Fix:Removing env var credentials provider as default. (#1161) by @msailes
20+
* Chore: Swap implementation of `aspectj-maven-plugin` to support Java 17 (#1172) by @mriccia
21+
* Test: end-to-end tests for core modules and idempotency (#970) by @jeromevdl
22+
* Chore: cleanup spotbugs maven profiles (#1236) by @jeromevdl
23+
* Chore: removing logback from all components (#1227) by @jeromevdl
24+
* Chore: Roll SLF4J log4j bindings to v2 (#1190) by @scottgerring
25+
* Deps: Bump third party dependencies to the latest versions.
26+
27+
1128
## [1.15.0] - 2023-03-20
1229

1330
### Added

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ Powertools for AWS Lambda (Java) is available in Maven Central. You can use your
2020
<dependency>
2121
<groupId>software.amazon.lambda</groupId>
2222
<artifactId>powertools-tracing</artifactId>
23-
<version>1.15.0</version>
23+
<version>1.17.0-SNAPSHOT</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>software.amazon.lambda</groupId>
2727
<artifactId>powertools-logging</artifactId>
28-
<version>1.15.0</version>
28+
<version>1.17.0-SNAPSHOT</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>software.amazon.lambda</groupId>
3232
<artifactId>powertools-metrics</artifactId>
33-
<version>1.15.0</version>
33+
<version>1.17.0-SNAPSHOT</version>
3434
</dependency>
3535
...
3636
</dependencies>

‎docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: Powertools for AWS Lambda (Java)
88
Powertools for AWS Lambda (Java) is a suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
99

1010
???+ tip
11-
Powertools for AWS Lambda is also available for [Python](https://awslabs.github.io/aws-lambda-powertools-python/){target="_blank"}, [TypeScript](https://awslabs.github.io/aws-lambda-powertools-typescript/){target="_blank"}, and [.NET](https://awslabs.github.io/aws-lambda-powertools-dotnet/){target="_blank"}
11+
Powertools for AWS Lambda is also available for [Python](https://docs.powertools.aws.dev/lambda/python/latest/){target="_blank"}, [TypeScript](https://docs.powertools.aws.dev/lambda/typescript/latest/){target="_blank"}, and [.NET](https://docs.powertools.aws.dev/lambda/dotnet/){target="_blank"}
1212

1313

1414
!!! tip "Looking for a quick run through of the core utilities?"
@@ -142,4 +142,4 @@ For more information about the project and available options refer to this [repo
142142
| **POWERTOOLS_LOGGER_SAMPLE_RATE** | Debug log sampling | [Logging](./core/logging) |
143143
| **POWERTOOLS_LOG_LEVEL** | Sets logging level | [Logging](./core/logging) |
144144
| **POWERTOOLS_TRACER_CAPTURE_RESPONSE** | Enables/Disables tracing mode to capture method response | [Tracing](./core/tracing) |
145-
| **POWERTOOLS_TRACER_CAPTURE_ERROR** | Enables/Disables tracing mode to capture method error | [Tracing](./core/tracing) |
145+
| **POWERTOOLS_TRACER_CAPTURE_ERROR** | Enables/Disables tracing mode to capture method error | [Tracing](./core/tracing) |

‎docs/javascript/extra.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const awsconfig = {
1010
};
1111

1212
const RUNTIME = "java"
13-
const BASE_ORIGIN = "awslabs.github.io"
13+
const BASE_ORIGIN = "docs.powertools.aws.dev"
1414

1515
function enableSearchOnBlurElement() {
1616
if (document.location.hostname != BASE_ORIGIN) return // prevent unnecessary data
@@ -73,4 +73,4 @@ const recordPageView = ({prevLocation, searchPattern}) => {
7373
}, 'AWSKinesisFirehose')
7474
}
7575

76-
init()
76+
init()

‎examples/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
## aws-lambda-powertools-examples
22

33
This directory holds example projects demoing different components of the Powertools for AWS Lambda (Java).
4-
5-
4+
Each example can be copied from its subdirectory and used independently of the rest of this repository.

‎examples/pom.xml

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7+
<groupId>software.amazon.lambda</groupId>
78
<artifactId>powertools-examples</artifactId>
9+
<version>1.17.0-SNAPSHOT</version>
810
<packaging>pom</packaging>
911

10-
<parent>
11-
<artifactId>powertools-parent</artifactId>
12-
<groupId>software.amazon.lambda</groupId>
13-
<version>1.15.0</version>
14-
</parent>
15-
1612
<name>Powertools for AWS Lambda (Java) library Examples</name>
1713
<description>
1814
A suite of examples accompanying for Powertools for AWS Lambda (Java).
@@ -32,32 +28,4 @@
3228
<maven.deploy.skip>true</maven.deploy.skip>
3329
</properties>
3430

35-
<build>
36-
<plugins>
37-
<plugin> <!-- skip coverage for examples -->
38-
<groupId>org.jacoco</groupId>
39-
<artifactId>jacoco-maven-plugin</artifactId>
40-
<executions>
41-
<execution>
42-
<goals>
43-
<goal>prepare-agent</goal>
44-
</goals>
45-
<configuration>
46-
<skip>true</skip>
47-
</configuration>
48-
</execution>
49-
<execution>
50-
<id>report</id>
51-
<goals>
52-
<goal>report</goal>
53-
</goals>
54-
<configuration>
55-
<skip>true</skip>
56-
</configuration>
57-
</execution>
58-
</executions>
59-
</plugin>
60-
</plugins>
61-
</build>
62-
6331
</project>

‎examples/powertools-examples-core/pom.xml

Lines changed: 86 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>software.amazon.lambda.examples</groupId>
6+
<version>1.17.0-SNAPSHOT</version>
47
<artifactId>powertools-examples-core</artifactId>
58
<packaging>jar</packaging>
6-
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
79

8-
<parent>
9-
<artifactId>powertools-examples</artifactId>
10-
<groupId>software.amazon.lambda</groupId>
11-
<version>1.15.0</version>
12-
</parent>
10+
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
11+
12+
<properties>
13+
<log4j.version>2.20.0</log4j.version>
14+
<maven.compiler.source>1.8</maven.compiler.source>
15+
<maven.compiler.target>1.8</maven.compiler.target>
16+
<maven.deploy.skip>true</maven.deploy.skip>
17+
</properties>
1318

1419
<dependencies>
1520
<dependency>
@@ -118,4 +123,79 @@
118123
</plugin>
119124
</plugins>
120125
</build>
126+
<profiles>
127+
<!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
128+
version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
129+
on the project.
130+
131+
Note:
132+
- if you are running Java > 1.8, you can remove this profile altogether
133+
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
134+
the profile.
135+
-->
136+
<profile>
137+
<id>jdk8</id>
138+
<activation>
139+
<jdk>(,11)</jdk> <!-- 8 -->
140+
</activation>
141+
<properties>
142+
<aspectj.version>1.9.7</aspectj.version>
143+
</properties>
144+
<dependencyManagement>
145+
<dependencies>
146+
<dependency>
147+
<groupId>org.aspectj</groupId>
148+
<artifactId>aspectjtools</artifactId>
149+
<version>${aspectj.version}</version>
150+
</dependency>
151+
</dependencies>
152+
</dependencyManagement>
153+
<build>
154+
<pluginManagement>
155+
<plugins>
156+
<plugin>
157+
<groupId>dev.aspectj</groupId>
158+
<artifactId>aspectj-maven-plugin</artifactId>
159+
<version>${aspectj.plugin.version}</version>
160+
<configuration>
161+
<source>${maven.compiler.source}</source>
162+
<target>${maven.compiler.target}</target>
163+
<complianceLevel>${maven.compiler.target}</complianceLevel>
164+
<aspectLibraries>
165+
<aspectLibrary>
166+
<groupId>software.amazon.lambda</groupId>
167+
<artifactId>powertools-tracing</artifactId>
168+
</aspectLibrary>
169+
<aspectLibrary>
170+
<groupId>software.amazon.lambda</groupId>
171+
<artifactId>powertools-logging</artifactId>
172+
</aspectLibrary>
173+
<aspectLibrary>
174+
<groupId>software.amazon.lambda</groupId>
175+
<artifactId>powertools-metrics</artifactId>
176+
</aspectLibrary>
177+
</aspectLibraries>
178+
</configuration>
179+
<executions>
180+
<execution>
181+
<goals>
182+
<goal>compile</goal>
183+
<goal>test-compile</goal>
184+
</goals>
185+
</execution>
186+
</executions>
187+
<!-- Enforce aspectJ 1.9.7 -->
188+
<dependencies>
189+
<dependency>
190+
<groupId>org.aspectj</groupId>
191+
<artifactId>aspectjtools</artifactId>
192+
<version>${aspectj.version}</version>
193+
</dependency>
194+
</dependencies>
195+
</plugin>
196+
</plugins>
197+
</pluginManagement>
198+
</build>
199+
</profile>
200+
</profiles>
121201
</project>

‎examples/powertools-examples-core/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Globals:
1212
Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html
1313
Environment:
1414
Variables:
15-
# Powertools for AWS Lambda (Java) env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
15+
# Powertools for AWS Lambda (Java) env vars: https://docs.powertools.aws.dev/lambda/java/#environment-variables
1616
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true

‎examples/powertools-examples-idempotency/pom.xml

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>software.amazon.lambda.examples</groupId>
6+
<version>1.17.0-SNAPSHOT</version>
47
<artifactId>powertools-examples-idempotency</artifactId>
58
<packaging>jar</packaging>
69
<name>Powertools for AWS Lambda (Java) library Examples - Idempotency</name>
710

8-
<parent>
9-
<artifactId>powertools-examples</artifactId>
10-
<groupId>software.amazon.lambda</groupId>
11-
<version>1.15.0</version>
12-
</parent>
11+
<properties>
12+
<log4j.version>2.20.0</log4j.version>
13+
<maven.compiler.source>1.8</maven.compiler.source>
14+
<maven.compiler.target>1.8</maven.compiler.target>
15+
<maven.deploy.skip>true</maven.deploy.skip>
16+
</properties>
1317

1418
<dependencies>
1519
<dependency>
@@ -168,6 +172,81 @@
168172
</plugin>
169173
</plugins>
170174
</build>
175+
<profiles>
176+
<!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
177+
version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
178+
on the project.
179+
180+
Note:
181+
- if you are running Java > 1.8, you can remove this profile altogether
182+
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
183+
the profile.
184+
-->
185+
<profile>
186+
<id>jdk8</id>
187+
<activation>
188+
<jdk>(,11)</jdk> <!-- 8 -->
189+
</activation>
190+
<properties>
191+
<aspectj.version>1.9.7</aspectj.version>
192+
</properties>
193+
<dependencyManagement>
194+
<dependencies>
195+
<dependency>
196+
<groupId>org.aspectj</groupId>
197+
<artifactId>aspectjtools</artifactId>
198+
<version>${aspectj.version}</version>
199+
</dependency>
200+
</dependencies>
201+
</dependencyManagement>
202+
<build>
203+
<pluginManagement>
204+
<plugins>
205+
<plugin>
206+
<groupId>dev.aspectj</groupId>
207+
<artifactId>aspectj-maven-plugin</artifactId>
208+
<version>${aspectj.plugin.version}</version>
209+
<configuration>
210+
<source>${maven.compiler.source}</source>
211+
<target>${maven.compiler.target}</target>
212+
<complianceLevel>${maven.compiler.target}</complianceLevel>
213+
<aspectLibraries>
214+
<aspectLibrary>
215+
<groupId>software.amazon.lambda</groupId>
216+
<artifactId>powertools-tracing</artifactId>
217+
</aspectLibrary>
218+
<aspectLibrary>
219+
<groupId>software.amazon.lambda</groupId>
220+
<artifactId>powertools-logging</artifactId>
221+
</aspectLibrary>
222+
<aspectLibrary>
223+
<groupId>software.amazon.lambda</groupId>
224+
<artifactId>powertools-idempotency</artifactId>
225+
</aspectLibrary>
226+
</aspectLibraries>
227+
</configuration>
228+
<executions>
229+
<execution>
230+
<goals>
231+
<goal>compile</goal>
232+
<goal>test-compile</goal>
233+
</goals>
234+
</execution>
235+
</executions>
236+
<!-- Enforce aspectJ 1.9.7 -->
237+
<dependencies>
238+
<dependency>
239+
<groupId>org.aspectj</groupId>
240+
<artifactId>aspectjtools</artifactId>
241+
<version>${aspectj.version}</version>
242+
</dependency>
243+
</dependencies>
244+
</plugin>
245+
</plugins>
246+
</pluginManagement>
247+
</build>
248+
</profile>
249+
</profiles>
171250
<repositories>
172251
<repository>
173252
<id>dynamodb-local-oregon</id>

0 commit comments

Comments
 (0)