Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions platform-grpc-service-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ plugins {

dependencies {
api(project(":platform-service-framework"))
api(platform("io.grpc:grpc-bom:1.47.0"))
api(platform("io.grpc:grpc-bom:1.52.1"))
api("io.grpc:grpc-api")
api("io.grpc:grpc-services")
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.10.0")
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.11.2")
api("com.typesafe:config:1.4.2")
api(project(":service-framework-spi"))

Expand All @@ -19,5 +19,5 @@ dependencies {

implementation(project(":platform-metrics"))
implementation("org.slf4j:slf4j-api:1.7.36")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.10.0")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.11.2")
}
8 changes: 4 additions & 4 deletions platform-http-service-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

dependencies {
api(project(":platform-service-framework"))
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.10.0")
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.11.2")
api("com.typesafe:config:1.4.2")
api("javax.servlet:javax.servlet-api:4.0.1")
api("com.google.inject:guice:5.1.0")
Expand All @@ -14,9 +14,9 @@ dependencies {
implementation("org.slf4j:slf4j-api:1.7.36")
implementation("com.google.inject.extensions:guice-servlet:5.1.0")
implementation("com.google.guava:guava:31.1-jre")
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
implementation("org.eclipse.jetty:jetty-server:9.4.48.v20220622")
implementation("org.eclipse.jetty:jetty-servlets:9.4.48.v20220622")
implementation("org.eclipse.jetty:jetty-servlet:9.4.50.v20221201")
implementation("org.eclipse.jetty:jetty-server:9.4.50.v20221201")
implementation("org.eclipse.jetty:jetty-servlets:9.4.50.v20221201")

annotationProcessor("org.projectlombok:lombok:1.18.24")
compileOnly("org.projectlombok:lombok:1.18.24")
Expand Down
6 changes: 3 additions & 3 deletions platform-metrics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ dependencies {

implementation("io.github.mweirauch:micrometer-jvm-extras:0.2.2")
implementation("org.slf4j:slf4j-api:1.7.36")
implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1")
implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.19.0")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laxmanchekka The specific logging implementation is not provided by the framework - that's the responsibility of each individual container to select and provide their own implementation. I believe this was a recently introduced regression from one of your PRs - can you follow up and fix (for example, providing the log4j metric conditionally, or splitting it out for consumers to optionally provide).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#60 - PR that introduced issue

implementation("io.dropwizard.metrics:metrics-jvm:4.2.13")
implementation("io.prometheus:simpleclient_dropwizard:0.12.0")
implementation("io.prometheus:simpleclient_servlet:0.12.0")
implementation("io.prometheus:simpleclient_pushgateway:0.12.0")
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
implementation("com.google.guava:guava:30.1.1-jre")
implementation("org.eclipse.jetty:jetty-servlet:9.4.50.v20221201")
implementation("com.google.guava:guava:31.1-jre")

testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
testImplementation("org.mockito:mockito-core:4.8.0")
Expand Down
8 changes: 4 additions & 4 deletions platform-service-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

// Use for thread dump servlet
implementation("io.dropwizard.metrics:metrics-servlets:4.2.13")
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
implementation("org.eclipse.jetty:jetty-servlet:9.4.50.v20221201")

// Use for metrics servlet
implementation("io.prometheus:simpleclient_servlet:0.12.0")
Expand All @@ -32,9 +32,9 @@ dependencies {
}
}

testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.19.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
testImplementation("org.mockito:mockito-core:4.8.0")
testImplementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622:tests")
testImplementation("org.eclipse.jetty:jetty-http:9.4.48.v20220622:tests")
testImplementation("org.eclipse.jetty:jetty-servlet:9.4.50.v20221201:tests")
testImplementation("org.eclipse.jetty:jetty-http:9.4.50.v20221201:tests")
}