expose URL_PATH for exclusion rules (#218)

hypertrace · Feb 19, 2024 · 8a804dc · 8a804dc
1 parent bf4c23c
commit 8a804dc
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 27 deletions.
diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
diff --git a/hypertrace-graphql-attribute-scope/gradle.lockfile b/hypertrace-graphql-attribute-scope/gradle.lockfile
@@ -49,7 +49,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-entity-schema/gradle.lockfile b/hypertrace-graphql-entity-schema/gradle.lockfile
@@ -50,7 +50,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-entity-type/gradle.lockfile b/hypertrace-graphql-entity-type/gradle.lockfile
@@ -49,7 +49,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-explorer-context/gradle.lockfile b/hypertrace-graphql-explorer-context/gradle.lockfile
@@ -50,7 +50,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-explorer-schema/gradle.lockfile b/hypertrace-graphql-explorer-schema/gradle.lockfile
@@ -50,7 +50,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-gateway-service-metric-utils/gradle.lockfile b/hypertrace-graphql-gateway-service-metric-utils/gradle.lockfile
@@ -48,7 +48,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-impl/gradle.lockfile b/hypertrace-graphql-impl/gradle.lockfile
@@ -52,11 +52,11 @@ org.apache.commons:commons-lang3:3.12.0=runtimeClasspath
 org.apache.commons:commons-text:1.10.0=runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:label-application-rule-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:labels-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:spaces-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:span-processing-config-service-api:0.1.56=runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:label-application-rule-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:labels-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:spaces-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:span-processing-config-service-api:0.1.60=runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-labels-schema-api/gradle.lockfile b/hypertrace-graphql-labels-schema-api/gradle.lockfile
@@ -49,7 +49,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-labels-schema-impl/gradle.lockfile b/hypertrace-graphql-labels-schema-impl/gradle.lockfile
@@ -50,9 +50,9 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:label-application-rule-config-service-api:0.1.56=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:labels-config-service-api:0.1.56=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:label-application-rule-config-service-api:0.1.60=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:labels-config-service-api:0.1.60=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-metric-schema/gradle.lockfile b/hypertrace-graphql-metric-schema/gradle.lockfile
@@ -49,7 +49,7 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-service-config/gradle.lockfile b/hypertrace-graphql-service-config/gradle.lockfile
@@ -9,7 +9,7 @@ com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath
 io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath
 io.grpc:grpc-bom:1.60.0=compileClasspath,runtimeClasspath
 javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.4.5=compileClasspath,runtimeClasspath
 org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath

diff --git a/hypertrace-graphql-service/gradle.lockfile b/hypertrace-graphql-service/gradle.lockfile
@@ -105,11 +105,11 @@ org.eclipse.jetty:jetty-servlets:9.4.53.v20231009=runtimeClasspath
 org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009=runtimeClasspath
 org.eclipse.jetty:jetty-util:9.4.53.v20231009=runtimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:label-application-rule-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:labels-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:spaces-config-service-api:0.1.56=runtimeClasspath
-org.hypertrace.config.service:span-processing-config-service-api:0.1.56=runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:label-application-rule-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:labels-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:spaces-config-service-api:0.1.60=runtimeClasspath
+org.hypertrace.config.service:span-processing-config-service-api:0.1.60=runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-spaces-schema/gradle.lockfile b/hypertrace-graphql-spaces-schema/gradle.lockfile
@@ -49,8 +49,8 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:spaces-config-service-api:0.1.56=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:spaces-config-service-api:0.1.60=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/hypertrace-graphql-span-processing-schema/gradle.lockfile b/hypertrace-graphql-span-processing-schema/gradle.lockfile
@@ -48,8 +48,8 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
 javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.12=compileClasspath,runtimeClasspath
-org.hypertrace.config.service:span-processing-config-service-api:0.1.56=compileClasspath,runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.15=compileClasspath,runtimeClasspath
+org.hypertrace.config.service:span-processing-config-service-api:0.1.60=compileClasspath,runtimeClasspath
 org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
 org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.1=runtimeClasspath

diff --git a/...main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java b/...main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
@@ -72,6 +72,7 @@ public class ConfigServiceSpanFilterConverter {
       FIELD_FILTER_FIELD_IMMUTABLE_BI_MAP =
           ImmutableBiMap.<Field, SpanProcessingFilterField>builder()
               .put(Field.FIELD_URL, SpanProcessingFilterField.URL)
+              .put(Field.FIELD_URL_PATH, SpanProcessingFilterField.URL_PATH)
               .put(Field.FIELD_SERVICE_NAME, SpanProcessingFilterField.SERVICE_NAME)
               .put(Field.FIELD_ENVIRONMENT_NAME, SpanProcessingFilterField.ENVIRONMENT_NAME)
               .build();

diff --git a/...a/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingFilterField.java b/...a/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingFilterField.java
@@ -5,6 +5,7 @@
 @GraphQLName(SpanProcessingFilterField.TYPE_NAME)
 public enum SpanProcessingFilterField {
   URL,
+  URL_PATH,
   SERVICE_NAME,
   ENVIRONMENT_NAME;
   static final String TYPE_NAME = "SpanProcessingFilterField";
+1 −1		hypertrace-core-graphql-attribute-scope-constants/gradle.lockfile
+1 −1		hypertrace-core-graphql-attribute-scope/gradle.lockfile
+3 −2		hypertrace-core-graphql-attribute-store/gradle.lockfile
+3 −2		hypertrace-core-graphql-common-schema/gradle.lockfile
+3 −2		hypertrace-core-graphql-context/gradle.lockfile
+3 −2		hypertrace-core-graphql-deserialization/gradle.lockfile
+1 −1		hypertrace-core-graphql-gateway-service-utils/gradle.lockfile
+1 −1		hypertrace-core-graphql-grpc-utils/gradle.lockfile
+1 −1		hypertrace-core-graphql-impl/gradle.lockfile
+3 −2		hypertrace-core-graphql-log-event-schema/gradle.lockfile
+3 −2		hypertrace-core-graphql-metadata-schema/gradle.lockfile
+1 −1		hypertrace-core-graphql-request-transformation/gradle.lockfile
+1 −1		hypertrace-core-graphql-rx-utils/gradle.lockfile
+1 −1		hypertrace-core-graphql-schema-registry/gradle.lockfile
+3 −2		hypertrace-core-graphql-schema-utils/gradle.lockfile
+1 −1		hypertrace-core-graphql-service/gradle.lockfile
+3 −2		hypertrace-core-graphql-span-schema/gradle.lockfile
+1 −1		hypertrace-core-graphql-spi/gradle.lockfile
+3 −2		hypertrace-core-graphql-trace-schema/gradle.lockfile
+2 −2		settings.gradle.kts