Skip to content

chore: Upgrade deps #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 31, 2021
Merged

chore: Upgrade deps #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cbf4ef
Upgrade deps for data-config service
Aug 31, 2021
acd6b8d
Upgrade deps for data-query service
Aug 31, 2021
ac4e8df
Upgrade deps for hypertrace-service
Aug 31, 2021
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
10 changes: 5 additions & 5 deletions hypertrace-data-config-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ dependencies {
implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")

implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.23")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.4.0")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.4.0")
implementation("org.hypertrace.core.documentstore:document-store:0.5.4")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
implementation("org.hypertrace.core.documentstore:document-store:0.6.0")
// Config
implementation("com.typesafe:config:1.4.1")
// Logging
implementation("org.slf4j:slf4j-api:1.7.30")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1")

// GRPC
runtimeOnly("io.grpc:grpc-netty:1.36.1")
runtimeOnly("io.grpc:grpc-netty:1.40")
constraints {
runtimeOnly("io.netty:netty-codec-http2:4.1.63.Final") {
because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1089809")
Expand Down
10 changes: 5 additions & 5 deletions hypertrace-data-query-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dependencies {
implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")

implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.23")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.3.0")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.3.0")
implementation("org.hypertrace.core.documentstore:document-store:0.5.4")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
implementation("org.hypertrace.core.documentstore:document-store:0.6.0")

// Config
implementation("com.typesafe:config:1.4.1")
Expand All @@ -30,7 +30,7 @@ dependencies {
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1")

// GRPC
runtimeOnly("io.grpc:grpc-netty:1.36.1")
runtimeOnly("io.grpc:grpc-netty:1.40.0")
constraints {
runtimeOnly("io.netty:netty-codec-http2:4.1.63.Final") {
because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1089809")
Expand Down
10 changes: 5 additions & 5 deletions hypertrace-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ dependencies {
implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
implementation("org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604")

implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.23")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.4.0")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.4.0")
implementation("org.hypertrace.core.documentstore:document-store:0.5.4")
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.29")
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.6.1")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.6.1")
implementation("org.hypertrace.core.documentstore:document-store:0.6.0")
// Config
implementation("com.typesafe:config:1.4.1")
// Logging
implementation("org.slf4j:slf4j-api:1.7.30")
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1")

// GRPC
runtimeOnly("io.grpc:grpc-netty:1.36.1")
runtimeOnly("io.grpc:grpc-netty:1.40.0")
Copy link
Contributor

Choose a reason for hiding this comment

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

that said, I would have expected this to show up in the docker compose flavor too.

Copy link
Author

@findingrish findingrish Aug 31, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

yeah, so not having high hopes from this change, but wanted to give it a try.

Copy link
Contributor

Choose a reason for hiding this comment

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

For me, with the existing hypertrace-service image, docker-compose is running fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it should still work - I just noticed you said that it was happening in data query service, not in hypertrace service. Because the wrapper services are pulling in all the containers (a mistake, IMO), of the services they're depending on, I suspect that the individual services going into data query are not bringing in grpc-netty 1.40, but one of the ones coming in here is.

Copy link
Author

@findingrish findingrish Aug 31, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I suspect that the individual services going into data query are not bringing in grpc-netty 1.40

Yeah, this turned out to be the reason. grpc-netty 1.39 was being used.

Because the wrapper services are pulling in all the containers (a mistake, IMO)

The container dependency would be automatically pulled in with other dependencies?

Copy link
Contributor

Choose a reason for hiding this comment

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

we're bringing our own container and stuffing a number of impls in it. So we should be depending on
something like implementation("org.hypertrace.config.service:config-service-impl") only rather than implementation("org.hypertrace.config.service:config-service") - right now we depend on both (not sure if the code is currently written in such a way to require that, or this can be an easy fix).

The downside to doing is what we just saw - we're getting container runtime dependencies like jetty, grpc-netty etc. from each child service, throwing them into a big pile and then doing conflict resolution across all of them - makes it easy to lead to mismatches.

Copy link
Author

Choose a reason for hiding this comment

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

not sure if the code is currently written in such a way to require that, or this can be an easy fix

Filed #104, will check

constraints {
runtimeOnly("io.netty:netty-codec-http2:4.1.63.Final") {
because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1089809")
Expand Down