Skip to content

Only emit product origin in deprecation log if present #111683

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
rjernst merged 3 commits into from
Aug 8, 2024
Merged

Only emit product origin in deprecation log if present #111683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ad8334
Only emit product origin in deprecation log if present
rjernst Aug 7, 2024
263c7cd
Update docs/changelog/111683.yaml
rjernst Aug 7, 2024
dcd5956
fix compile
rjernst Aug 7, 2024
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
6 changes: 6 additions & 0 deletions docs/changelog/111683.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 111683
summary: Only emit product origin in deprecation log if present
area: Infra/Logging
type: bug
issues:
- 81757
10 changes: 6 additions & 4 deletions server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ private static ESLogMessage getEsLogMessage(
.field(KEY_FIELD_NAME, key)
.field("elasticsearch.event.category", category.name().toLowerCase(Locale.ROOT));

if (Strings.isNullOrEmpty(xOpaqueId)) {
return esLogMessage;
if (Strings.isNullOrEmpty(xOpaqueId) == false) {
esLogMessage.field(X_OPAQUE_ID_FIELD_NAME, xOpaqueId);
}

return esLogMessage.field(X_OPAQUE_ID_FIELD_NAME, xOpaqueId).field(ELASTIC_ORIGIN_FIELD_NAME, productOrigin);
if (Strings.isNullOrEmpty(productOrigin) == false) {
esLogMessage.field(ELASTIC_ORIGIN_FIELD_NAME, productOrigin);
}
return esLogMessage;
}
}