Use new BaggageLogging API in end-to-end example

Author: slashmo

UseCases/Sources/HTTPEndToEnd/InstrumentedHTTPClient.swift

@@ -15,13 +15,15 @@ import AsyncHTTPClient
 import Baggage
 import BaggageLogging
 import Instrumentation
+import Logging
 import NIO
 import NIOHTTP1
 import NIOInstrumentation
 
 struct InstrumentedHTTPClient {
     private let client: HTTPClient
     private let instrument: Instrument
+    private let logger = Logger(label: "InstrumentedHTTPClient")
 
     init(instrument: Instrument, eventLoopGroupProvider: HTTPClient.EventLoopGroupProvider) {
         self.client = HTTPClient(eventLoopGroupProvider: eventLoopGroupProvider)
@@ -41,7 +43,7 @@ struct InstrumentedHTTPClient {
     func execute(request: HTTPClient.Request, context: BaggageContext) -> EventLoopFuture<HTTPClient.Response> {
         var request = request
         self.instrument.inject(context, into: &request.headers, using: HTTPHeadersInjector())
-//        context.logger.info("🌎 InstrumentedHTTPClient: Execute request")
+        self.logger.with(context: context).info("🌎 InstrumentedHTTPClient: Execute request")
         return self.client.execute(request: request)
     }
 

UseCases/Sources/HTTPEndToEnd/Services/OrderServiceHandler.swift

@@ -13,6 +13,7 @@
 
 import AsyncHTTPClient
 import Baggage
+import BaggageLogging
 import Instrumentation
 import Logging
 import NIO
@@ -39,12 +40,10 @@ final class OrderServiceHandler: ChannelInboundHandler {
 
         self.instrument.extract(requestHead.headers, into: &baggage, using: HTTPHeadersExtractor())
 
-//        baggage.logger.info("🧾 Received order request")
-        self.logger.info("🧾 Received order request")
+        self.logger.with(context: baggage).info("🧾 Received order request")
 
         context.eventLoop.scheduleTask(in: .seconds(1)) {
-//            baggage.logger.info("🧾 Asking StorageService if your product exists")
-            self.logger.info("🧾 Asking StorageService if your product exists")
+            self.logger.with(context: baggage).info("🧾 Asking StorageService if your product exists")
 
             let request = try! HTTPClient.Request(url: "http://localhost:8081")
             self.httpClient.execute(request: request, context: baggage).whenComplete { _ in

UseCases/Sources/HTTPEndToEnd/Services/StorageServiceHandler.swift

@@ -35,12 +35,10 @@ final class StorageServiceHandler: ChannelInboundHandler {
         var baggage = BaggageContext()
         self.instrument.extract(requestHead.headers, into: &baggage, using: HTTPHeadersExtractor())
 
-//        baggage.logger.info("📦 Looking for the product")
-        self.logger.info("📦 Looking for the product")
+        self.logger.with(context: baggage).info("📦 Looking for the product")
 
         context.eventLoop.scheduleTask(in: .seconds(2)) {
-//            baggage.logger.info("📦 Found the product")
-            self.logger.info("📦 Found the product")
+            self.logger.with(context: baggage).info("📦 Found the product")
             let responseHead = HTTPResponseHead(version: requestHead.version, status: .ok)
             context.eventLoop.execute {
                 context.channel.write(self.wrapOutboundOut(.head(responseHead)), promise: nil)