Skip to content

http (fix): Fail to read RPCContext if the response Rx is evaluated in a different thread #3863

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

Draft
xerial wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

http (fix): Fail to read RPCContext if the response Rx is evaluated in a different thread #3863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions airframe-http-netty/src/test/scala/wvlet/airframe/http/netty/NettyLoggingTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@
*/
package wvlet.airframe.http.netty

import wvlet.airframe.http.*
import wvlet.airframe.http.HttpLogger.InMemoryHttpLogger
import wvlet.airframe.http.{Http, HttpLogger, HttpServer, RPC, RPCContext, RxRouter}
import wvlet.airframe.http.HttpMessage.Response
import wvlet.airframe.http.client.SyncClient
import wvlet.airframe.http.netty.NettyRxFilterTest.router1
import wvlet.airframe.rx.Rx
import wvlet.airspec.AirSpec
import wvlet.log.LogSupport
import wvlet.log.io.IOUtil

import scala.collection.immutable.ListMap

object NettyLoggingTest extends AirSpec {
private val port = IOUtil.unusedPort

@RPC
class MyRPC extends LogSupport {
Expand All @@ -35,6 +38,14 @@ object NettyLoggingTest extends AirSpec {
requestCount += 1
trace("hello rpc")
}

def async(): Rx[Response] = {
RPCContext.current.setThreadLocal("user", "zzzz-xxxx")
Http.client
.newAsyncClient(s"localhost:${port}").send(
Http.POST("/wvlet.airframe.http.netty.NettyLoggingTest.MyRPC/hello")
)
}
}

private var clientLogger: InMemoryHttpLogger = null
Expand All @@ -44,6 +55,7 @@ object NettyLoggingTest extends AirSpec {
_.add(
Netty.server
.withRouter(RxRouter.of[MyRPC])
.withPort(port)
.withHttpLogger { config =>
serverLogger = new InMemoryHttpLogger(config)
serverLogger
Expand Down Expand Up @@ -95,6 +107,13 @@ object NettyLoggingTest extends AirSpec {
clientLogEntry shouldContain ("custom_log_entry" -> "log-test-client")
}

test("async server response") {
syncClient.send(Http.POST("/wvlet.airframe.http.netty.NettyLoggingTest.MyRPC/async"))
val logEntry = serverLogger.getLogs.last
debug(logEntry)
logEntry shouldContain ("user" -> "zzzz-xxxx")
logEntry shouldContain ("rpc_method" -> "async")
}
}

}
6 changes: 5 additions & 1 deletion airframe-http/src/main/scala/wvlet/airframe/http/internal/RPCResponseFilter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ import scala.util.{Failure, Success}
class RPCResponseFilter(httpLogger: HttpLogger) extends RxHttpFilter with LogSupport {
override def apply(request: HttpMessage.Request, next: RxHttpEndpoint): Rx[HttpMessage.Response] = {

def logContext = new HttpLogs.LogContext(request, httpLogger, None, Some(RPCContext.current))
// Note: RPCContext is not set before calling next(request), so
// We need to lazily evaluate the RPCContext
def logContext = {
new HttpLogs.LogContext(request, httpLogger, None, Some(RPCContext.current))
}

next(request)
.transform {
Expand Down