From e321f4d807b4b716caf874e7f84a84f4528dc68a Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Wed, 19 Feb 2025 14:11:56 +0530 Subject: [PATCH 1/9] Add get label application rule api --- ...abel_application_rule_config_service.proto | 3 ++ ...LabelApplicationRuleConfigServiceImpl.java | 45 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto index d8bb01b6..3db2c749 100644 --- a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto +++ b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto @@ -13,6 +13,9 @@ service LabelApplicationRuleConfigService { // get all label application rules rpc GetLabelApplicationRules(GetLabelApplicationRulesRequest) returns (GetLabelApplicationRulesResponse) {} + // get label application rules + rpc GetLabelApplicationRule(GetLabelApplicationRuleRequest) returns (GetLabelApplicationRuleResponse) {} + // update label application rule rpc UpdateLabelApplicationRule(UpdateLabelApplicationRuleRequest) returns (UpdateLabelApplicationRuleResponse) {} diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java index c4a2fcf1..2e124f0d 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java @@ -20,6 +20,8 @@ import org.hypertrace.label.application.rule.config.service.v1.CreateLabelApplicationRuleResponse; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleRequest; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleResponse; +import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleRequest; +import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleResponse; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesRequest; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesResponse; import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule; @@ -102,6 +104,7 @@ public void getLabelApplicationRules( .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) .collect(Collectors.toUnmodifiableList()); + responseObserver.onNext( GetLabelApplicationRulesResponse.newBuilder() .addAllLabelApplicationRules(labelApplicationRules) @@ -113,6 +116,27 @@ public void getLabelApplicationRules( } } + @Override + public void getLabelApplicationRule( + GetLabelApplicationRuleRequest request, + StreamObserver responseObserver) { + try { + RequestContext requestContext = RequestContext.CURRENT.get(); + LabelApplicationRule labelApplicationRule = + getAllLabelApplicationRules(requestContext).stream() + .filter(rule -> rule.getId().equals(request.getId())) + .findFirst() + .orElseThrow(Status.NOT_FOUND::asRuntimeException); + responseObserver.onNext( + GetLabelApplicationRuleResponse.newBuilder() + .setLabelApplicationRule(labelApplicationRule) + .build()); + responseObserver.onCompleted(); + } catch (Exception e) { + responseObserver.onError(e); + } + } + @Override public void updateLabelApplicationRule( UpdateLabelApplicationRuleRequest request, @@ -201,4 +225,25 @@ private Optional getSystemLabelApplicationRule( unused -> this.deletedSystemLabelApplicationRuleStore.getData(requestContext, id).isEmpty()); } + + private List getAllLabelApplicationRules(RequestContext requestContext) { + List labelApplicationRules = + new java.util.ArrayList<>( + this.labelApplicationRuleStore.getAllObjects(requestContext).stream() + .map(ConfigObject::getData) + .collect(Collectors.toUnmodifiableList())); + Set labelApplicationRuleIds = + labelApplicationRules.stream() + .map(LabelApplicationRule::getId) + .collect(Collectors.toUnmodifiableSet()); + Set deletedSystemLabelApplicationRuleIds = + getDeletedSystemLabelApplicationRuleIds(requestContext); + List filteredSystemLabelApplicationRules = + this.labelApplicationRuleConfig.getSystemLabelApplicationRules().stream() + .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) + .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) + .collect(Collectors.toUnmodifiableList()); + labelApplicationRules.addAll(filteredSystemLabelApplicationRules); + return labelApplicationRules; + } } From 04eec2ae5b5e3952469ade66ba009da0a06e8bf7 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Wed, 19 Feb 2025 14:15:18 +0530 Subject: [PATCH 2/9] use common method --- ...LabelApplicationRuleConfigServiceImpl.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java index 2e124f0d..c807d12a 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java @@ -89,26 +89,11 @@ public void getLabelApplicationRules( try { RequestContext requestContext = RequestContext.CURRENT.get(); this.requestValidator.validateOrThrow(requestContext, request); - List labelApplicationRules = - this.labelApplicationRuleStore.getAllObjects(requestContext).stream() - .map(ConfigObject::getData) - .collect(Collectors.toUnmodifiableList()); - Set labelApplicationRuleIds = - labelApplicationRules.stream() - .map(LabelApplicationRule::getId) - .collect(Collectors.toUnmodifiableSet()); - Set deletedSystemLabelApplicationRuleIds = - getDeletedSystemLabelApplicationRuleIds(requestContext); - List filteredSystemLabelApplicationRules = - this.labelApplicationRuleConfig.getSystemLabelApplicationRules().stream() - .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) - .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) - .collect(Collectors.toUnmodifiableList()); - + List allLabelApplicationRules = + getAllLabelApplicationRules(requestContext); responseObserver.onNext( GetLabelApplicationRulesResponse.newBuilder() - .addAllLabelApplicationRules(labelApplicationRules) - .addAllLabelApplicationRules(filteredSystemLabelApplicationRules) + .addAllLabelApplicationRules(allLabelApplicationRules) .build()); responseObserver.onCompleted(); } catch (Exception e) { From 731bd7dd785e51d11339f4c992c3754a4fc2fe0a Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Wed, 19 Feb 2025 20:34:52 +0530 Subject: [PATCH 3/9] resolve comment --- ...LabelApplicationRuleConfigServiceImpl.java | 53 ++++++++----------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java index c807d12a..709916d0 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java @@ -89,11 +89,25 @@ public void getLabelApplicationRules( try { RequestContext requestContext = RequestContext.CURRENT.get(); this.requestValidator.validateOrThrow(requestContext, request); - List allLabelApplicationRules = - getAllLabelApplicationRules(requestContext); + List labelApplicationRules = + this.labelApplicationRuleStore.getAllObjects(requestContext).stream() + .map(ConfigObject::getData) + .collect(Collectors.toUnmodifiableList()); + Set labelApplicationRuleIds = + labelApplicationRules.stream() + .map(LabelApplicationRule::getId) + .collect(Collectors.toUnmodifiableSet()); + Set deletedSystemLabelApplicationRuleIds = + getDeletedSystemLabelApplicationRuleIds(requestContext); + List filteredSystemLabelApplicationRules = + this.labelApplicationRuleConfig.getSystemLabelApplicationRules().stream() + .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) + .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) + .collect(Collectors.toUnmodifiableList()); responseObserver.onNext( GetLabelApplicationRulesResponse.newBuilder() - .addAllLabelApplicationRules(allLabelApplicationRules) + .addAllLabelApplicationRules(labelApplicationRules) + .addAllLabelApplicationRules(filteredSystemLabelApplicationRules) .build()); responseObserver.onCompleted(); } catch (Exception e) { @@ -107,15 +121,13 @@ public void getLabelApplicationRule( StreamObserver responseObserver) { try { RequestContext requestContext = RequestContext.CURRENT.get(); - LabelApplicationRule labelApplicationRule = - getAllLabelApplicationRules(requestContext).stream() - .filter(rule -> rule.getId().equals(request.getId())) - .findFirst() + LabelApplicationRule rule = + this.labelApplicationRuleStore + .getData(requestContext, request.getId()) + .or(() -> getSystemLabelApplicationRule(requestContext, request.getId())) .orElseThrow(Status.NOT_FOUND::asRuntimeException); responseObserver.onNext( - GetLabelApplicationRuleResponse.newBuilder() - .setLabelApplicationRule(labelApplicationRule) - .build()); + GetLabelApplicationRuleResponse.newBuilder().setLabelApplicationRule(rule).build()); responseObserver.onCompleted(); } catch (Exception e) { responseObserver.onError(e); @@ -210,25 +222,4 @@ private Optional getSystemLabelApplicationRule( unused -> this.deletedSystemLabelApplicationRuleStore.getData(requestContext, id).isEmpty()); } - - private List getAllLabelApplicationRules(RequestContext requestContext) { - List labelApplicationRules = - new java.util.ArrayList<>( - this.labelApplicationRuleStore.getAllObjects(requestContext).stream() - .map(ConfigObject::getData) - .collect(Collectors.toUnmodifiableList())); - Set labelApplicationRuleIds = - labelApplicationRules.stream() - .map(LabelApplicationRule::getId) - .collect(Collectors.toUnmodifiableSet()); - Set deletedSystemLabelApplicationRuleIds = - getDeletedSystemLabelApplicationRuleIds(requestContext); - List filteredSystemLabelApplicationRules = - this.labelApplicationRuleConfig.getSystemLabelApplicationRules().stream() - .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) - .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) - .collect(Collectors.toUnmodifiableList()); - labelApplicationRules.addAll(filteredSystemLabelApplicationRules); - return labelApplicationRules; - } } From de2442630fd8a50b87a1bbce1c7a64af4992a05f Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Wed, 19 Feb 2025 22:41:34 +0530 Subject: [PATCH 4/9] add filter to getAllLabelApplicationRules --- ...abel_application_rule_config_service.proto | 11 ++++--- ...LabelApplicationRuleConfigServiceImpl.java | 33 ++++++------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto index 3db2c749..4724bd1b 100644 --- a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto +++ b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto @@ -13,9 +13,6 @@ service LabelApplicationRuleConfigService { // get all label application rules rpc GetLabelApplicationRules(GetLabelApplicationRulesRequest) returns (GetLabelApplicationRulesResponse) {} - // get label application rules - rpc GetLabelApplicationRule(GetLabelApplicationRuleRequest) returns (GetLabelApplicationRuleResponse) {} - // update label application rule rpc UpdateLabelApplicationRule(UpdateLabelApplicationRuleRequest) returns (UpdateLabelApplicationRuleResponse) {} @@ -39,7 +36,13 @@ message GetLabelApplicationRuleResponse { LabelApplicationRule label_application_rule = 1; } -message GetLabelApplicationRulesRequest {} +message GetLabelApplicationRulesRequest { + GetLabelApplicationRuleFilter filter = 1; +} + +message GetLabelApplicationRuleFilter { + repeated string ids = 1; +} message GetLabelApplicationRulesResponse { repeated LabelApplicationRule label_application_rules = 1; diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java index 709916d0..3d0e095b 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.hypertrace.config.objectstore.ConfigObject; import org.hypertrace.config.objectstore.IdentifiedObjectStore; import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator; @@ -20,8 +21,6 @@ import org.hypertrace.label.application.rule.config.service.v1.CreateLabelApplicationRuleResponse; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleRequest; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleResponse; -import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleRequest; -import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleResponse; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesRequest; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesResponse; import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule; @@ -104,10 +103,17 @@ public void getLabelApplicationRules( .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) .collect(Collectors.toUnmodifiableList()); + List allLabelApplicationRules = + Stream.concat( + labelApplicationRules.stream(), filteredSystemLabelApplicationRules.stream()) + .filter( + rule -> + !request.hasFilter() + || request.getFilter().getIdsList().contains(rule.getId())) + .collect(Collectors.toUnmodifiableList()); responseObserver.onNext( GetLabelApplicationRulesResponse.newBuilder() - .addAllLabelApplicationRules(labelApplicationRules) - .addAllLabelApplicationRules(filteredSystemLabelApplicationRules) + .addAllLabelApplicationRules(allLabelApplicationRules) .build()); responseObserver.onCompleted(); } catch (Exception e) { @@ -115,25 +121,6 @@ public void getLabelApplicationRules( } } - @Override - public void getLabelApplicationRule( - GetLabelApplicationRuleRequest request, - StreamObserver responseObserver) { - try { - RequestContext requestContext = RequestContext.CURRENT.get(); - LabelApplicationRule rule = - this.labelApplicationRuleStore - .getData(requestContext, request.getId()) - .or(() -> getSystemLabelApplicationRule(requestContext, request.getId())) - .orElseThrow(Status.NOT_FOUND::asRuntimeException); - responseObserver.onNext( - GetLabelApplicationRuleResponse.newBuilder().setLabelApplicationRule(rule).build()); - responseObserver.onCompleted(); - } catch (Exception e) { - responseObserver.onError(e); - } - } - @Override public void updateLabelApplicationRule( UpdateLabelApplicationRuleRequest request, From 7df3cbd6b4e6a70d1c15fc40c02602362fd195d9 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Thu, 20 Feb 2025 14:05:13 +0530 Subject: [PATCH 5/9] use identified object store with filter --- ...LabelApplicationRuleConfigServiceImpl.java | 19 +++++--------- .../service/LabelApplicationRuleStore.java | 26 ++++++++++++++----- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java index 3d0e095b..070c9558 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.hypertrace.config.objectstore.ConfigObject; import org.hypertrace.config.objectstore.IdentifiedObjectStore; +import org.hypertrace.config.objectstore.IdentifiedObjectStoreWithFilter; import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator; import org.hypertrace.config.service.v1.ConfigServiceGrpc; import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub; @@ -21,6 +21,7 @@ import org.hypertrace.label.application.rule.config.service.v1.CreateLabelApplicationRuleResponse; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleRequest; import org.hypertrace.label.application.rule.config.service.v1.DeleteLabelApplicationRuleResponse; +import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleFilter; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesRequest; import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRulesResponse; import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule; @@ -30,7 +31,8 @@ public class LabelApplicationRuleConfigServiceImpl extends LabelApplicationRuleConfigServiceGrpc.LabelApplicationRuleConfigServiceImplBase { - private final IdentifiedObjectStore labelApplicationRuleStore; + private final IdentifiedObjectStoreWithFilter + labelApplicationRuleStore; private final IdentifiedObjectStore deletedSystemLabelApplicationRuleStore; private final LabelApplicationRuleValidator requestValidator; @@ -89,7 +91,7 @@ public void getLabelApplicationRules( RequestContext requestContext = RequestContext.CURRENT.get(); this.requestValidator.validateOrThrow(requestContext, request); List labelApplicationRules = - this.labelApplicationRuleStore.getAllObjects(requestContext).stream() + this.labelApplicationRuleStore.getAllObjects(requestContext, request.getFilter()).stream() .map(ConfigObject::getData) .collect(Collectors.toUnmodifiableList()); Set labelApplicationRuleIds = @@ -103,17 +105,10 @@ public void getLabelApplicationRules( .filter(rule -> !labelApplicationRuleIds.contains(rule.getId())) .filter(rule -> !deletedSystemLabelApplicationRuleIds.contains(rule.getId())) .collect(Collectors.toUnmodifiableList()); - List allLabelApplicationRules = - Stream.concat( - labelApplicationRules.stream(), filteredSystemLabelApplicationRules.stream()) - .filter( - rule -> - !request.hasFilter() - || request.getFilter().getIdsList().contains(rule.getId())) - .collect(Collectors.toUnmodifiableList()); responseObserver.onNext( GetLabelApplicationRulesResponse.newBuilder() - .addAllLabelApplicationRules(allLabelApplicationRules) + .addAllLabelApplicationRules(labelApplicationRules) + .addAllLabelApplicationRules(filteredSystemLabelApplicationRules) .build()); responseObserver.onCompleted(); } catch (Exception e) { diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java index d3bf8c02..f3074d05 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java @@ -3,13 +3,15 @@ import com.google.protobuf.Value; import java.util.Optional; import lombok.SneakyThrows; -import org.hypertrace.config.objectstore.IdentifiedObjectStore; +import org.hypertrace.config.objectstore.IdentifiedObjectStoreWithFilter; import org.hypertrace.config.proto.converter.ConfigProtoConverter; import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator; import org.hypertrace.config.service.v1.ConfigServiceGrpc; +import org.hypertrace.label.application.rule.config.service.v1.GetLabelApplicationRuleFilter; import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule; -class LabelApplicationRuleStore extends IdentifiedObjectStore { +class LabelApplicationRuleStore + extends IdentifiedObjectStoreWithFilter { private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAME = "label-application-rule-config"; private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAMESPACE = "labels"; @@ -24,6 +26,16 @@ class LabelApplicationRuleStore extends IdentifiedObjectStore filterConfigData( + LabelApplicationRule data, GetLabelApplicationRuleFilter filter) { + return Optional.of(data) + .filter( + rule -> + filter.getIdsList().isEmpty() + || filter.getIdsList().stream().anyMatch(id -> id.equals(rule.getId()))); + } + @Override protected Optional buildDataFromValue(Value value) { try { @@ -35,14 +47,14 @@ protected Optional buildDataFromValue(Value value) { } } - @SneakyThrows @Override - protected Value buildValueFromData(LabelApplicationRule object) { - return ConfigProtoConverter.convertToValue(object); + @SneakyThrows + protected Value buildValueFromData(LabelApplicationRule data) { + return ConfigProtoConverter.convertToValue(data); } @Override - protected String getContextFromData(LabelApplicationRule object) { - return object.getId(); + protected String getContextFromData(LabelApplicationRule data) { + return data.getId(); } } From b36aa4b37de4a74618f614b0939168dc0708e7b8 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Thu, 20 Feb 2025 14:07:08 +0530 Subject: [PATCH 6/9] remove not required changes --- .../rule/config/service/LabelApplicationRuleStore.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java index f3074d05..b0d5cba4 100644 --- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java +++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java @@ -47,14 +47,14 @@ protected Optional buildDataFromValue(Value value) { } } - @Override @SneakyThrows - protected Value buildValueFromData(LabelApplicationRule data) { - return ConfigProtoConverter.convertToValue(data); + @Override + protected Value buildValueFromData(LabelApplicationRule object) { + return ConfigProtoConverter.convertToValue(object); } @Override - protected String getContextFromData(LabelApplicationRule data) { - return data.getId(); + protected String getContextFromData(LabelApplicationRule object) { + return object.getId(); } } From a177fb24b8f8f68e4640cf19cf2d455ceebf31b6 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Fri, 21 Feb 2025 11:54:56 +0530 Subject: [PATCH 7/9] add nvd api key --- .github/workflows/pr-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 3ba9a304..2daf0db0 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -61,4 +61,6 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Dependency Check - uses: hypertrace/github-actions/dependency-check@main \ No newline at end of file + uses: hypertrace/github-actions/dependency-check@main + with: + nvd-api-key: ${{ secrets.NVD_API_KEY }} \ No newline at end of file From 3fd3d3a6999c7b0f476e277360aed17a540e8dfb Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Mon, 24 Feb 2025 12:21:47 +0530 Subject: [PATCH 8/9] resolve locks --- alerting-config-service-api/gradle.lockfile | 2 +- alerting-config-service-impl/gradle.lockfile | 2 +- config-object-store/gradle.lockfile | 2 +- config-proto-converter/gradle.lockfile | 2 +- config-service-api/gradle.lockfile | 2 +- config-service-change-event-api/gradle.lockfile | 2 +- config-service-change-event-generator/gradle.lockfile | 2 +- config-service-factory/gradle.lockfile | 2 +- config-service-impl/gradle.lockfile | 2 +- config-service/gradle.lockfile | 2 +- config-validation-utils/gradle.lockfile | 2 +- label-application-rule-config-service-api/gradle.lockfile | 2 +- label-application-rule-config-service-impl/gradle.lockfile | 2 +- labels-config-service-api/gradle.lockfile | 2 +- labels-config-service-impl/gradle.lockfile | 2 +- notification-channel-config-service-api/gradle.lockfile | 2 +- notification-channel-config-service-impl/gradle.lockfile | 2 +- notification-rule-config-service-api/gradle.lockfile | 2 +- notification-rule-config-service-impl/gradle.lockfile | 2 +- partitioner-config-service-api/gradle.lockfile | 2 +- partitioner-config-service-impl/gradle.lockfile | 2 +- spaces-config-service-api/gradle.lockfile | 2 +- spaces-config-service-impl/gradle.lockfile | 2 +- span-processing-config-service-api/gradle.lockfile | 2 +- span-processing-config-service-impl/gradle.lockfile | 2 +- span-processing-utils/gradle.lockfile | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/alerting-config-service-api/gradle.lockfile b/alerting-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/alerting-config-service-api/gradle.lockfile +++ b/alerting-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/alerting-config-service-impl/gradle.lockfile b/alerting-config-service-impl/gradle.lockfile index a39dc49a..edff0b0b 100644 --- a/alerting-config-service-impl/gradle.lockfile +++ b/alerting-config-service-impl/gradle.lockfile @@ -43,7 +43,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/config-object-store/gradle.lockfile b/config-object-store/gradle.lockfile index 2d4b164a..63fcf43d 100644 --- a/config-object-store/gradle.lockfile +++ b/config-object-store/gradle.lockfile @@ -40,7 +40,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/config-proto-converter/gradle.lockfile b/config-proto-converter/gradle.lockfile index 09dd09f7..ed158f3c 100644 --- a/config-proto-converter/gradle.lockfile +++ b/config-proto-converter/gradle.lockfile @@ -23,6 +23,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/config-service-api/gradle.lockfile b/config-service-api/gradle.lockfile index fca9a67a..ff8f8cc3 100644 --- a/config-service-api/gradle.lockfile +++ b/config-service-api/gradle.lockfile @@ -33,7 +33,7 @@ net.bytebuddy:byte-buddy:1.14.10=testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.8.0=testRuntimeClasspath diff --git a/config-service-change-event-api/gradle.lockfile b/config-service-change-event-api/gradle.lockfile index 760280c7..ce6ae523 100644 --- a/config-service-change-event-api/gradle.lockfile +++ b/config-service-change-event-api/gradle.lockfile @@ -8,7 +8,7 @@ io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,t io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath diff --git a/config-service-change-event-generator/gradle.lockfile b/config-service-change-event-generator/gradle.lockfile index 933b4643..61a9d7c3 100644 --- a/config-service-change-event-generator/gradle.lockfile +++ b/config-service-change-event-generator/gradle.lockfile @@ -43,7 +43,7 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile index 56d8ee26..966a0ba3 100644 --- a/config-service-factory/gradle.lockfile +++ b/config-service-factory/gradle.lockfile @@ -98,7 +98,7 @@ org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.10=runtimeClasspath,testRuntimeClasspath diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile index 6d0e6962..fb385753 100644 --- a/config-service-impl/gradle.lockfile +++ b/config-service-impl/gradle.lockfile @@ -73,7 +73,7 @@ org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=testCompileClasspath,testRuntimeClasspath diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile index 151a63c8..5bc6072a 100644 --- a/config-service/gradle.lockfile +++ b/config-service/gradle.lockfile @@ -101,7 +101,7 @@ org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.6=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.10=runtimeClasspath,testRuntimeClasspath diff --git a/config-validation-utils/gradle.lockfile b/config-validation-utils/gradle.lockfile index 6da16c32..c4381b22 100644 --- a/config-validation-utils/gradle.lockfile +++ b/config-validation-utils/gradle.lockfile @@ -33,7 +33,7 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath diff --git a/label-application-rule-config-service-api/gradle.lockfile b/label-application-rule-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/label-application-rule-config-service-api/gradle.lockfile +++ b/label-application-rule-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/label-application-rule-config-service-impl/gradle.lockfile b/label-application-rule-config-service-impl/gradle.lockfile index 38c78e1b..d25f6ad5 100644 --- a/label-application-rule-config-service-impl/gradle.lockfile +++ b/label-application-rule-config-service-impl/gradle.lockfile @@ -43,7 +43,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/labels-config-service-api/gradle.lockfile b/labels-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/labels-config-service-api/gradle.lockfile +++ b/labels-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/labels-config-service-impl/gradle.lockfile b/labels-config-service-impl/gradle.lockfile index 62626d2c..55f6eb04 100644 --- a/labels-config-service-impl/gradle.lockfile +++ b/labels-config-service-impl/gradle.lockfile @@ -43,7 +43,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/notification-channel-config-service-api/gradle.lockfile b/notification-channel-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/notification-channel-config-service-api/gradle.lockfile +++ b/notification-channel-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/notification-channel-config-service-impl/gradle.lockfile b/notification-channel-config-service-impl/gradle.lockfile index 87a00534..2982378b 100644 --- a/notification-channel-config-service-impl/gradle.lockfile +++ b/notification-channel-config-service-impl/gradle.lockfile @@ -43,7 +43,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/notification-rule-config-service-api/gradle.lockfile b/notification-rule-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/notification-rule-config-service-api/gradle.lockfile +++ b/notification-rule-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/notification-rule-config-service-impl/gradle.lockfile b/notification-rule-config-service-impl/gradle.lockfile index 5671e571..eeab5641 100644 --- a/notification-rule-config-service-impl/gradle.lockfile +++ b/notification-rule-config-service-impl/gradle.lockfile @@ -42,7 +42,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/partitioner-config-service-api/gradle.lockfile b/partitioner-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/partitioner-config-service-api/gradle.lockfile +++ b/partitioner-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile index 3b89104a..ed5e6a8a 100644 --- a/partitioner-config-service-impl/gradle.lockfile +++ b/partitioner-config-service-impl/gradle.lockfile @@ -95,7 +95,7 @@ org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=runtimeClasspath,testRuntimeClasspath diff --git a/spaces-config-service-api/gradle.lockfile b/spaces-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/spaces-config-service-api/gradle.lockfile +++ b/spaces-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/spaces-config-service-impl/gradle.lockfile b/spaces-config-service-impl/gradle.lockfile index 5e341270..b393b378 100644 --- a/spaces-config-service-impl/gradle.lockfile +++ b/spaces-config-service-impl/gradle.lockfile @@ -37,7 +37,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/span-processing-config-service-api/gradle.lockfile b/span-processing-config-service-api/gradle.lockfile index 44ec995a..7672adb7 100644 --- a/span-processing-config-service-api/gradle.lockfile +++ b/span-processing-config-service-api/gradle.lockfile @@ -19,6 +19,6 @@ io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileCl javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/span-processing-config-service-impl/gradle.lockfile b/span-processing-config-service-impl/gradle.lockfile index 998b0473..34a137d7 100644 --- a/span-processing-config-service-impl/gradle.lockfile +++ b/span-processing-config-service-impl/gradle.lockfile @@ -46,7 +46,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/span-processing-utils/gradle.lockfile b/span-processing-utils/gradle.lockfile index 163ffa13..0f51284a 100644 --- a/span-processing-utils/gradle.lockfile +++ b/span-processing-utils/gradle.lockfile @@ -35,7 +35,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.45=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.46=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.10=testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath From 3b3c3b272a7c70f908e159be613c153be9b41222 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Mon, 24 Feb 2025 12:57:19 +0530 Subject: [PATCH 9/9] update catalog version --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index bbb790b7..4f4349d9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ plugins { } configure { - catalogVersion.set("0.3.41") + catalogVersion.set("0.3.46") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")