From 3ad833407c873fcbbd64619001f32e3880d9f07f Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 7 Aug 2024 09:27:22 -0700 Subject: [PATCH 1/3] Only emit product origin in deprecation log if present The elastic product origin may not always be present when deprecation messages are emitted. This commit changes the log message created for deprecations to only emit the product origin field if it is not empty. closes #81757 --- .../common/logging/DeprecatedMessage.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java index 80aeaffaabec5..7f4671a67bd36 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java +++ b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java @@ -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; } } From 263c7cd008630401b05b3962741a5d8d837e6361 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 7 Aug 2024 09:29:57 -0700 Subject: [PATCH 2/3] Update docs/changelog/111683.yaml --- docs/changelog/111683.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/changelog/111683.yaml diff --git a/docs/changelog/111683.yaml b/docs/changelog/111683.yaml new file mode 100644 index 0000000000000..cbb2e5ad71ddc --- /dev/null +++ b/docs/changelog/111683.yaml @@ -0,0 +1,6 @@ +pr: 111683 +summary: Only emit product origin in deprecation log if present +area: Infra/Logging +type: bug +issues: + - 81757 From dcd5956f97ac088d97aed3a6055c631daa2550fb Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 7 Aug 2024 10:28:53 -0700 Subject: [PATCH 3/3] fix compile --- .../org/elasticsearch/common/logging/DeprecatedMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java index 7f4671a67bd36..7f94e8d3d1824 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java +++ b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java @@ -63,7 +63,7 @@ private static ESLogMessage getEsLogMessage( .field("elasticsearch.event.category", category.name().toLowerCase(Locale.ROOT)); if (Strings.isNullOrEmpty(xOpaqueId) == false) { - esLogMessage.field(X_OPAQUE_ID_FIELD_NAME, xOpaqueId) + esLogMessage.field(X_OPAQUE_ID_FIELD_NAME, xOpaqueId); } if (Strings.isNullOrEmpty(productOrigin) == false) { esLogMessage.field(ELASTIC_ORIGIN_FIELD_NAME, productOrigin);