From 8a8c9d2a30a89effc790f413e99f82cffd69a36a Mon Sep 17 00:00:00 2001 From: tangming Date: Wed, 19 Feb 2020 17:45:05 +0800 Subject: [PATCH] Adjust the order of slowlog'x-opaque-id to avoid being truncated Change-Id: I5d3f0077e500a317b70bc7298a8fd1e86b320118 --- .../java/org/elasticsearch/index/SearchSlowLog.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java b/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java index d93c707eadb05..f0a2315f0d879 100644 --- a/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java +++ b/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java @@ -213,16 +213,18 @@ private static String message(SearchContext context, long tookInNanos) { } sb.append("search_type[").append(context.searchType()).append("], total_shards[") .append(context.numberOfShards()).append("], "); - if (context.request().source() != null) { - sb.append("source[").append(context.request().source().toString(FORMAT_PARAMS)).append("], "); - } else { - sb.append("source[], "); - } if (context.getTask().getHeader(Task.X_OPAQUE_ID) != null) { sb.append("id[").append(context.getTask().getHeader(Task.X_OPAQUE_ID)).append("], "); } else { sb.append("id[], "); } + if (context.request().source() != null) { + sb.append("source[").append(context.request().source().toString(FORMAT_PARAMS)).append("], "); + } else { + sb.append("source[], "); + } + // Any field added in the future should add before `source` + // to avoid being truncated when the query source body is too long return sb.toString(); }