From a26044831c331614521a4085c4808c033d485a8e Mon Sep 17 00:00:00 2001 From: surajpuvvada Date: Mon, 24 Jan 2022 13:55:36 -0800 Subject: [PATCH 1/4] chore: include execution stats when logging slow query warn message --- .../core/query/service/pinot/PinotBasedRequestHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotBasedRequestHandler.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotBasedRequestHandler.java index 0d1084ad..249020b5 100644 --- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotBasedRequestHandler.java +++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotBasedRequestHandler.java @@ -416,10 +416,11 @@ public Observable handleRequest( if (requestTimeMs > slowQueryThreshold) { try { LOG.warn( - "Query Execution time: {} ms, sqlQuery: {}, queryRequest: {}", + "Query Execution time: {} ms, sqlQuery: {}, queryRequest: {}, executionStats: {}", requestTimeMs, pql.getKey(), - protoJsonPrinter.print(request)); + protoJsonPrinter.print(request), + resultSetGroup.getExecutionStats()); } catch (InvalidProtocolBufferException ignore) { } } From 6e075c92143b2d7c51d3f3a9673ee8dd8661c5fc Mon Sep 17 00:00:00 2001 From: surajpuvvada Date: Mon, 24 Jan 2022 14:09:15 -0800 Subject: [PATCH 2/4] update google protobuf to 3.19.2 --- query-service-impl/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/query-service-impl/build.gradle.kts b/query-service-impl/build.gradle.kts index 79dda871..05c13c39 100644 --- a/query-service-impl/build.gradle.kts +++ b/query-service-impl/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation("org.slf4j:slf4j-api:1.7.32") implementation("commons-codec:commons-codec:1.15") implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.33") - implementation("com.google.protobuf:protobuf-java-util:3.15.6") + implementation("com.google.protobuf:protobuf-java-util:3.19.2") implementation("com.google.guava:guava:30.1.1-jre") implementation("io.reactivex.rxjava3:rxjava:3.0.11") implementation("com.squareup.okhttp3:okhttp:4.9.1") From 1dd0de6a8faafa3575bc037010b66fd687dd9377 Mon Sep 17 00:00:00 2001 From: surajpuvvada Date: Mon, 24 Jan 2022 14:25:43 -0800 Subject: [PATCH 3/4] update google protobuf to 3.19.2 in other modules --- query-service-api/build.gradle.kts | 2 +- query-service/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/query-service-api/build.gradle.kts b/query-service-api/build.gradle.kts index ffa987de..3c873907 100644 --- a/query-service-api/build.gradle.kts +++ b/query-service-api/build.gradle.kts @@ -16,7 +16,7 @@ val generateLocalGoGrpcFiles = false protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.15.6" + artifact = "com.google.protobuf:protoc:3.19.2" } plugins { // Optional: an artifact spec for a protoc plugin, with "grpc" as diff --git a/query-service/build.gradle.kts b/query-service/build.gradle.kts index cb90594c..c2f31fd0 100644 --- a/query-service/build.gradle.kts +++ b/query-service/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1") runtimeOnly("io.grpc:grpc-netty") - integrationTestImplementation("com.google.protobuf:protobuf-java-util:3.17.3") + integrationTestImplementation("com.google.protobuf:protobuf-java-util:3.19.2") integrationTestImplementation("org.junit.jupiter:junit-jupiter:5.7.1") integrationTestImplementation("org.testcontainers:testcontainers:1.16.2") integrationTestImplementation("org.testcontainers:junit-jupiter:1.16.2") From a3b401621b9b1807d5b08f1eede63a0f99ebb3a3 Mon Sep 17 00:00:00 2001 From: surajpuvvada Date: Mon, 24 Jan 2022 14:29:43 -0800 Subject: [PATCH 4/4] update google protobuf to 3.19.2 in other modules --- query-service-api/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/query-service-api/build.gradle.kts b/query-service-api/build.gradle.kts index 3c873907..97977df4 100644 --- a/query-service-api/build.gradle.kts +++ b/query-service-api/build.gradle.kts @@ -72,5 +72,5 @@ dependencies { api("javax.annotation:javax.annotation-api:1.3.2") testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") - testImplementation("com.google.protobuf:protobuf-java-util:3.15.6") + testImplementation("com.google.protobuf:protobuf-java-util:3.19.2") }