feat: add automatic TenantId logging to Logger default properties#2471
feat: add automatic TenantId logging to Logger default properties#2471Pratapchandradeo wants to merge 4 commits intoaws-powertools:mainfrom
Conversation
- Add TENANT_ID to PowertoolsLoggedFields enum with null-safety checks - Create TENANT_ID_RESOLVER in Log4j2 PowertoolsResolver with isResolvable check - Register TENANT_ID resolver in eventResolverMap for Log4j2 support - Add TENANT_ID_ATTR_NAME constant to LambdaEcsEncoder (ECS format: tenant.id) - Add conditional null-safe serialization of tenant_id in Logback ECS encoder - Update LambdaJsonLayout.json to include tenant_id field for Log4j2 JSON - Update LambdaEcsLayout.json to include tenant.id field for Log4j2 ECS - Update LambdaJsonEncoder JavaDoc to include tenant_id in listed fields - Add getTenantId() override in TestLambdaContext test stub - Update test assertions in LambdaJsonEncoderTest to verify tenant_id in output Fixes: aws-powertools#2348 References: aws-powertools#2358 This implementation follows AWS Lambda Tenant Isolation feature requirements and applies null-safety patterns consistent with correlation_id handling.
|
Hey @Pratapchandradeo thanks for opening this PR. Please check the PR template before we can proceed with the review: https://github.com/aws-powertools/powertools-lambda-java/blob/main/.github/PULL_REQUEST_TEMPLATE.md. |
phipag
left a comment
phipag
left a comment
There was a problem hiding this comment.
Also some first comments on the code :-)
| } | ||
|
|
||
| String tenantId = mdcPropertyMap.get(TENANT_ID.getName()); | ||
| if (tenantId != null) { |
There was a problem hiding this comment.
I think we should check for both null and empty string similar to the PowertoolsLoggedFields.
| public boolean isResolvable(LogEvent logEvent) { | ||
| final String tenantId = | ||
| logEvent.getContextData().getValue(PowertoolsLoggedFields.TENANT_ID.getName()); | ||
| return null != tenantId; |
There was a problem hiding this comment.
I think we should check for both null and empty string similar to the PowertoolsLoggedFields.
|
@Pratapchandradeo thanks for the update. Please check my comment about the PR description format. The acknowledgement section is incorrect. |
|
2 participants
Description
Implements automatic
tenant_idlogging for AWS Lambda Tenant Isolation feature with null-safe serialization in Logback JSON encoder. Ensurestenant_idis only logged when it contains a valid value.Changes
✅ Add null-safety check to
LambdaJsonEncoder.serializePowertools()✅ Add
TENANT_ID_RESOLVERin Log4j2PowertoolsResolver✅ Add
TENANT_IDenum toPowertoolsLoggedFields✅ Update
LambdaJsonLayout.jsonandLambdaEcsLayout.json✅ Add
tenant_idserialization toLambdaEcsEncoder✅ Add unit tests for null and empty
tenant_idscenarios✅ Fix test assertion and OS compatibility issues
Implementation Details
tenant_idserialization when null or emptysampling_rateTesting
Tests run: 18, Failures: 0, Errors: 0, BUILD SUCCESS
Test coverage:
tenant_idis loggedtenant_idis NOT loggedtenant_idis NOT loggedincludePowertoolsInfoflagRelated Issues
Closes #2348
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Acknowledgment