Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit b518332

Browse files
pankajagrawal16Pankaj Agrawal
andauthored
fix: new env var for setting log level (#99)
* fix: new env var for setting log level * fix: log4j2 config for the maven projects Co-authored-by: Pankaj Agrawal <[email protected]>
1 parent e1b671d commit b518332

File tree

12 files changed

+100
-64
lines changed
  • templates
    • java11
      • cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}
      • cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}
    • java8.al2
      • cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}
      • cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}
    • java8
      • cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}
      • cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}

12 files changed

+100
-64
lines changed

templates/java11/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/HelloWorldFunction/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ repositories {
99

1010
dependencies {
1111
implementation 'software.amazon.lambda:powertools-tracing:1.3.0'
12-
aspectpath 'software.amazon.lambda:powertools-tracing:1.2.0'
12+
aspectpath 'software.amazon.lambda:powertools-tracing:1.3.0'
1313

1414
implementation 'software.amazon.lambda:powertools-logging:1.3.0'
15-
aspectpath 'software.amazon.lambda:powertools-logging:1.2.0'
15+
aspectpath 'software.amazon.lambda:powertools-logging:1.3.0'
1616

1717
implementation 'software.amazon.lambda:powertools-metrics:1.3.0'
18-
aspectpath 'software.amazon.lambda:powertools-metrics:1.2.0'
18+
aspectpath 'software.amazon.lambda:powertools-metrics:1.3.0'
1919

2020
implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
2121
implementation 'com.amazonaws:aws-lambda-java-events:3.7.0'

templates/java11/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Globals:
1313
Environment:
1414
Variables:
1515
# Powertools env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
16-
LOG_LEVEL: INFO
16+
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true
1919
POWERTOOLS_METRICS_NAMESPACE: {{ cookiecutter.project_slug }}

templates/java11/cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}/HelloWorldFunction/pom.xml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<dependency>
2323
<groupId>software.amazon.lambda</groupId>
2424
<artifactId>powertools-logging</artifactId>
25-
<version>1.2.0</version>
25+
<version>1.3.0</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
2929
<artifactId>powertools-metrics</artifactId>
30-
<version>1.2.0</version>
30+
<version>1.3.0</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.amazonaws</groupId>
@@ -97,19 +97,31 @@
9797
</executions>
9898
</plugin>
9999
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-shade-plugin</artifactId>
102-
<version>3.2.4</version>
103-
<configuration>
104-
</configuration>
105-
<executions>
106-
<execution>
107-
<phase>package</phase>
108-
<goals>
109-
<goal>shade</goal>
110-
</goals>
111-
</execution>
112-
</executions>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-shade-plugin</artifactId>
102+
<version>3.2.4</version>
103+
<executions>
104+
<execution>
105+
<phase>package</phase>
106+
<goals>
107+
<goal>shade</goal>
108+
</goals>
109+
<configuration>
110+
<transformers>
111+
<transformer
112+
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
113+
</transformer>
114+
</transformers>
115+
</configuration>
116+
</execution>
117+
</executions>
118+
<dependencies>
119+
<dependency>
120+
<groupId>com.github.edwgiz</groupId>
121+
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
122+
<version>2.14.0</version>
123+
</dependency>
124+
</dependencies>
113125
</plugin>
114126
</plugins>
115127
</build>

templates/java11/cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Globals:
1313
Environment:
1414
Variables:
1515
# Powertools env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
16-
LOG_LEVEL: INFO
16+
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true
1919
POWERTOOLS_METRICS_NAMESPACE: {{ cookiecutter.project_slug }}

templates/java8.al2/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/HelloWorldFunction/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ repositories {
99

1010
dependencies {
1111
implementation 'software.amazon.lambda:powertools-tracing:1.3.0'
12-
aspectpath 'software.amazon.lambda:powertools-tracing:1.2.0'
12+
aspectpath 'software.amazon.lambda:powertools-tracing:1.3.0'
1313

1414
implementation 'software.amazon.lambda:powertools-logging:1.3.0'
15-
aspectpath 'software.amazon.lambda:powertools-logging:1.2.0'
15+
aspectpath 'software.amazon.lambda:powertools-logging:1.3.0'
1616

1717
implementation 'software.amazon.lambda:powertools-metrics:1.3.0'
18-
aspectpath 'software.amazon.lambda:powertools-metrics:1.2.0'
18+
aspectpath 'software.amazon.lambda:powertools-metrics:1.3.0'
1919

2020
implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
2121
implementation 'com.amazonaws:aws-lambda-java-events:3.7.0'

templates/java8.al2/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Globals:
1313
Environment:
1414
Variables:
1515
# Powertools env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
16-
LOG_LEVEL: INFO
16+
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true
1919
POWERTOOLS_METRICS_NAMESPACE: {{ cookiecutter.project_slug }}

templates/java8.al2/cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}/HelloWorldFunction/pom.xml

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
<dependency>
1818
<groupId>software.amazon.lambda</groupId>
1919
<artifactId>powertools-tracing</artifactId>
20-
<version>1.2.0</version>
20+
<version>1.3.0</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>software.amazon.lambda</groupId>
2424
<artifactId>powertools-logging</artifactId>
25-
<version>1.2.0</version>
25+
<version>1.3.0</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
2929
<artifactId>powertools-metrics</artifactId>
30-
<version>1.2.0</version>
30+
<version>1.3.0</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.amazonaws</groupId>
@@ -91,21 +91,33 @@
9191
</execution>
9292
</executions>
9393
</plugin>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-shade-plugin</artifactId>
97-
<version>3.2.4</version>
98-
<configuration>
99-
</configuration>
100-
<executions>
101-
<execution>
102-
<phase>package</phase>
103-
<goals>
104-
<goal>shade</goal>
105-
</goals>
106-
</execution>
107-
</executions>
108-
</plugin>
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-shade-plugin</artifactId>
97+
<version>3.2.4</version>
98+
<executions>
99+
<execution>
100+
<phase>package</phase>
101+
<goals>
102+
<goal>shade</goal>
103+
</goals>
104+
<configuration>
105+
<transformers>
106+
<transformer
107+
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
108+
</transformer>
109+
</transformers>
110+
</configuration>
111+
</execution>
112+
</executions>
113+
<dependencies>
114+
<dependency>
115+
<groupId>com.github.edwgiz</groupId>
116+
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
117+
<version>2.14.0</version>
118+
</dependency>
119+
</dependencies>
120+
</plugin>
109121
</plugins>
110122
</build>
111123
</project>

templates/java8.al2/cookiecutter-aws-sam-hello-powertools-java-maven/{{ cookiecutter.project_slug }}/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Globals:
1313
Environment:
1414
Variables:
1515
# Powertools env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
16-
LOG_LEVEL: INFO
16+
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true
1919
POWERTOOLS_METRICS_NAMESPACE: {{ cookiecutter.project_slug }}

templates/java8/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/HelloWorldFunction/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ repositories {
99

1010
dependencies {
1111
implementation 'software.amazon.lambda:powertools-tracing:1.3.0'
12-
aspectpath 'software.amazon.lambda:powertools-tracing:1.2.0'
12+
aspectpath 'software.amazon.lambda:powertools-tracing:1.3.0'
1313

1414
implementation 'software.amazon.lambda:powertools-logging:1.3.0'
15-
aspectpath 'software.amazon.lambda:powertools-logging:1.2.0'
15+
aspectpath 'software.amazon.lambda:powertools-logging:1.3.0'
1616

1717
implementation 'software.amazon.lambda:powertools-metrics:1.3.0'
18-
aspectpath 'software.amazon.lambda:powertools-metrics:1.2.0'
18+
aspectpath 'software.amazon.lambda:powertools-metrics:1.3.0'
1919

2020
implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
2121
implementation 'com.amazonaws:aws-lambda-java-events:3.7.0'

templates/java8/cookiecutter-aws-sam-hello-powertools-java-gradle/{{ cookiecutter.project_slug }}/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Globals:
1313
Environment:
1414
Variables:
1515
# Powertools env vars: https://awslabs.github.io/aws-lambda-powertools-python/#environment-variables
16-
LOG_LEVEL: INFO
16+
POWERTOOLS_LOG_LEVEL: INFO
1717
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
1818
POWERTOOLS_LOGGER_LOG_EVENT: true
1919
POWERTOOLS_METRICS_NAMESPACE: {{ cookiecutter.project_slug }}

0 commit comments

Comments
 (0)