Merge branch 'main' into wip-periodic-client-discovery-refresh

Author: johanandren

.github/workflows/build-test.yml

@@ -217,12 +217,12 @@ jobs:
       - name: Test Maven Java
         run: |-
           cd plugin-tester-java
-          mvn -Dakka.grpc.project.version=`cat ~/.version` compile
+          mvn -nsu -ntp -Dakka.grpc.project.version=`cat ~/.version` compile
 
       - name: Test Maven Scala
         run: |-
           cd plugin-tester-scala
-          mvn -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate scala:compile
+          mvn -nsu -ntp -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate scala:compile
 
   test-docs:
     name: Docs

.github/workflows/native-image-tests.yml

@@ -0,0 +1,60 @@
+name: Native Image Tests
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  native-image-tests:
+    name: Run Native Image Tests
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+
+      - name: Checkout GitHub merge
+        if: github.event.pull_request
+        run: |-
+          git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
+          git checkout scratch
+
+      - name: Cache Coursier cache
+        # https://github.com/coursier/cache-action/releases
+        uses: coursier/[email protected]
+
+      - name: Set up JDK 11
+        # https://github.com/coursier/setup-action/releases
+        uses: coursier/[email protected]
+        with:
+          jvm: temurin:1.11
+
+      - name: Gather version
+        run: |-
+          echo `git describe --tags | sed -e "s/v\(.*\)-\([0-9][0-9]*\).*/\\1+\\2-/"``git rev-parse HEAD | head -c8`-SNAPSHOT > ~/.version
+          cat ~/.version
+
+      - name: Publish artifacts locally
+        run: |-
+          sbt "publishLocal; publishM2"
+
+      - name: Email on failure
+        if: ${{ failure() }}
+        uses: dawidd6/action-send-mail@6063705cefe50cb915fc53bb06d4049cae2953b2
+        with:
+          server_address: smtp.gmail.com
+          server_port: 465
+          secure: true
+          username: ${{secrets.MAIL_USERNAME}}
+          password: ${{secrets.MAIL_PASSWORD}}
+          subject: "Failed: ${{ github.workflow }} / ${{ github.job }}"
+          to: ${{secrets.MAIL_SEND_TO}}
+          from: Akka CI
+          body: |
+            Job ${{ github.job }} in workflow ${{ github.workflow }} of ${{github.repository}} failed!
+            https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.github/workflows/nightly.yml

@@ -37,8 +37,6 @@ jobs:
         uses: coursier/[email protected]
         with:
           jvm: ${{ matrix.jvmName }}
-          # FIXME default index not giving us access to JDK 21 (yet)
-          jvm-index: https://raw.githubusercontent.com/coursier/jvm-index/32d659500e6c65efb9eee91718a0fb0e797ad4ee/index.json
 
       - name: sbt test
         run: |-

.github/workflows/publish.yml

@@ -39,7 +39,8 @@ jobs:
   gradle-plugin:
     name: Release gradle plugin
     runs-on: ubuntu-22.04
-    if: github.repository == 'akka/akka-grpc'
+    # only on tagged release, not snapshot
+    if: github.repository == 'akka/akka-grpc' && startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Checkout
         uses: actions/[email protected]

benchmark-java/build.sbt

@@ -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.58.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.60.0" // checked synced by VersionSyncCheckPlugin
 
 val runtimeProject = ProjectRef(file("../"), "akka-grpc-runtime")
 

benchmark-java/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8

gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy

