feat: add tag filtering and grouping (#121)

aaron-steinfeld · web-flow · commit b6b2fb389490 · 2022-01-17T04:08:59.000-08:00
* feat: add tag filtering and grouping

* chore: upgrade deps
diff --git a/.snyk b/.snyk
@@ -5,21 +5,21 @@ ignore:
   SNYK-JAVA-LOG4J-572732:
     - '*':
         reason: no available replacement
-        expires: 2021-12-31T00:00:00.000Z
+        expires: 2022-03-31T00:00:00.000Z
   SNYK-JAVA-LOG4J-1300176:
     - '*':
         reason: no available replacement
-        expires: 2021-12-31T00:00:00.000Z
+        expires: 2022-03-31T00:00:00.000Z
   SNYK-JAVA-IONETTY-473694:
     - '*':
         reason: no available replacement
-        expires: 2021-12-31T00:00:00.000Z
+        expires: 2022-03-31T00:00:00.000Z
   SNYK-JAVA-IONETTY-1042268:
     - '*':
         reason: No replacement available
-        expires: 2021-12-31T00:00:00.000Z
+        expires: 2022-03-31T00:00:00.000Z
   SNYK-JAVA-LOG4J-2316893:
     - '*':
         reason: No replacement available
-        expires: 2021-12-31T00:00:00.000Z
+        expires: 2022-03-31T00:00:00.000Z
 patch: {}
diff --git a/entity-service b/entity-service
@@ -1 +1 @@
-Subproject commit f1ddcf13286f02d692287d00c6beebe9708771f0
+Subproject commit 4febfadce4297ac4c53b7999c24f71519f1c5a34
diff --git a/gateway-service b/gateway-service
@@ -1 +1 @@
-Subproject commit 913ccfa8c0851f4b9c7f66f9c115c892635b9380
+Subproject commit 07539521826daa6d6df9a846e50650021e5817b9
diff --git a/hypertrace-data-config-service/build.gradle.kts b/hypertrace-data-config-service/build.gradle.kts
@@ -16,27 +16,26 @@ dependencies {
   implementation("org.hypertrace.config.service:config-service")
   implementation("org.hypertrace.config.service:config-service-impl")
 
-  implementation("org.eclipse.jetty:jetty-server:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")
+  implementation("org.eclipse.jetty:jetty-server:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-servlet:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927")
 
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
   implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
   implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
   implementation("org.hypertrace.core.documentstore:document-store:0.6.0")
-  // Config
   implementation("com.typesafe:config:1.4.1")
-  // Logging
-  implementation("org.slf4j:slf4j-api:1.7.30")
-  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
-
-  // GRPC
-  runtimeOnly("io.grpc:grpc-netty:1.40")
+  implementation("org.slf4j:slf4j-api:1.7.32")
   constraints {
-    runtimeOnly("io.netty:netty-codec-http2:4.1.71.Final")
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.71.Final")
+    implementation("com.google.protobuf:protobuf-java:3.19.2") {
+      because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-2331703")
+    }
   }
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+
+  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")
+  runtimeOnly("io.grpc:grpc-netty:1.43.2")
+
+  testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
 }
 
 application {
diff --git a/hypertrace-data-query-service/build.gradle.kts b/hypertrace-data-query-service/build.gradle.kts
@@ -13,30 +13,26 @@ dependencies {
   implementation("org.hypertrace.gateway.service:gateway-service")
   implementation("org.hypertrace.gateway.service:gateway-service-impl")
 
-  implementation("org.eclipse.jetty:jetty-server:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")
+  implementation("org.eclipse.jetty:jetty-server:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-servlet:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927")
 
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
   implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
   implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
   implementation("org.hypertrace.core.documentstore:document-store:0.6.0")
-
-  // Config
   implementation("com.typesafe:config:1.4.1")
-
-  // Logging
-  implementation("org.slf4j:slf4j-api:1.7.30")
-  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
-
-  // GRPC
-  runtimeOnly("io.grpc:grpc-netty:1.40.0")
+  implementation("org.slf4j:slf4j-api:1.7.32")
   constraints {
-    runtimeOnly("io.netty:netty-codec-http2:4.1.71.Final")
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.71.Final")
+    implementation("com.google.protobuf:protobuf-java:3.19.2") {
+      because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-2331703")
+    }
   }
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")
+  runtimeOnly("io.grpc:grpc-netty:1.43.2")
+
+  testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
 }
 
 application {
diff --git a/hypertrace-graphql b/hypertrace-graphql
@@ -1 +1 @@
-Subproject commit b41bda0d083d37dda424fb2a815322277cae89d6
+Subproject commit 317440bcd7a99f084a2e4b7db1986cb19728b452
diff --git a/hypertrace-service/build.gradle.kts b/hypertrace-service/build.gradle.kts
@@ -25,30 +25,23 @@ dependencies {
   implementation("org.hypertrace.config.service:config-service")
   implementation("org.hypertrace.config.service:config-service-impl")
 
-  implementation("org.eclipse.jetty:jetty-server:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")
+  implementation("org.eclipse.jetty:jetty-server:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-servlet:9.4.44.v20210927")
+  implementation("org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927")
 
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
   implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
   implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
-  implementation("org.hypertrace.core.documentstore:document-store:0.6.0")
-  // Config
+  implementation("org.hypertrace.core.documentstore:document-store:0.6.4")
   implementation("com.typesafe:config:1.4.1")
-  // Logging
-  implementation("org.slf4j:slf4j-api:1.7.30")
-  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
+  implementation("org.slf4j:slf4j-api:1.7.32")
 
-  // GRPC
-  runtimeOnly("io.grpc:grpc-netty:1.40.0")
-  constraints {
-    runtimeOnly("io.netty:netty-codec-http2:4.1.71.Final")
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.71.Final")
-  }
+  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")
+  runtimeOnly("io.grpc:grpc-netty:1.43.2")
 }
 
 application {
-  mainClassName = "org.hypertrace.core.serviceframework.PlatformServiceLauncher"
+  mainClass.set("org.hypertrace.core.serviceframework.PlatformServiceLauncher")
 }
 
 hypertraceDocker {
diff --git a/hypertrace-service/src/main/java/org/hypertrace/service/HypertraceUIServerTimerTask.java b/hypertrace-service/src/main/java/org/hypertrace/service/HypertraceUIServerTimerTask.java
@@ -166,7 +166,7 @@ private SpansRequest buildSpanRequest() {
     return SpansRequest.newBuilder()
         .setStartTimeMillis(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(10))
         .setEndTimeMillis(System.currentTimeMillis())
-        .addSelection(QueryExpressionUtil.getColumnExpression("EVENT.id"))
+        .addSelection(QueryExpressionUtil.buildAttributeExpression("EVENT.id"))
         .setLimit(1)
         .build();
   }
diff --git a/query-service b/query-service
@@ -1 +1 @@
-Subproject commit 4daed08a0af4b4752ea15bab01085e27d657cf38
+Subproject commit ed668d26633a34722c3ef289c6cf9dfd7cad12da

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private SpansRequest buildSpanRequest() {`
`166`	`166`	`return SpansRequest.newBuilder()`
`167`	`167`	`.setStartTimeMillis(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(10))`
`168`	`168`	`.setEndTimeMillis(System.currentTimeMillis())`
`169`		`- .addSelection(QueryExpressionUtil.getColumnExpression("EVENT.id"))`
	`169`	`+ .addSelection(QueryExpressionUtil.buildAttributeExpression("EVENT.id"))`
`170`	`170`	`.setLimit(1)`
`171`	`171`	`.build();`
`172`	`172`	`}`