Skip to content
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

Jump to bottom

Add x-opaque-id to search slow logs #31539

Merged
merged 2 commits into from
Jun 25, 2018
Merged

Add x-opaque-id to search slow logs #31539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc72557
Add x-opaque-id to search slow logs
imotov Jun 22, 2018
59d1c4d
Replace X-Opaque-Id string with a constant
imotov Jun 25, 2018
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
5 changes: 5 additions & 0 deletions server/src/main/java/org/elasticsearch/index/SearchSlowLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ public String toString() {
} else {
sb.append("source[], ");
}
if (context.getTask().getHeader("X-Opaque-Id") != null) {
sb.append("id[").append(context.getTask().getHeader("X-Opaque-Id")).append("], ");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the header name is used in several places throughout the code base, maybe it makes sense to declare it as a public string constant somewhere? I see its already a package private constant in DefaultRestChannel, maybe it should be public, get some proper comment etc... so we can use it here (and in other locations).

} else {
sb.append("id[], ");
}
return sb.toString();
}
}
Expand Down
5 changes: 5 additions & 0 deletions server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.elasticsearch.index;

import org.elasticsearch.Version;
import org.elasticsearch.action.search.SearchTask;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.bytes.BytesReference;
Expand All @@ -39,7 +40,9 @@
import org.elasticsearch.threadpool.ThreadPool;

import java.io.IOException;
import java.util.Collections;

import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
Expand Down Expand Up @@ -166,10 +169,12 @@ public void testSlowLogSearchContextPrinterToLog() throws IOException {
SearchContext searchContext = createSearchContext(index);
SearchSourceBuilder source = SearchSourceBuilder.searchSource().query(QueryBuilders.matchAllQuery());
searchContext.request().source(source);
searchContext.setTask(new SearchTask(0, "n/a", "n/a", "test", null, Collections.singletonMap("X-Opaque-Id", "my_id")));
SearchSlowLog.SlowLogSearchContextPrinter p = new SearchSlowLog.SlowLogSearchContextPrinter(searchContext, 10);
assertThat(p.toString(), startsWith("[foo][0]"));
// Makes sure that output doesn't contain any new lines
assertThat(p.toString(), not(containsString("\n")));
assertThat(p.toString(), endsWith("id[my_id], "));
}

public void testLevelSetting() {
Expand Down