@effect/platform 0.15.1 → 0.16.0

package/src/internal/http/middleware.ts

@@ -1,8 +1,10 @@
 import { flow } from "@effect/data/Function"
 import * as Effect from "@effect/io/Effect"
 import * as Headers from "@effect/platform/Http/Headers"
+import * as IncomingMessage from "@effect/platform/Http/IncomingMessage"
 import type * as Middleware from "@effect/platform/Http/Middleware"
 import * as ServerRequest from "@effect/platform/Http/ServerRequest"
+import * as ServerResponse from "@effect/platform/Http/ServerResponse"
 
 /** @internal */
 export const make = <M extends Middleware.Middleware>(middleware: M): M => middleware
@@ -36,17 +38,39 @@ export const tracer = make((httpApp) =>
   Effect.flatMap(
     ServerRequest.ServerRequest,
     (request) =>
-      Effect.withSpan(
-        Effect.tap(
-          httpApp,
-          (response) => Effect.annotateCurrentSpan("http.status", response.status)
-        ),
-        `http ${request.method}`,
-        { attributes: { "http.method": request.method, "http.url": request.url } }
+      Effect.flatMap(
+        Effect.orElseSucceed(IncomingMessage.schemaExternalSpan(request), () => undefined),
+        (parent) =>
+          Effect.withSpan(
+            Effect.tap(
+              httpApp,
+              (response) => Effect.annotateCurrentSpan("http.status", response.status)
+            ),
+            `http ${request.method}`,
+            { attributes: { "http.method": request.method, "http.url": request.url }, parent }
+          )
       )
   )
 )
 
+/** @internal */
+export const b3Response = make((httpApp) =>
+  Effect.flatMap(
+    Effect.currentSpan,
+    (span) =>
+      span._tag === "Some"
+        ? Effect.map(httpApp, (res) =>
+          ServerResponse.setHeader(
+            res,
+            "b3",
+            `${span.value.traceId}-${span.value.spanId}-1${
+              span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""
+            }`
+          ))
+        : httpApp
+  )
+)
+
 /** @internal */
 export const xForwardedHeaders = make((httpApp) =>
   Effect.updateService(httpApp, ServerRequest.ServerRequest, (request) =>

package/src/internal/http/router.ts

@@ -3,6 +3,7 @@ import * as Context from "@effect/data/Context"
 import * as Equal from "@effect/data/Equal"
 import { dual } from "@effect/data/Function"
 import * as Hash from "@effect/data/Hash"
+import * as Inspectable from "@effect/data/Inspectable"
 import * as Option from "@effect/data/Option"
 import { pipeArguments } from "@effect/data/Pipeable"
 import type * as Cause from "@effect/io/Cause"
@@ -91,6 +92,19 @@ class RouterImpl<R, E> implements Router.Router<R, E> {
   [Hash.symbol](this: RouterImpl<R, E>): number {
     return Hash.random(this)
   }
+  toJSON() {
+    return {
+      _id: "Router",
+      routes: this.routes.toJSON(),
+      mounts: this.mounts.toJSON()
+    }
+  }
+  toString() {
+    return Inspectable.toString(this)
+  }
+  [Inspectable.NodeInspectSymbol]() {
+    return this.toJSON()
+  }
 }
 
 const toHttpApp = <R, E>(