Skip to content

Commit 8416e56

Browse files
authored
Merge branch 'develop' into dependabot/github_actions/aws-actions/configure-aws-credentials-4.0.3
2 parents 9438406 + 03c4ad7 commit 8416e56

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
fetch-depth: 0
2626
- name: Set up Python
27-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
27+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2828
with:
2929
python-version: "3.12"
3030
- name: Capture branch and tag

.github/workflows/reusable_publish_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install poetry
4242
run: pipx install poetry
4343
- name: Set up Python
44-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
44+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
4545
with:
4646
python-version: "3.12"
4747
cache: "poetry"

docs/core/logging.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ Setting | Description | Environment variable | Attribute parameter
3636
**Service** | Sets **Service** key that will be present across all log statements | `POWERTOOLS_SERVICE_NAME` | `Service`
3737
**Logging level** | Sets how verbose Logger should be (Information, by default) | `POWERTOOLS_LOG_LEVEL` | `LogLevel`
3838

39+
### Service Property Priority Resolution
40+
41+
The root level Service property now correctly follows this priority order:
42+
43+
1. LoggingAttribute.Service (property value set in the decorator)
44+
2. POWERTOOLS_SERVICE_NAME (environment variable)
45+
46+
3947
### Example using AWS Serverless Application Model (AWS SAM)
4048

4149
You can override log level by setting **`POWERTOOLS_LOG_LEVEL`** environment variable in the AWS SAM template.
@@ -788,4 +796,4 @@ To use a custom log formatter with AOT, pass an instance of `ILogFormatter` to `
788796

789797
While we support anonymous type serialization by converting to a `Dictionary<string, object>`, this is **not** a best practice and is **not recommended** when using native AOT.
790798

791-
We recommend using concrete classes and adding them to your `JsonSerializerContext`.
799+
We recommend using concrete classes and adding them to your `JsonSerializerContext`.

libraries/tests/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
22
<PropertyGroup>
33
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<IsPackable>false</IsPackable>
45
</PropertyGroup>
56
<ItemGroup>
67
<ProjectReference Condition="'$(Configuration)'!='Release'" Include="..\..\src\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
78
</ItemGroup>
8-
</Project>
9+
</Project>
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<Project>
22
<!-- Only here so that the default Directory.Build.props will not be used. -->
3-
</Project>
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
</PropertyGroup>
6+
</Project>

0 commit comments

Comments
 (0)