@effect/platform 0.50.2 → 0.50.3

package/src/Http/UrlParams.ts

@@ -203,6 +203,7 @@ export const makeUrl = (url: string, params: UrlParams): Either.Either<URL, Erro
         urlInstance.searchParams.append(key, value)
       }
     }
+
     return Either.right(urlInstance)
   } catch (e) {
     return Either.left(e as Error)

package/src/internal/http/client.ts

@@ -20,6 +20,7 @@ import * as Error from "../../Http/ClientError.js"
 import type * as ClientRequest from "../../Http/ClientRequest.js"
 import type * as ClientResponse from "../../Http/ClientResponse.js"
 import * as Cookies from "../../Http/Cookies.js"
+import * as Headers from "../../Http/Headers.js"
 import * as Method from "../../Http/Method.js"
 import * as TraceContext from "../../Http/TraceContext.js"
 import * as UrlParams from "../../Http/UrlParams.js"
@@ -137,9 +138,11 @@ export const makeDefault = (
               if (query !== "") {
                 span.attribute("url.query", query)
               }
-              Object.entries(request.headers).forEach(([key, value]) => {
-                span.attribute(`http.request.header.${key}`, value)
-              })
+              const redactedHeaderNames = fiber.getFiberRef(Headers.currentRedactedNames)
+              const redactedHeaders = Headers.redact(request.headers, redactedHeaderNames)
+              for (const name in redactedHeaders) {
+                span.attribute(`http.request.header.${name}`, String(redactedHeaders[name]))
+              }
               return Effect.tap(
                 Effect.withParentSpan(
                   f(
@@ -152,9 +155,10 @@ export const makeDefault = (
                 ),
                 (response) => {
                   span.attribute("http.response.status_code", response.status)
-                  Object.entries(response.headers).forEach(([key, value]) => {
-                    span.attribute(`http.response.header.${key}`, value)
-                  })
+                  const redactedHeaders = Headers.redact(response.headers, redactedHeaderNames)
+                  for (const name in redactedHeaders) {
+                    span.attribute(`http.response.header.${name}`, String(redactedHeaders[name]))
+                  }
                 }
               )
             }
@@ -172,7 +176,7 @@ export const fetch: Client.Client.Default = makeDefault((request, url, signal, f
   const context = fiber.getFiberRef(FiberRef.currentContext)
   const fetch: typeof globalThis.fetch = context.unsafeMap.get(Fetch.key) ?? globalThis.fetch
   const options = fiber.getFiberRef(currentFetchOptions)
-  const headers = new Headers(request.headers)
+  const headers = new globalThis.Headers(request.headers)
   const send = (body: BodyInit | undefined) =>
     Effect.map(
       Effect.tryPromise({

package/src/internal/http/middleware.ts

@@ -112,9 +112,15 @@ export const tracer = make((httpApp) =>
     let url: URL | undefined = undefined
     try {
       url = new URL(request.url, `${protocol}://${host}`)
+      if (url.username !== "" || url.password !== "") {
+        url.username = "REDACTED"
+        url.password = "REDACTED"
+      }
     } catch (_) {
       //
     }
+    const redactedHeaderNames = fiber.getFiberRef(Headers.currentRedactedNames)
+    const redactedHeaders = Headers.redact(request.headers, redactedHeaderNames)
     return Effect.useSpan(
       `http.server ${request.method}`,
       { parent: Option.getOrUndefined(TraceContext.fromHeaders(request.headers)) },
@@ -132,9 +138,9 @@ export const tracer = make((httpApp) =>
         if (request.headers["user-agent"] !== undefined) {
           span.attribute("user_agent.original", request.headers["user-agent"])
         }
-        Object.entries(request.headers).forEach(([key, value]) => {
-          span.attribute(`http.request.header.${key}`, value)
-        })
+        for (const name in redactedHeaders) {
+          span.attribute(`http.request.header.${name}`, String(redactedHeaders[name]))
+        }
         if (request.remoteAddress._tag === "Some") {
           span.attribute("client.address", request.remoteAddress.value)
         }
@@ -146,9 +152,10 @@ export const tracer = make((httpApp) =>
             } else {
               const response = exit.value
               span.attribute("http.response.status_code", response.status)
-              Object.entries(response.headers).forEach(([key, value]) => {
-                span.attribute(`http.response.header.${key}`, value)
-              })
+              const redactedHeaders = Headers.redact(response.headers, redactedHeaderNames)
+              for (const name in redactedHeaders) {
+                span.attribute(`http.response.header.${name}`, String(redactedHeaders[name]))
+              }
             }
             return exit
           }