@@ -9,7 +9,7 @@ class AkkaGrpcPluginExtension {
 
     static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"
 
-    static final String GRPC_VERSION = "1.58.0" // checked synced by VersionSyncCheckPlugin
+    static final String GRPC_VERSION = "1.60.0" // checked synced by VersionSyncCheckPlugin
 
     static final String PLUGIN_CODE = 'com.lightbend.akka.grpc.gradle'
 

plugin-tester-java/pom.xml

@@ -15,8 +15,9 @@
     <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     <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.1</akka.version>
-    <grpc.version>1.58.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
+    <grpc.version>1.60.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>

plugin-tester-scala/pom.xml

@@ -14,7 +14,7 @@
     <maven.compiler.release>11</maven.compiler.release>
     <akka.version>2.9.1</akka.version>
     <akka.http.cors.version>0.4.2</akka.http.cors.version>
-    <grpc.version>1.58.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
+    <grpc.version>1.60.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
 

project/Common.scala

@@ -7,7 +7,6 @@ import akka.grpc.Dependencies.Versions.{ scala212, scala213, scala3 }
 import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys.projectInfoVersion
 import org.scalafmt.sbt.ScalafmtPlugin.autoImport.scalafmtOnCompile
 import com.typesafe.tools.mima.plugin.MimaKeys._
-import sbtprotoc.ProtocPlugin.autoImport.PB
 import xerial.sbt.Sonatype
 
 object Common extends AutoPlugin {

project/Dependencies.scala

@@ -22,13 +22,13 @@ object Dependencies {
     val akkaHttp = "10.6.0"
     val akkaHttpBinary = "10.6"
 
-    val grpc = "1.58.0" // checked synced by VersionSyncCheckPlugin
+    val grpc = "1.60.0" // checked synced by VersionSyncCheckPlugin
 
     // 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.24.0" // checked synced by VersionSyncCheckPlugin
-    val googleApi = "2.23.0"
+    val googleApi = "2.30.0"
 
     val scalaTest = "3.2.12"
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8

project/plugins.sbt

@@ -8,23 +8,23 @@ addSbtPlugin("lt.dvim.authors" % "sbt-authors" % "1.3")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV)
-addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.2")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.3")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 // docs
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.53")
+addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.54")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.4")
-addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
+addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0")
 
 // For RawText
-libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.2.202306221912-r"
+libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.3.202401111512-r"
 
 // scripted testing
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

runtime/src/main/mima-filters/2.4.0.backwards.excludes/grpc-core-1.60.excludes

@@ -0,0 +1,2 @@
+# internal API
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.grpc.internal.AkkaDiscoveryNameResolverProvider.this")

runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProvider.scala

