Skip to content
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

bump: grpc 1.58.0 #1856

Merged
merged 10 commits into from
Oct 17, 2023
Merged

bump: grpc 1.58.0 #1856

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ad4f63
bump: grpc 1.58.0
patriknw Oct 13, 2023
3421f39
protobuf-java 3.24.0, which is what grpc-protobuf:1.58.0 brings in
patriknw Oct 13, 2023
faae6c1
proto-google-common-protos 2.23.0 in test
patriknw Oct 13, 2023
9743d3f
test with old grpc-interop-testing
patriknw Oct 13, 2023
1adb40e
another workaround for ScalaPB EnumType issue
patriknw Oct 16, 2023
57ccbb6
not sure, but parallelExecution false
patriknw Oct 16, 2023
2f77991
debugging NonBalancingIntegrationSpec
patriknw Oct 16, 2023
2a540af
tests with invalid endpoints not working
patriknw Oct 17, 2023
ecd67b1
Don't use assert
patriknw Oct 17, 2023
ed712e3
bump: sbt-paradox-dependencies 0.2.4
patriknw Oct 17, 2023
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
2 changes: 1 addition & 1 deletion benchmark-java/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)

val grpcVersion = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.58.0" // checked synced by VersionSyncCheckPlugin

val runtimeProject = ProjectRef(file("../"), "akka-grpc-runtime")

Expand Down
1 change: 1 addition & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base =
.settings(
(publish / skip) := true,
fork := true,
PB.protocVersion := Dependencies.Versions.googleProtobuf,
ReflectiveCodeGen.generatedLanguages := Seq("Java"),
crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
scalaVersion := Dependencies.Versions.CrossScalaForLib.head,
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import org.gradle.api.Project

class AkkaGrpcPluginExtension {

static final String PROTOC_VERSION = "3.21.12" // checked synced by VersionSyncCheckPlugin
static final String PROTOC_VERSION = "3.24.0" // checked synced by VersionSyncCheckPlugin

static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"

static final String GRPC_VERSION = "1.54.2" // checked synced by VersionSyncCheckPlugin
static final String GRPC_VERSION = "1.58.0" // checked synced by VersionSyncCheckPlugin

static final String PLUGIN_CODE = 'com.lightbend.akka.grpc.gradle'

Expand Down
4 changes: 2 additions & 2 deletions maven-plugin/src/main/maven/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${akka-grpc.protoPaths}</protoPaths>
<outputDirectory default-value="${project.build.directory}/generated-sources">${akka-grpc.outputDirectory}</outputDirectory>
<protocVersion implementation="java.lang.String" default-value="-v3.21.12">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<protocVersion implementation="java.lang.String" default-value="-v3.24.0">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
Expand Down Expand Up @@ -185,7 +185,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths default-value="src/test/proto,src/test/protobuf">${akka-grpc.protoPaths}</protoPaths>
<outputDirectory default-value="target/generated-test-sources">${akka-grpc.outputDirectory}</outputDirectory>
<protocVersion implementation="java.lang.String" default-value="-v3.21.12">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<protocVersion implementation="java.lang.String" default-value="-v3.24.0">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
Expand Down
4 changes: 2 additions & 2 deletions plugin-tester-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<akka.http.cors.version>1.1.0</akka.http.cors.version>
<akka.version>2.9.0-M3</akka.version>
<grpc.version>1.54.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.58.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
<build-helper-maven-plugin>3.3.0</build-helper-maven-plugin>
<protobuf-java.version>3.22.2</protobuf-java.version>
<proto-google-common-protos.version>2.16.0</proto-google-common-protos.version>
<proto-google-common-protos.version>2.23.0</proto-google-common-protos.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maven.compiler.release>11</maven.compiler.release>
<akka.version>2.9.0-M3</akka.version>
<akka.http.cors.version>0.4.2</akka.http.cors.version>
<grpc.version>1.54.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.58.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
11 changes: 7 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ object Dependencies {
val akkaHttp = "10.6.0-M2"
val akkaHttpBinary = "10.6"

val grpc = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpc = "1.58.0" // checked synced by VersionSyncCheckPlugin
// FIXME should be same as `grpc` but due to https://github.com/scalapb/ScalaPB/issues/1557
// we are testing with an older version that doesn't expose that problem.
val grpcInterop = "1.54.2"

// Even referenced explicitly in the sbt-plugin's sbt-tests
// If changing this, remember to update protoc plugin version to align in
// maven-plugin/src/main/maven/plugin.xml and akka.grpc.sbt.AkkaGrpcPlugin
val googleProtobuf = "3.21.12" // checked synced by VersionSyncCheckPlugin
val googleProtobuf = "3.24.0" // checked synced by VersionSyncCheckPlugin
val googleApi = "2.23.0"

val scalaTest = "3.2.12"
Expand Down Expand Up @@ -57,7 +61,7 @@ object Dependencies {

// Excluding grpc-alts works around a complex resolution bug
// Details are in https://github.com/akka/akka-grpc/pull/469
val grpcInteropTesting = ("io.grpc" % "grpc-interop-testing" % Versions.grpc)
val grpcInteropTesting = ("io.grpc" % "grpc-interop-testing" % Versions.grpcInterop)
Copy link
Member Author

Choose a reason for hiding this comment

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

The problem was the type EnumType = EnumType scalapb/ScalaPB#1557

We also saw that in #1841 so it's something new that is brought in from proto-google-common-protos

Workaround is to test with old grpc-interop-testing until there is a new release of ScalaPB

Copy link
Member Author

Choose a reason for hiding this comment

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

Still some tests failing because of this. I was somewhat worried that this would be a showstopper for updating, but I have a tried a snapshot with various gprc projects and it seems to work fine.

.exclude("io.grpc", "grpc-alts")
.exclude("io.grpc", "grpc-xds")

Expand Down Expand Up @@ -155,6 +159,5 @@ object Dependencies {
Test.scalaTest,
Test.scalaTestPlusJunit,
Test.akkaTestkitTyped,
Protobuf.googleCommonProtos,
Copy link
Member Author

Choose a reason for hiding this comment

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

This is somewhat weird. I saw the EnumType in the plugin tester project, but that was not the case in CI. I suspect those protos are also defined in protobuf-java so some kind of undefined ordering of which one that is used. The newer protobuf-java has this problem, so using the older proto-google-common-protos.

GrpcApi.googleApiProtos)
}
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")

organization := "com.lightbend.akka.grpc"

val grpcVersion = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.58.0" // checked synced by VersionSyncCheckPlugin

libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
Expand Down
Loading