From 308857971872b11301a2a4182f10f2ad6bd5895d Mon Sep 17 00:00:00 2001
From: surajpuvvada <45047893+surajpuvvada@users.noreply.github.com>
Date: Fri, 25 Oct 2024 05:04:44 -0700
Subject: [PATCH] revert guice7 to guice6 (#248)

* revert guice7 to guice6

* update locks

---------

Co-authored-by: Harshit Kumar <harshit.kumar@traceable.ai>
---
 alerting-config-service-api/gradle.lockfile                | 4 ++--
 alerting-config-service-impl/gradle.lockfile               | 4 ++--
 config-object-store/gradle.lockfile                        | 4 ++--
 config-proto-converter/gradle.lockfile                     | 4 ++--
 config-service-api/gradle.lockfile                         | 4 ++--
 config-service-change-event-api/gradle.lockfile            | 4 ++--
 config-service-change-event-generator/gradle.lockfile      | 4 ++--
 config-service-factory/gradle.lockfile                     | 7 ++++---
 config-service-impl/gradle.lockfile                        | 4 ++--
 config-service/gradle.lockfile                             | 7 ++++---
 config-validation-utils/gradle.lockfile                    | 4 ++--
 label-application-rule-config-service-api/gradle.lockfile  | 4 ++--
 label-application-rule-config-service-impl/gradle.lockfile | 4 ++--
 labels-config-service-api/gradle.lockfile                  | 4 ++--
 labels-config-service-impl/gradle.lockfile                 | 4 ++--
 notification-channel-config-service-api/gradle.lockfile    | 4 ++--
 notification-channel-config-service-impl/gradle.lockfile   | 4 ++--
 notification-rule-config-service-api/gradle.lockfile       | 4 ++--
 notification-rule-config-service-impl/gradle.lockfile      | 4 ++--
 partitioner-config-service-api/gradle.lockfile             | 4 ++--
 partitioner-config-service-impl/build.gradle.kts           | 2 +-
 partitioner-config-service-impl/gradle.lockfile            | 7 ++++---
 settings-gradle.lockfile                                   | 5 +++++
 spaces-config-service-api/gradle.lockfile                  | 4 ++--
 spaces-config-service-impl/gradle.lockfile                 | 4 ++--
 span-processing-config-service-api/gradle.lockfile         | 4 ++--
 span-processing-config-service-impl/build.gradle.kts       | 2 +-
 span-processing-config-service-impl/gradle.lockfile        | 7 ++++---
 span-processing-utils/gradle.lockfile                      | 4 ++--
 29 files changed, 67 insertions(+), 58 deletions(-)
 create mode 100644 settings-gradle.lockfile

diff --git a/alerting-config-service-api/gradle.lockfile b/alerting-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/alerting-config-service-api/gradle.lockfile
+++ b/alerting-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/alerting-config-service-impl/gradle.lockfile b/alerting-config-service-impl/gradle.lockfile
index aef5a74a..7b00e267 100644
--- a/alerting-config-service-impl/gradle.lockfile
+++ b/alerting-config-service-impl/gradle.lockfile
@@ -43,13 +43,13 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=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.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/config-object-store/gradle.lockfile b/config-object-store/gradle.lockfile
index d6a93af2..a5d29620 100644
--- a/config-object-store/gradle.lockfile
+++ b/config-object-store/gradle.lockfile
@@ -39,10 +39,10 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/config-proto-converter/gradle.lockfile b/config-proto-converter/gradle.lockfile
index b8a11d95..a524dd96 100644
--- a/config-proto-converter/gradle.lockfile
+++ b/config-proto-converter/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-bom:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,t
 io.grpc:grpc-protobuf-lite:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/config-service-api/gradle.lockfile b/config-service-api/gradle.lockfile
index 39849309..06a42b2c 100644
--- a/config-service-api/gradle.lockfile
+++ b/config-service-api/gradle.lockfile
@@ -33,9 +33,9 @@ net.bytebuddy:byte-buddy-agent:1.14.10=testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.14.10=testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:5.8.0=testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=testRuntimeClasspath
diff --git a/config-service-change-event-api/gradle.lockfile b/config-service-change-event-api/gradle.lockfile
index 3a5ec96b..d2daa740 100644
--- a/config-service-change-event-api/gradle.lockfile
+++ b/config-service-change-event-api/gradle.lockfile
@@ -6,8 +6,8 @@ com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-bom:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
diff --git a/config-service-change-event-generator/gradle.lockfile b/config-service-change-event-generator/gradle.lockfile
index e6100407..e02013cf 100644
--- a/config-service-change-event-generator/gradle.lockfile
+++ b/config-service-change-event-generator/gradle.lockfile
@@ -39,10 +39,10 @@ org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0=testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=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.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile
index 4a8a15c3..4d7e4ff0 100644
--- a/config-service-factory/gradle.lockfile
+++ b/config-service-factory/gradle.lockfile
@@ -20,7 +20,7 @@ com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompi
 com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.inject:guice:7.0.0=runtimeClasspath,testRuntimeClasspath
+com.google.inject:guice:6.0.0=runtimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.5=runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -76,6 +76,7 @@ io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntime
 io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath
 net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath
@@ -96,7 +97,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla
 org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.7.68=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.6=runtimeClasspath,testRuntimeClasspath
@@ -104,7 +105,7 @@ org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeC
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:docstore-metrics:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-metrics:0.1.80=runtimeClasspath,testRuntimeClasspath
diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile
index 0fb70589..a952b317 100644
--- a/config-service-impl/gradle.lockfile
+++ b/config-service-impl/gradle.lockfile
@@ -73,12 +73,12 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla
 org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.7.68=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:docstore-metrics:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-metrics:0.1.80=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:service-framework-spi:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile
index c89cd675..8b2fa626 100644
--- a/config-service/gradle.lockfile
+++ b/config-service/gradle.lockfile
@@ -20,7 +20,7 @@ com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompi
 com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.inject:guice:7.0.0=runtimeClasspath,testRuntimeClasspath
+com.google.inject:guice:6.0.0=runtimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.5=runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -76,6 +76,7 @@ io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntime
 io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath
 net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath
@@ -99,7 +100,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla
 org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.7.68=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
@@ -107,7 +108,7 @@ org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeC
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:docstore-metrics:0.1.80=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-metrics:0.1.80=runtimeClasspath,testRuntimeClasspath
diff --git a/config-validation-utils/gradle.lockfile b/config-validation-utils/gradle.lockfile
index 6cea6ff4..648146e9 100644
--- a/config-validation-utils/gradle.lockfile
+++ b/config-validation-utils/gradle.lockfile
@@ -29,8 +29,8 @@ io.grpc:grpc-util:1.60.0=runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.26.0=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/label-application-rule-config-service-api/gradle.lockfile b/label-application-rule-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/label-application-rule-config-service-api/gradle.lockfile
+++ b/label-application-rule-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=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 0ca038b7..167b6756 100644
--- a/label-application-rule-config-service-impl/gradle.lockfile
+++ b/label-application-rule-config-service-impl/gradle.lockfile
@@ -43,11 +43,11 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/labels-config-service-api/gradle.lockfile b/labels-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/labels-config-service-api/gradle.lockfile
+++ b/labels-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/labels-config-service-impl/gradle.lockfile b/labels-config-service-impl/gradle.lockfile
index d79d8705..94d0745d 100644
--- a/labels-config-service-impl/gradle.lockfile
+++ b/labels-config-service-impl/gradle.lockfile
@@ -43,13 +43,13 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=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.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/notification-channel-config-service-api/gradle.lockfile b/notification-channel-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/notification-channel-config-service-api/gradle.lockfile
+++ b/notification-channel-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=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 3a533a2c..12caabe3 100644
--- a/notification-channel-config-service-impl/gradle.lockfile
+++ b/notification-channel-config-service-impl/gradle.lockfile
@@ -43,11 +43,11 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath
diff --git a/notification-rule-config-service-api/gradle.lockfile b/notification-rule-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/notification-rule-config-service-api/gradle.lockfile
+++ b/notification-rule-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=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 cbe07d1a..d44ea0c6 100644
--- a/notification-rule-config-service-impl/gradle.lockfile
+++ b/notification-rule-config-service-impl/gradle.lockfile
@@ -42,11 +42,11 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath
diff --git a/partitioner-config-service-api/gradle.lockfile b/partitioner-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/partitioner-config-service-api/gradle.lockfile
+++ b/partitioner-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/partitioner-config-service-impl/build.gradle.kts b/partitioner-config-service-impl/build.gradle.kts
index 9c39ac9b..a2c7b911 100644
--- a/partitioner-config-service-impl/build.gradle.kts
+++ b/partitioner-config-service-impl/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   api(projects.partitionerConfigServiceApi)
   implementation(commonLibs.protobuf.javautil)
 
-  implementation(commonLibs.guice7)
+  implementation(commonLibs.guice)
   implementation(commonLibs.slf4j2.api)
   implementation(commonLibs.typesafe.config)
   implementation(commonLibs.hypertrace.documentstore)
diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile
index f7623266..fefb4310 100644
--- a/partitioner-config-service-impl/gradle.lockfile
+++ b/partitioner-config-service-impl/gradle.lockfile
@@ -18,7 +18,7 @@ com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompi
 com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.inject:guice:7.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -71,6 +71,7 @@ io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClassp
 io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
@@ -93,12 +94,12 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla
 org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.7.68=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.6=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:docstore-metrics:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.serviceframework:platform-metrics:0.1.80=runtimeClasspath,testRuntimeClasspath
diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile
new file mode 100644
index 00000000..63af6091
--- /dev/null
+++ b/settings-gradle.lockfile
@@ -0,0 +1,5 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+org.hypertrace.bom:hypertrace-version-catalog:0.3.33=incomingCatalogForCommonLibs0
+empty=incomingCatalogForLocalLibs0
diff --git a/spaces-config-service-api/gradle.lockfile b/spaces-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/spaces-config-service-api/gradle.lockfile
+++ b/spaces-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/spaces-config-service-impl/gradle.lockfile b/spaces-config-service-impl/gradle.lockfile
index 92816c93..99d946d7 100644
--- a/spaces-config-service-impl/gradle.lockfile
+++ b/spaces-config-service-impl/gradle.lockfile
@@ -37,12 +37,12 @@ net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/span-processing-config-service-api/gradle.lockfile b/span-processing-config-service-api/gradle.lockfile
index dbb8740b..2973c9c8 100644
--- a/span-processing-config-service-api/gradle.lockfile
+++ b/span-processing-config-service-api/gradle.lockfile
@@ -18,6 +18,6 @@ io.grpc:grpc-protobuf:1.60.0=compileClasspath,runtimeClasspath,testCompileClassp
 io.grpc:grpc-stub:1.60.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/span-processing-config-service-impl/build.gradle.kts b/span-processing-config-service-impl/build.gradle.kts
index 69151f31..55a4fe60 100644
--- a/span-processing-config-service-impl/build.gradle.kts
+++ b/span-processing-config-service-impl/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
   implementation(commonLibs.hypertrace.grpcutils.context)
   implementation(commonLibs.hypertrace.grpcutils.client)
 
-  implementation(commonLibs.guice7)
+  implementation(commonLibs.guice)
   implementation(commonLibs.guava)
   implementation(commonLibs.slf4j2.api)
   implementation(commonLibs.typesafe.config)
diff --git a/span-processing-config-service-impl/gradle.lockfile b/span-processing-config-service-impl/gradle.lockfile
index bf351ff9..dcb78f6f 100644
--- a/span-processing-config-service-impl/gradle.lockfile
+++ b/span-processing-config-service-impl/gradle.lockfile
@@ -20,7 +20,7 @@ com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompi
 com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.inject:guice:7.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -40,17 +40,18 @@ io.netty:netty-bom:4.1.108.Final=compileClasspath,runtimeClasspath,testCompileCl
 io.perfmark:perfmark-api:0.26.0=runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
diff --git a/span-processing-utils/gradle.lockfile b/span-processing-utils/gradle.lockfile
index 9e05800f..6ffe7106 100644
--- a/span-processing-utils/gradle.lockfile
+++ b/span-processing-utils/gradle.lockfile
@@ -35,9 +35,9 @@ net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.35=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6=testRuntimeClasspath
-org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath