From d0a50c29eb386d15fb642b47407e674146cfd015 Mon Sep 17 00:00:00 2001 From: Harshit Kumar Date: Wed, 18 Dec 2024 12:37:59 +0530 Subject: [PATCH] use updated service framework --- config-service-factory/build.gradle.kts | 4 +- config-service-factory/gradle.lockfile | 49 ++++++++++--------- config-service-impl/build.gradle.kts | 2 +- config-service-impl/gradle.lockfile | 37 +++++++------- config-service/build.gradle.kts | 4 +- config-service/gradle.lockfile | 49 ++++++++++--------- gradle/libs.versions.toml | 9 ++++ .../build.gradle.kts | 4 +- .../gradle.lockfile | 49 ++++++++++--------- settings-gradle.lockfile | 5 ++ 10 files changed, 115 insertions(+), 97 deletions(-) create mode 100644 settings-gradle.lockfile diff --git a/config-service-factory/build.gradle.kts b/config-service-factory/build.gradle.kts index 130cf01c..ae371b90 100644 --- 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 index bae64a10..b731f9e3 100644 --- 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 index a8a0e670..b8b5592d 100644 --- 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 index 5e88e1dd..8e64dcec 100644 --- 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,13 +64,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.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 @@ -78,9 +78,9 @@ org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeCla 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 index cc126e3d..4a2c72e6 100644 --- 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) diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile index 815ed2fa..64a1f8c3 100644 --- a/config-service/gradle.lockfile +++ b/config-service/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=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 org.apache.commons:commons-collections4:4.4=runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath @@ -92,13 +92,13 @@ org.apache.logging.log4j:log4j-core:2.20.0=runtimeClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0=runtimeClasspath,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=runtimeClasspath,testRuntimeClasspath @@ -109,11 +109,11 @@ org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=runtimeClasspath,testRun 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=runtimeClasspath,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=runtimeClasspath,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 @@ -122,6 +122,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/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1fda6f60..0c2de0ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,2 +1,11 @@ +[versions] +hypertrace-framework = "0.1.83-SNAPSHOT" + [libraries] seancfoley-ipaddress = { module = "com.github.seancfoley:ipaddress", version = "5.3.4" } + +hypertrace-framework-grpc = { module = "org.hypertrace.core.serviceframework:platform-grpc-service-framework", version.ref = "hypertrace-framework" } +hypertrace-framework-http = { module = "org.hypertrace.core.serviceframework:platform-http-service-framework", version.ref = "hypertrace-framework" } +hypertrace-framework-metrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "hypertrace-framework" } +hypertrace-framework-documentstore-metrics = { module = "org.hypertrace.core.serviceframework:docstore-metrics", version.ref = "hypertrace-framework" } +hypertrace-integrationtest-framework = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" } \ No newline at end of file diff --git a/partitioner-config-service-impl/build.gradle.kts b/partitioner-config-service-impl/build.gradle.kts index 9c39ac9b..2e8f1c4c 100644 --- a/partitioner-config-service-impl/build.gradle.kts +++ b/partitioner-config-service-impl/build.gradle.kts @@ -12,8 +12,8 @@ dependencies { implementation(commonLibs.slf4j2.api) implementation(commonLibs.typesafe.config) implementation(commonLibs.hypertrace.documentstore) - implementation(commonLibs.hypertrace.framework.grpc) - implementation(commonLibs.hypertrace.framework.documentstore.metrics) + implementation(localLibs.hypertrace.framework.grpc) + implementation(localLibs.hypertrace.framework.documentstore.metrics) annotationProcessor(commonLibs.lombok) compileOnly(commonLibs.lombok) diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile index 31acbb6a..726572b6 100644 --- a/partitioner-config-service-impl/gradle.lockfile +++ b/partitioner-config-service-impl/gradle.lockfile @@ -27,11 +27,12 @@ com.helger:profiler:1.1.1=runtimeClasspath,testRuntimeClasspath com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.15=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 @@ -63,17 +64,16 @@ 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 jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,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 @@ -86,13 +86,13 @@ org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath 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 @@ -100,11 +100,11 @@ org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeC org.hypertrace.core.grpcutils:grpc-context-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.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 @@ -128,5 +128,6 @@ 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 empty= 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