Skip to content

feat: add tag filtering and grouping #121

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
merged 2 commits into from
Jan 17, 2022
Merged

feat: add tag filtering and grouping #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ee3ac
feat: add tag filtering and grouping
aaron-steinfeld Jan 14, 2022
f946c27
chore: upgrade deps
aaron-steinfeld Jan 14, 2022
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
10 changes: 5 additions & 5 deletions .snyk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
2 changes: 1 addition & 1 deletion entity-service
Open in desktop
Submodule entity-service updated 9 files
+4 −4 entity-data-service-rx-client/build.gradle.kts
+3 −3 entity-service-api/build.gradle.kts
+2 −2 entity-service-change-event-generator/build.gradle.kts
+3 −3 entity-service-client/build.gradle.kts
+3 −3 entity-service-impl/build.gradle.kts
+19 −20 entity-service-impl/src/main/java/org/hypertrace/entity/query/service/EntityQueryServiceImpl.java
+74 −0 entity-service-impl/src/test/java/org/hypertrace/entity/query/service/EntityQueryServiceImplTest.java
+5 −9 entity-service/build.gradle.kts
+4 −4 entity-type-service-rx-client/build.gradle.kts
2 changes: 1 addition & 1 deletion gateway-service
Open in desktop
Submodule gateway-service updated 65 files
+3 −3 gateway-service-api/build.gradle.kts
+7 −0 gateway-service-api/src/main/proto/org/hypertrace/gateway/service/v1/gateway_query.proto
+4 −4 gateway-service-impl/build.gradle.kts
+2 −3 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/GatewayServiceImpl.java
+2 −2 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineServiceQueryParser.java
+1 −1 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/QueryRequestContext.java
+20 −15 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/comparators/OrderByComparator.java
+3 −3 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/config/ScopeFilterConfig.java
+9 −25 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/config/ScopeFilterConfigs.java
+21 −12 ...src/main/java/org/hypertrace/gateway/service/common/converters/EntityServiceAndGatewayServiceConverter.java
+65 −33 ...ervice-impl/src/main/java/org/hypertrace/gateway/service/common/converters/QueryAndGatewayDtoConverter.java
+14 −13 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/converters/QueryRequestUtil.java
+54 −27 ...ce-impl/src/main/java/org/hypertrace/gateway/service/common/datafetcher/EntityDataServiceEntityFetcher.java
+40 −34 ...service-impl/src/main/java/org/hypertrace/gateway/service/common/datafetcher/EntityInteractionsFetcher.java
+90 −57 ...service-impl/src/main/java/org/hypertrace/gateway/service/common/datafetcher/QueryServiceEntityFetcher.java
+8 −34 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/transformer/RequestPreProcessor.java
+4 −1 ...way-service-impl/src/main/java/org/hypertrace/gateway/service/common/transformer/ResponsePostProcessor.java
+22 −0 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/AttributeMetadataUtil.java
+107 −13 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/ExpressionReader.java
+19 −38 ...ay-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/MetricAggregationFunctionUtil.java
+2 −2 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/OrderByUtil.java
+19 −44 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/QueryExpressionUtil.java
+2 −5 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/common/util/TimeRangeFilterUtil.java
+12 −6 ...-service-impl/src/main/java/org/hypertrace/gateway/service/common/validators/function/AvgRateValidator.java
+12 −6 ...mpl/src/main/java/org/hypertrace/gateway/service/common/validators/function/OneArgAggregationValidator.java
+12 −6 ...rvice-impl/src/main/java/org/hypertrace/gateway/service/common/validators/function/PercentileValidator.java
+4 −57 ...y-service-impl/src/main/java/org/hypertrace/gateway/service/common/validators/request/RequestValidator.java
+1 −1 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/EntityService.java
+35 −33 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionContext.java
+4 −1 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java
+10 −7 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/update/EdsEntityUpdater.java
+3 −2 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/ExploreRequestValidator.java
+5 −12 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/RequestHandler.java
+31 −31 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/TheRestGroupRequestHandler.java
+6 −8 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/TimeAggregationsRequestHandler.java
+8 −8 ...ce-impl/src/main/java/org/hypertrace/gateway/service/explore/TimeAggregationsWithGroupByRequestHandler.java
+6 −1 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/logevent/LogEventsService.java
+6 −1 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/span/SpanService.java
+8 −4 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/trace/TraceComparator.java
+12 −4 gateway-service-impl/src/main/java/org/hypertrace/gateway/service/trace/TracesService.java
+6 −6 ...y-service-impl/src/test/java/org/hypertrace/gateway/service/common/QueryServiceRequestAndResponseUtils.java
+11 −16 gateway-service-impl/src/test/java/org/hypertrace/gateway/service/common/config/ScopeFilterConfigsTest.java
+10 −37 ...pl/src/test/java/org/hypertrace/gateway/service/common/converter/GatewayValueToQueryValueConverterTest.java
+4 −14 ...ice-impl/src/test/java/org/hypertrace/gateway/service/common/converter/QueryAndGatewayDtoConverterTest.java
+29 −79 ...ice-impl/src/test/java/org/hypertrace/gateway/service/common/datafetcher/EntityInteractionsFetcherTest.java
+15 −15 ...ce-impl/src/test/java/org/hypertrace/gateway/service/common/datafetcher/QueryServiceEntityFetcherTests.java
+25 −47 ...y-service-impl/src/test/java/org/hypertrace/gateway/service/common/transformer/RequestPreProcessorTest.java
+1 −1 ...ervice-impl/src/test/java/org/hypertrace/gateway/service/common/util/MetricAggregationFunctionUtilTest.java
+1 −1 gateway-service-impl/src/test/java/org/hypertrace/gateway/service/common/util/QueryExpressionUtilTest.java
+11 −11 ...-service-impl/src/test/java/org/hypertrace/gateway/service/entity/EntitiesRequestResponseProcessorTest.java
+41 −66 gateway-service-impl/src/test/java/org/hypertrace/gateway/service/entity/EntityServiceTest.java
+15 −36 ...y-service-impl/src/test/java/org/hypertrace/gateway/service/explore/TimeAggregationsRequestHandlerTest.java
+0 −29 gateway-service-impl/src/test/java/org/hypertrace/gateway/service/testutils/GatewayExpressionCreator.java
+26 −26 ...sources/query-service-requests-and-responses/explore/aggregations-with-groupby-and-the-rest-deprecated.json
+14 −14 ...service-impl/src/test/resources/query-service-requests-and-responses/explore/aggregations-with-groupby.json
+68 −68 ...ery-service-requests-and-responses/explore/aggregations-with-multiple-groupbys-and-the-rest-deprecated.json
+19 −18 ...mpl/src/test/resources/query-service-requests-and-responses/explore/group-by-with-group-limit-and-rest.json
+10 −10 ...service-impl/src/test/resources/query-service-requests-and-responses/explore/group-by-with-group-limit.json
+36 −34 ...es/query-service-requests-and-responses/explore/grouped-time-aggregation-with-group-limit-and-the-rest.json
+25 −24 .../test/resources/query-service-requests-and-responses/explore/grouped-time-aggregation-with-group-limit.json
+16 −16 gateway-service-impl/src/test/resources/query-service-requests-and-responses/explore/simple-aggregations.json
+14 −14 gateway-service-impl/src/test/resources/query-service-requests-and-responses/explore/simple-selection.json
+14 −14 ...-impl/src/test/resources/query-service-requests-and-responses/explore/time-aggregations-space-filtered.json
+12 −12 gateway-service-impl/src/test/resources/query-service-requests-and-responses/explore/time-aggregations.json
+3 −3 gateway-service/build.gradle.kts
25 changes: 12 additions & 13 deletions hypertrace-data-config-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
26 changes: 11 additions & 15 deletions hypertrace-data-query-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hypertrace-graphql
Open in desktop
Submodule hypertrace-graphql updated 98 files
+1 −1 .snyk
+1 −1 hypertrace-core-graphql
+6 −3 hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/EntityDaoModule.java
+1 −1 hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/EntityNeighborMapFetcher.java
+21 −13 ...ce-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityConverter.java
+16 −13 hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityDao.java
+13 −10 ...-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityEdgeFetcher.java
+2 −1 ...l-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityEdgeTableConverter.java
+6 −3 ...y-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityInteractionRequestBuilder.java
+30 −10 ...ce-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/joiner/DefaultEntityJoinerBuilder.java
+7 −0 hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/joiner/EntityJoinerBuilder.java
+3 −1 ...hql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/DefaultEntityLabelRequestBuilder.java
+17 −8 hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/EdgeRequestBuilder.java
+2 −0 ...aphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/NeighborEntitiesRequestBuilder.java
+11 −5 ...raphql-entity-schema/src/test/java/org/hypertrace/graphql/entity/joiner/DefaultEntityJoinerBuilderTest.java
+7 −3 ...entity-schema/src/test/java/org/hypertrace/graphql/entity/request/DefaultEntityLabelRequestBuilderTest.java
+11 −4 ...-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/dao/GatewayServiceSelectionMapConverter.java
+4 −0 ...ema/src/main/java/org/hypertrace/graphql/explorer/deserialization/GroupByArgumentDeserializationConfig.java
+17 −11 ...race-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExploreResultMapKey.java
+14 −7 ...graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExplorerSelectionFetcher.java
+25 −11 ...hql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/request/DefaultExploreRequestBuilder.java
+3 −2 ...phql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/request/ExploreOrderArgumentBuilder.java
+47 −47 ...l-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/request/ExploreSelectionRequestBuilder.java
+3 −1 hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/schema/ExploreResult.java
+12 −2 ...-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/schema/argument/GroupByArgument.java
+6 −2 ...-explorer-schema/src/test/java/org/hypertrace/graphql/explorer/request/ExploreOrderArgumentBuilderTest.java
+16 −6 .../src/main/java/org/hypertrace/graphql/utils/metrics/gateway/AggregatableOrderByExpressionListConverter.java
+0 −0 ...tils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/BaselinedConvertedAggregationContainer.java
+3 −0 ...tils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/BaselinedMetricAggregationMapConverter.java
+7 −4 ...rvice-metric-utils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/GatewayMetricUtilsModule.java
+9 −8 ...tils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/MetricAggregationContainerMapConverter.java
+17 −10 ...-utils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/MetricAggregationExpressionConverter.java
+10 −7 ...ce-metric-utils/src/main/java/org/hypertrace/graphql/utils/metrics/gateway/MetricContainerMapConverter.java
+0 −1 hypertrace-graphql-impl/build.gradle.kts
+0 −2 hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java
+0 −34 hypertrace-graphql-label-application-rules-schema/build.gradle.kts
+0 −23 ...schema/src/main/java/org/hypertrace/graphql/label/application/rules/LabelApplicationRuleSchemaFragment.java
+0 −21 ...s-schema/src/main/java/org/hypertrace/graphql/label/application/rules/LabelApplicationRuleSchemaModule.java
+0 −41 ...java/org/hypertrace/graphql/label/application/rules/schema/mutation/LabelApplicationRuleMutationSchema.java
+0 −17 .../main/java/org/hypertrace/graphql/label/application/rules/schema/query/LabelApplicationRuleQuerySchema.java
+2 −0 hypertrace-graphql-labels-schema-api/build.gradle.kts
+6 −6 ...trace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleDao.java
+1 −1 ...s-schema-api/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleIdArgument.java
+3 −3 ...aphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelApplicationRuleFetcher.java
+6 −8 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java
+15 −0 ...rtrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/EntityAndRuleJoiner.java
+10 −0 ...graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/EntityAndRuleJoinerBuilder.java
+5 −0 ...aphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabelApplicationRulesRequest.java
+11 −0 ...ace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabeledEntitiesRequest.java
+4 −4 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleCreateMutator.java
+3 −3 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleDeleteMutator.java
+4 −4 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleUpdateMutator.java
+2 −2 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleCreateRequest.java
+1 −1 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleDeleteRequest.java
+1 −1 ...abels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleRequestBuilder.java
+2 −2 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleUpdateRequest.java
+21 −1 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/Label.java
+9 −0 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java
+0 −20 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabeledEntities.java
+32 −0 ...aphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java
+1 −1 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/Action.java
+1 −1 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/Condition.java
+1 −1 ...-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/LabelApplicationRule.java
+1 −1 ...phql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/LabelApplicationRuleData.java
+1 −2 ...labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/LabelApplicationRuleResultSet.java
+1 −1 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/LeafCondition.java
+1 −1 hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/StaticLabels.java
+1 −1 ...trace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/StringCondition.java
+1 −1 ...rtrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/UnaryCondition.java
+1 −1 ...rtrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/ValueCondition.java
+3 −0 hypertrace-graphql-labels-schema-impl/build.gradle.kts
+6 −0 hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java
+6 −6 ...labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleConfigServiceDao.java
+1 −1 ...raphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleDaoModule.java
+15 −20 ...labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleRequestConverter.java
+11 −11 ...abels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java
+58 −14 ...trace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java
+9 −9 ...c/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDataDeserializationConfig.java
+10 −10 ...l/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDeserializationConfig.java
+1 −1 ...l/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDeserializationModule.java
+376 −0 ...labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/DefaultEntityAndRuleJoinerBuilder.java
+1 −0 hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java
+4 −4 ...-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleRequestBuilderImpl.java
+1 −1 ...abels-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelApplicationRuleRequestModule.java
+4 −0 ...main/java/org/hypertrace/graphql/metric/deserialization/AggregatableOrderArgumentDeserializationConfig.java
+21 −12 ...tric-schema/src/main/java/org/hypertrace/graphql/metric/request/DefaultMetricAggregationRequestBuilder.java
+10 −7 ...-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/DefaultMetricRequestBuilder.java
+3 −2 ...ace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricAggregationRequest.java
+5 −9 ...phql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricAggregationRequestBuilder.java
+29 −13 ...e-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricQueryableBuilderUtil.java
+3 −2 hypertrace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricRequest.java
+2 −2 hypertrace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricRequestModule.java
+11 −7 ...e-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricSeriesRequestBuilder.java
+14 −2 ...ce-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/schema/MetricAggregationQueryable.java
+15 −1 hypertrace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/schema/MetricQueryable.java
+13 −8 hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/dao/ExplorerBackedSpacesDao.java
+20 −5 ...race-graphql-spaces-schema/src/test/java/org/hypertrace/graphql/spaces/dao/ExplorerBackedSpacesDaoTest.java
+0 −1 settings.gradle.kts
23 changes: 8 additions & 15 deletions hypertrace-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hypertrace-service/src/main/java/org/hypertrace/service/HypertraceUIServerTimerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion query-service
Open in desktop
Submodule query-service updated 25 files
+4 −3 query-service-api/build.gradle.kts
+2 −2 query-service-client/build.gradle.kts
+7 −10 query-service-impl/build.gradle.kts
+174 −0 query-service-impl/src/main/java/org/hypertrace/core/query/service/AbstractQueryTransformation.java
+7 −13 query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryRequestUtil.java
+2 −0 query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java
+11 −1 query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformation.java
+1 −0 query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java
+18 −0 ...ce-impl/src/main/java/org/hypertrace/core/query/service/attribubteexpression/AttributeExpressionModule.java
+41 −0 .../org/hypertrace/core/query/service/attribubteexpression/AttributeExpressionNormalizationTransformation.java
+134 −0 ...rtrace/core/query/service/attribubteexpression/AttributeExpressionSubpathExistsFilteringTransformation.java
+1 −1 query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotBasedRequestHandler.java
+27 −265 query-service-impl/src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java
+17 −0 query-service-impl/src/test/java/org/hypertrace/core/query/service/QueryRequestBuilderUtils.java
+5 −1 query-service-impl/src/test/java/org/hypertrace/core/query/service/QueryTransformationPipelineTest.java
+75 −0 .../hypertrace/core/query/service/attribubteexpression/AttributeExpressionNormalizationTransformationTest.java
+235 −0 ...ce/core/query/service/attribubteexpression/AttributeExpressionSubpathExistsFilteringTransformationTest.java
+52 −0 query-service-impl/src/test/java/org/hypertrace/core/query/service/pinot/MigrationTest.java
+68 −272 ...y-service-impl/src/test/java/org/hypertrace/core/query/service/projection/ProjectionTransformationTest.java
+10 −21 query-service/build.gradle.kts
+17 −4 query-service/src/integrationTest/java/org/hypertrace/core/query/service/htqueries/HTPinotQueriesTest.java
+13 −0 query-service/src/integrationTest/resources/attribute-expression-test-queries/aggregated_function_query.json
+0 −0 query-service/src/integrationTest/resources/attribute-expression-test-queries/group_by_query.json
+22 −0 query-service/src/integrationTest/resources/attribute-expression-test-queries/not_contains_key_query.json
+0 −0 query-service/src/integrationTest/resources/attribute-expression-test-queries/order_by_query.json