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

[7.x] [Test] Allow trace.id in default thread context (#76089) #76138

Merged
merged 2 commits into from
Aug 5, 2021
Merged

[7.x] [Test] Allow trace.id in default thread context (#76089) #76138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9538c9
[Test] Allow trace.id in default thread context (#76089)
ywangd Aug 5, 2021
8805111
Update server/src/main/java/org/elasticsearch/transport/Transports.java
ywangd Aug 5, 2021
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
1 change: 1 addition & 0 deletions modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public List<FullHttpResponse> get(SocketAddress remoteAddress, String... uris) t
final HttpRequest httpRequest = new DefaultFullHttpRequest(HTTP_1_1, HttpMethod.GET, uris[i]);
httpRequest.headers().add(HOST, "localhost");
httpRequest.headers().add("X-Opaque-ID", String.valueOf(i));
httpRequest.headers().add("traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01");
requests.add(httpRequest);
}
return sendRequests(remoteAddress, requests);
Expand Down
5 changes: 4 additions & 1 deletion server/src/main/java/org/elasticsearch/transport/Transports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.elasticsearch.tasks.Task;

import java.util.Arrays;
import org.elasticsearch.core.Set;

public enum Transports {
;
Expand Down Expand Up @@ -52,7 +53,9 @@ public static boolean assertNotTransportThread(String reason) {

public static boolean assertDefaultThreadContext(ThreadContext threadContext) {
assert threadContext.getRequestHeadersOnly().isEmpty() ||
threadContext.getRequestHeadersOnly().size() == 1 && threadContext.getRequestHeadersOnly().containsKey(Task.X_OPAQUE_ID) :
threadContext.getRequestHeadersOnly().keySet().equals(Set.of(Task.X_OPAQUE_ID)) ||
threadContext.getRequestHeadersOnly().keySet().equals(Set.of(Task.TRACE_ID)) ||
threadContext.getRequestHeadersOnly().keySet().equals(Set.of(Task.X_OPAQUE_ID, Task.TRACE_ID)) :
"expected empty context but was " + threadContext.getRequestHeadersOnly() + " on " + Thread.currentThread().getName();
return true;
}
Expand Down