Skip to content

Add trace token to query events #24

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
dain merged 1 commit into from
Jan 23, 2019
Merged

Add trace token to query events #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 presto-main/src/main/java/io/prestosql/event/QueryMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ private QueryContext createQueryContext(SessionRepresentation session, Optional<
return new QueryContext(
session.getUser(),
session.getPrincipal(),
session.getTraceToken(),
session.getRemoteUserAddress(),
session.getUserAgent(),
session.getClientInfo(),
Expand Down
9 changes: 9 additions & 0 deletions presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class QueryContext
{
private final String user;
private final Optional<String> principal;
private final Optional<String> traceToken;
private final Optional<String> remoteClientAddress;
private final Optional<String> userAgent;
private final Optional<String> clientInfo;
Expand All @@ -49,6 +50,7 @@ public class QueryContext
public QueryContext(
String user,
Optional<String> principal,
Optional<String> traceToken,
Optional<String> remoteClientAddress,
Optional<String> userAgent,
Optional<String> clientInfo,
Expand All @@ -66,6 +68,7 @@ public QueryContext(
{
this.user = requireNonNull(user, "user is null");
this.principal = requireNonNull(principal, "principal is null");
this.traceToken = requireNonNull(traceToken, "traceToken is null");
this.remoteClientAddress = requireNonNull(remoteClientAddress, "remoteClientAddress is null");
this.userAgent = requireNonNull(userAgent, "userAgent is null");
this.clientInfo = requireNonNull(clientInfo, "clientInfo is null");
Expand Down Expand Up @@ -94,6 +97,12 @@ public Optional<String> getPrincipal()
return principal;
}

@JsonProperty
public Optional<String> getTraceToken()
{
return traceToken;
}

@JsonProperty
public Optional<String> getRemoteClientAddress()
{
Expand Down