use updated service framework

hypertrace · Dec 18, 2024 · d0a50c2 · d0a50c2
1 parent 5f39e0a
commit d0a50c2
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 97 deletions.
diff --git a/config-service-factory/build.gradle.kts b/config-service-factory/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(commonLibs.hypertrace.framework.grpc)
+  api(localLibs.hypertrace.framework.grpc)
 
   implementation(projects.configServiceChangeEventGenerator)
   implementation(commonLibs.hypertrace.documentstore)
@@ -15,5 +15,5 @@ dependencies {
   implementation(projects.notificationRuleConfigServiceImpl)
   implementation(projects.notificationChannelConfigServiceImpl)
   implementation(projects.spanProcessingConfigServiceImpl)
-  implementation(commonLibs.hypertrace.framework.documentstore.metrics)
+  implementation(localLibs.hypertrace.framework.documentstore.metrics)
 }
diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile
@@ -31,11 +31,12 @@ com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath
 commons-codec:commons-codec:1.15=runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.14.0=runtimeClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:4.2.16=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-healthchecks:4.2.16=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-json:4.2.16=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jvm:4.2.16=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-servlets:4.2.16=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-healthchecks:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jakarta-servlets:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-json:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jvm:4.2.25=runtimeClasspath,testRuntimeClasspath
 io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-bom:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -67,18 +68,17 @@ io.netty:netty-transport:4.1.115.Final=runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_dropwizard:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_pushgateway:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_servlet:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_servlet_common:0.12.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_pushgateway:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_servlet_common:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=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.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-collections4:4.4=runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath
@@ -89,13 +89,13 @@ org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 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-http:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.20=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.8.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -106,11 +106,11 @@ org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtime
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.82=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-service-framework:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
 org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath
@@ -119,6 +119,7 @@ org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath
 org.mongodb:mongodb-driver-sync:5.2.0=runtimeClasspath,testRuntimeClasspath
 org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath
 org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
+org.slf4j:slf4j-api:2.0.9=runtimeClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/config-service-impl/build.gradle.kts b/config-service-impl/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
   implementation(commonLibs.hypertrace.documentstore)
   implementation(commonLibs.hypertrace.grpcutils.context)
-  implementation(commonLibs.hypertrace.framework.documentstore.metrics)
+  implementation(localLibs.hypertrace.framework.documentstore.metrics)
 
   annotationProcessor(commonLibs.lombok)
   compileOnly(commonLibs.lombok)

diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile
@@ -24,7 +24,8 @@ com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testC
 com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.14.0=runtimeClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:4.2.16=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.25=runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25=runtimeClasspath,testRuntimeClasspath
 io.dropwizard.metrics:metrics-jvm:4.2.16=runtimeClasspath,testRuntimeClasspath
 io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -43,16 +44,15 @@ io.netty:netty-bom:4.1.115.Final=testCompileClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_dropwizard:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_pushgateway:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_servlet:0.12.0=runtimeClasspath,testRuntimeClasspath
-io.prometheus:simpleclient_servlet_common:0.12.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_pushgateway:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_servlet_common:0.16.0=runtimeClasspath,testRuntimeClasspath
+io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=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
 net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath
@@ -64,23 +64,23 @@ 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.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.20=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.20=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.8.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.82=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=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
@@ -99,6 +99,7 @@ org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
-org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
+org.slf4j:slf4j-api:2.0.9=runtimeClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
 empty=
diff --git a/config-service/build.gradle.kts b/config-service/build.gradle.kts
@@ -55,7 +55,7 @@ tasks.integrationTest {
 }
 
 dependencies {
-  implementation(commonLibs.hypertrace.framework.grpc)
+  implementation(localLibs.hypertrace.framework.grpc)
   implementation(projects.configServiceFactory)
 
   runtimeOnly(commonLibs.log4j.slf4j2.impl)
@@ -66,7 +66,7 @@ dependencies {
   integrationTestImplementation(projects.configProtoConverter)
   integrationTestImplementation(commonLibs.junit.jupiter)
   integrationTestImplementation(commonLibs.guava)
-  integrationTestImplementation(commonLibs.hypertrace.integrationtest.framework)
+  integrationTestImplementation(localLibs.hypertrace.integrationtest.framework)
   integrationTestImplementation(commonLibs.hypertrace.grpcutils.client)
   integrationTestImplementation(commonLibs.hypertrace.grpcutils.context)
   integrationTestImplementation(commonLibs.hypertrace.documentstore)