@@ -21,6 +21,7 @@ import scala.concurrent.duration.FiniteDuration
 private[akka] final class AkkaDiscoveryNameResolverProvider(
     discovery: ServiceDiscovery,
     defaultPort: Int,
+    serviceName: String,
     portName: Option[String],
     protocol: Option[String],
     resolveTimeout: FiniteDuration,
@@ -33,7 +34,6 @@ private[akka] final class AkkaDiscoveryNameResolverProvider(
   override def getDefaultScheme: String = "http"
 
   override def newNameResolver(targetUri: URI, args: NameResolver.Args): AkkaDiscoveryNameResolver = {
-    require(targetUri.getAuthority != null, s"target uri should not have null authority, got [$targetUri]")
     new AkkaDiscoveryNameResolver(
       discovery,
       defaultPort,

runtime/src/main/scala/akka/grpc/internal/Codecs.scala

@@ -25,11 +25,8 @@ object Codecs {
    * @return a codec to compress data frame bodies with, which will be [[Identity]] unless the client specifies support for another supported encoding.
    */
   def negotiate(request: jm.HttpRequest): Codec = {
-    val accepted: Array[String] =
-      request.asInstanceOf[sm.HttpMessage].header[`Message-Accept-Encoding`] match {
-        case Some(h) => h.values
-        case None    => Array.empty
-      }
+    // DO NOT USE request.header[`Message-Accept-Encoding`], as that doesn't work for custom headers
+    val accepted = `Message-Accept-Encoding`.findIn(request.asInstanceOf[sm.HttpMessage].headers)
 
     if (accepted.length == 0) {
       Identity

runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala

@@ -11,28 +11,36 @@ import javax.net.ssl.SSLContext
 import akka.{ Done, NotUsed }
 import akka.annotation.InternalApi
 import akka.event.LoggingAdapter
-import akka.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.scaladsl.{ Flow, Keep, Source }
-import io.grpc.{ CallOptions, MethodDescriptor }
+import akka.grpc.GrpcClientSettings
+import akka.grpc.GrpcResponseMetadata
+import akka.grpc.GrpcSingleResponse
+import akka.stream.scaladsl.Flow
+import akka.stream.scaladsl.Keep
+import akka.stream.scaladsl.Source
+import akka.Done
+import akka.NotUsed
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts
 import io.grpc.netty.shaded.io.grpc.netty.NegotiationType
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder
-import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig.{
-  Protocol,
-  SelectedListenerFailureBehavior,
-  SelectorFailureBehavior
-}
-import io.grpc.netty.shaded.io.netty.handler.ssl.{
-  ApplicationProtocolConfig,
-  ApplicationProtocolNames,
-  SslContext,
-  SslContextBuilder
-}
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig.Protocol
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig.SelectedListenerFailureBehavior
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig.SelectorFailureBehavior
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolNames
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder
+import io.grpc.CallOptions
+import io.grpc.MethodDescriptor
 
+import java.util.concurrent.TimeUnit
+import javax.net.ssl.SSLContext
 import scala.annotation.nowarn
 import scala.concurrent.duration.FiniteDuration
-import scala.concurrent.{ ExecutionContext, Future, Promise }
-import scala.util.{ Failure, Success }
+import scala.concurrent.ExecutionContext
+import scala.concurrent.Future
+import scala.concurrent.Promise
+import scala.util.Failure
+import scala.util.Success
 
 /**
  * INTERNAL API
@@ -51,15 +59,17 @@ object NettyClientUtils {
     @nowarn("msg=deprecated")
     var builder =
       NettyChannelBuilder
-        // Not sure why netty wants to be able to shoe-horn the target into a URI... but ok,
-        // we follow their lead and encode the service name as the 'authority' of the URI.
-        .forTarget("//" + settings.serviceName)
+        // Used to be the way to pass the service name to the name resolver but
+        // Since grpc-core 1.60.0 Netty does no longer seem to pass the authority along, so we do that
+        // ourselves below (channel builder is not shared between different clients anyway).
+        .forTarget(s"//${settings.serviceName}")
         .flowControlWindow(NettyChannelBuilder.DEFAULT_FLOW_CONTROL_WINDOW)
         // TODO avoid nameResolverFactory #1092, then 'nowarn' can be removed above
         .nameResolverFactory(
           new AkkaDiscoveryNameResolverProvider(
             settings.serviceDiscovery,
             settings.defaultPort,
+            settings.serviceName,
             settings.servicePortName,
             settings.serviceProtocol,
             settings.resolveTimeout,
@@ -181,7 +191,9 @@ object NettyClientUtils {
    */
   @InternalApi
   private def createNettySslContext(javaSslContext: SSLContext): SslContext = {
-    import io.grpc.netty.shaded.io.netty.handler.ssl.{ ClientAuth, IdentityCipherSuiteFilter, JdkSslContext }
+    import io.grpc.netty.shaded.io.netty.handler.ssl.ClientAuth
+    import io.grpc.netty.shaded.io.netty.handler.ssl.IdentityCipherSuiteFilter
+    import io.grpc.netty.shaded.io.netty.handler.ssl.JdkSslContext
     // See
     // https://github.com/netty/netty/blob/4.1/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java#L229-L309
     val apn = new ApplicationProtocolConfig(

runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala

@@ -51,6 +51,7 @@ class AkkaDiscoveryNameResolverProviderSpec
       val provider = new AkkaDiscoveryNameResolverProvider(
         discovery,
         443,
+        serviceName = serviceName,
         portName = None,
         protocol = None,
         resolveTimeout = 3.seconds,

sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt

@@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 organization := "com.lightbend.akka.grpc"
 
-val grpcVersion = "1.58.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.60.0" // checked synced by VersionSyncCheckPlugin
 
 libraryDependencies ++= Seq(
   "io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",