diff --git a/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java b/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java index 58c00c44ca26..139966c225e2 100644 --- a/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java +++ b/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java @@ -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(), diff --git a/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryContext.java b/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryContext.java index 5b4985999582..6cc54e29a132 100644 --- a/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryContext.java +++ b/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryContext.java @@ -27,6 +27,7 @@ public class QueryContext { private final String user; private final Optional principal; + private final Optional traceToken; private final Optional remoteClientAddress; private final Optional userAgent; private final Optional clientInfo; @@ -49,6 +50,7 @@ public class QueryContext public QueryContext( String user, Optional principal, + Optional traceToken, Optional remoteClientAddress, Optional userAgent, Optional clientInfo, @@ -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"); @@ -94,6 +97,12 @@ public Optional getPrincipal() return principal; } + @JsonProperty + public Optional getTraceToken() + { + return traceToken; + } + @JsonProperty public Optional getRemoteClientAddress() {