@stainlessdev/xray-core 0.5.1 → 0.6.0-branch.bg-fix-req-id-gen.e29953f

package/dist/{chunk-XI5E6C7G.js → chunk-HGFCHC7O.js}

@@ -109,6 +109,25 @@ function makeCapturedBody(bytes, totalBytes, truncated, mode) {
   };
 }
 
+// src/uuid.ts
+function uuidv7() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  const timestamp = BigInt(Date.now());
+  bytes[0] = Number(timestamp >> 40n & 0xffn);
+  bytes[1] = Number(timestamp >> 32n & 0xffn);
+  bytes[2] = Number(timestamp >> 24n & 0xffn);
+  bytes[3] = Number(timestamp >> 16n & 0xffn);
+  bytes[4] = Number(timestamp >> 8n & 0xffn);
+  bytes[5] = Number(timestamp & 0xffn);
+  const byte6 = bytes[6] ?? 0;
+  const byte8 = bytes[8] ?? 0;
+  bytes[6] = byte6 & 15 | 112;
+  bytes[8] = byte8 & 63 | 128;
+  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
+  return `${hex.slice(0, 4).join("")}-${hex.slice(4, 6).join("")}-${hex.slice(6, 8).join("")}-${hex.slice(8, 10).join("")}-${hex.slice(10).join("")}`;
+}
+
 // src/state.ts
 var contextMap = /* @__PURE__ */ new WeakMap();
 var objectMap = /* @__PURE__ */ new WeakMap();
@@ -165,9 +184,10 @@ export {
   sanitizeLogString,
   sanitizeHeaderValues,
   makeCapturedBody,
+  uuidv7,
   bindContext,
   getContextState,
   bindObject,
   getContextFromObject
 };
-//# sourceMappingURL=chunk-XI5E6C7G.js.map
+//# sourceMappingURL=chunk-HGFCHC7O.js.map

package/dist/chunk-HGFCHC7O.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/logger.ts","../src/encoding.ts","../src/request_log.ts","../src/uuid.ts","../src/state.ts"],"sourcesContent":["import type { Logger, LogLevel } from './types';\n\nconst logLevelOrder: Record<LogLevel, number> = {\n  debug: 10,\n  info: 20,\n  warn: 30,\n  error: 40,\n};\n\nexport function logWithLevel(\n  logger: Logger,\n  level: LogLevel,\n  threshold: LogLevel,\n  message: string,\n  fields?: Record<string, unknown>,\n): void {\n  if (logLevelOrder[level] < logLevelOrder[threshold]) {\n    return;\n  }\n\n  const fn =\n    logger[level] ?? logger.warn ?? logger.info ?? logger.debug ?? logger.error ?? console.log;\n\n  try {\n    fn.call(logger, message, fields);\n  } catch {\n    // Logging should never disrupt instrumentation.\n  }\n}\n","const utf8Decoder =\n  typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { fatal: true }) : null;\nconst utf8DecoderLenient = typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8') : null;\nconst maybeBuffer = (\n  globalThis as typeof globalThis & {\n    Buffer?: { from(data: Uint8Array): { toString(encoding?: string): string } };\n  }\n).Buffer;\n\nexport function encodeBase64(bytes: Uint8Array): string {\n  if (maybeBuffer) {\n    return maybeBuffer.from(bytes).toString('base64');\n  }\n  let binary = '';\n  for (let i = 0; i < bytes.length; i += 1) {\n    const byte = bytes[i];\n    if (byte === undefined) {\n      continue;\n    }\n    binary += String.fromCharCode(byte);\n  }\n  if (typeof btoa !== 'undefined') {\n    return btoa(binary);\n  }\n  return '';\n}\n\nexport function isValidUtf8(bytes: Uint8Array): boolean {\n  if (!utf8Decoder) {\n    return false;\n  }\n  try {\n    utf8Decoder.decode(bytes);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nexport function decodeUtf8(bytes: Uint8Array): string {\n  if (utf8DecoderLenient) {\n    return utf8DecoderLenient.decode(bytes);\n  }\n  if (maybeBuffer) {\n    return maybeBuffer.from(bytes).toString('utf8');\n  }\n  return '';\n}\n","import type { CapturedBody } from './types';\nimport { decodeUtf8, encodeBase64, isValidUtf8 } from './encoding';\n\n// eslint-disable-next-line no-control-regex\nconst controlChars = /[\\x00-\\x1F\\x7F]/g;\n\nexport function sanitizeLogString(value: string): string {\n  if (!value) {\n    return value;\n  }\n  return value.replace(controlChars, '');\n}\n\nexport function sanitizeHeaderValues(\n  headers: Record<string, string | string[]> | undefined,\n): Record<string, string | string[]> | undefined {\n  if (!headers) {\n    return undefined;\n  }\n\n  const sanitized: Record<string, string | string[]> = {};\n  for (const [key, value] of Object.entries(headers)) {\n    const name = sanitizeLogString(key);\n    if (Array.isArray(value)) {\n      sanitized[name] = value.map((entry) => sanitizeLogString(entry));\n    } else {\n      sanitized[name] = sanitizeLogString(value);\n    }\n  }\n  return sanitized;\n}\n\nexport function makeCapturedBody(\n  bytes: Uint8Array | undefined,\n  totalBytes: number,\n  truncated: boolean,\n  mode: 'text' | 'base64',\n): CapturedBody | undefined {\n  if (!bytes) {\n    return undefined;\n  }\n\n  if (mode === 'base64') {\n    return {\n      bytes: totalBytes,\n      encoding: 'base64',\n      truncated,\n      value: encodeBase64(bytes),\n    };\n  }\n\n  if (isValidUtf8(bytes)) {\n    return {\n      bytes: totalBytes,\n      encoding: 'utf8',\n      truncated,\n      value: decodeUtf8(bytes),\n    };\n  }\n\n  return {\n    bytes: totalBytes,\n    encoding: 'base64',\n    truncated,\n    value: encodeBase64(bytes),\n  };\n}\n","/**\n * Generates a UUIDv7 string.\n * Uses crypto.getRandomValues which is available in all modern JS runtimes\n * (browsers, Node.js 15+, Deno, Bun, Cloudflare Workers, Vercel Edge, etc.)\n */\nexport function uuidv7(): string {\n  const bytes = new Uint8Array(16);\n  crypto.getRandomValues(bytes);\n\n  // Encode timestamp in first 48 bits\n  const timestamp = BigInt(Date.now());\n  bytes[0] = Number((timestamp >> 40n) & 0xffn);\n  bytes[1] = Number((timestamp >> 32n) & 0xffn);\n  bytes[2] = Number((timestamp >> 24n) & 0xffn);\n  bytes[3] = Number((timestamp >> 16n) & 0xffn);\n  bytes[4] = Number((timestamp >> 8n) & 0xffn);\n  bytes[5] = Number(timestamp & 0xffn);\n\n  // Set version (7) and variant (RFC 4122)\n  const byte6 = bytes[6] ?? 0;\n  const byte8 = bytes[8] ?? 0;\n  bytes[6] = (byte6 & 0x0f) | 0x70;\n  bytes[8] = (byte8 & 0x3f) | 0x80;\n\n  // Format as UUID string\n  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, '0'));\n  return `${hex.slice(0, 4).join('')}-${hex.slice(4, 6).join('')}-${hex.slice(6, 8).join('')}-${hex.slice(8, 10).join('')}-${hex.slice(10).join('')}`;\n}\n","import type { Span } from '@opentelemetry/api';\nimport type { AttributeValue, NormalizedRequest, XrayContext } from './types';\nimport type { CaptureConfig, RedactionConfig, ResolvedXrayConfig } from './config';\n\nexport type RequestState = {\n  request: NormalizedRequest;\n  config: ResolvedXrayConfig;\n  span?: Span;\n  context: XrayContext;\n  attributes: Record<string, AttributeValue>;\n  events: Array<{ name: string; attributes?: Record<string, AttributeValue> }>;\n  userId?: string;\n  sessionId?: string;\n  error?: unknown;\n  captureOverride?: Partial<CaptureConfig>;\n  redactionOverride?: Partial<RedactionConfig>;\n};\n\nconst contextMap = new WeakMap<XrayContext, RequestState>();\nconst objectMap = new WeakMap<object, RequestState>();\n\nexport function bindContext(ctx: XrayContext, state: RequestState): void {\n  contextMap.set(ctx, state);\n}\n\nexport function getContextState(ctx: XrayContext): RequestState | undefined {\n  return contextMap.get(ctx);\n}\n\nexport function bindObject(target: object, state: RequestState): void {\n  objectMap.set(target, state);\n}\n\nexport function getContextFromObject(target: unknown): XrayContext | undefined {\n  const state = getStateFromObject(target);\n  return state?.context;\n}\n\nexport function getStateFromObject(target: unknown): RequestState | undefined {\n  if (!target || typeof target !== 'object') {\n    return undefined;\n  }\n  if (objectMap.has(target)) {\n    return objectMap.get(target);\n  }\n\n  const fallback = findNestedTarget(target as Record<string, unknown>);\n  if (fallback && objectMap.has(fallback)) {\n    return objectMap.get(fallback);\n  }\n  return undefined;\n}\n\nfunction findNestedTarget(obj: Record<string, unknown>): object | null {\n  if (obj.raw && typeof obj.raw === 'object') {\n    return obj.raw as object;\n  }\n  if (obj.req && typeof obj.req === 'object') {\n    const req = obj.req as Record<string, unknown>;\n    if (req.raw && typeof req.raw === 'object') {\n      return req.raw as object;\n    }\n    return req as object;\n  }\n  if (obj.request && typeof obj.request === 'object') {\n    const request = obj.request as Record<string, unknown>;\n    if (request.raw && typeof request.raw === 'object') {\n      return request.raw as object;\n    }\n    return request as object;\n  }\n  return null;\n}\n"],"mappings":"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","names":[]}

package/dist/index.cjs

@@ -152,8 +152,7 @@ var defaultRedaction = {
   replacement: "[REDACTED]"
 };
 var defaultRequestId = {
-  header: "x-request-id",
-  generate: true
+  header: "request-id"
 };
 var defaultRoute = {
   normalize: true,
@@ -768,15 +767,24 @@ function setHeaderAttributes(span, headers, prefix) {
     span.setAttribute(prefix + key.toLowerCase(), Array.isArray(values) ? values : [values]);
   }
 }
-function setRequestAttributes(span, method, urlFull) {
-  span.setAttribute(import_incubating.ATTR_HTTP_REQUEST_METHOD, method);
-  if (urlFull) {
-    span.setAttribute(import_incubating.ATTR_URL_FULL, urlFull);
-    const path = extractPath(urlFull);
+function setRequestAttributes(span, request, urlFull) {
+  span.setAttribute(import_incubating.ATTR_HTTP_REQUEST_METHOD, request.method);
+  const effectiveUrl = urlFull ?? request.url;
+  if (effectiveUrl) {
+    span.setAttribute(import_incubating.ATTR_URL_FULL, effectiveUrl);
+    const path = extractPath(effectiveUrl);
     if (path) {
       span.setAttribute(import_incubating.ATTR_URL_PATH, path);
     }
   }
+  const clientAddress = clientAddressForRequest(
+    request.headers,
+    request.remoteAddress,
+    request.redactionReplacement
+  );
+  if (clientAddress) {
+    span.setAttribute(import_incubating.ATTR_CLIENT_ADDRESS, clientAddress);
+  }
 }
 function extractPath(url) {
   try {
@@ -786,6 +794,144 @@ function extractPath(url) {
     return match?.[0] || void 0;
   }
 }
+function clientAddressForRequest(headers, remoteAddress, redactionReplacement) {
+  const forwarded = forwardedClientAddress(
+    headerValues(headers, "forwarded"),
+    redactionReplacement
+  );
+  if (forwarded) {
+    return forwarded;
+  }
+  const xForwarded = xForwardedForClientAddress(
+    headerValues(headers, "x-forwarded-for"),
+    redactionReplacement
+  );
+  if (xForwarded) {
+    return xForwarded;
+  }
+  const xRealIp = xRealIpClientAddress(headerValues(headers, "x-real-ip"), redactionReplacement);
+  if (xRealIp) {
+    return xRealIp;
+  }
+  if (!remoteAddress) {
+    return void 0;
+  }
+  return remoteAddrHost(remoteAddress);
+}
+function forwardedClientAddress(values, redactionReplacement) {
+  for (const value of values) {
+    if (!value) {
+      continue;
+    }
+    const entries = value.split(",");
+    for (const entry of entries) {
+      const params = entry.split(";");
+      for (const param of params) {
+        const [rawKey, ...rest] = param.split("=");
+        if (!rawKey) {
+          continue;
+        }
+        if (rawKey.trim().toLowerCase() !== "for") {
+          continue;
+        }
+        const rawValue = rest.join("=").trim();
+        const normalized = normalizeKnownAddress(rawValue, redactionReplacement);
+        if (normalized) {
+          return normalized;
+        }
+      }
+    }
+  }
+  return void 0;
+}
+function xForwardedForClientAddress(values, redactionReplacement) {
+  for (const value of values) {
+    if (!value) {
+      continue;
+    }
+    const entries = value.split(",");
+    for (const entry of entries) {
+      const normalized = normalizeKnownAddress(entry, redactionReplacement);
+      if (normalized) {
+        return normalized;
+      }
+    }
+  }
+  return void 0;
+}
+function xRealIpClientAddress(values, redactionReplacement) {
+  for (const value of values) {
+    if (!value) {
+      continue;
+    }
+    const normalized = normalizeKnownAddress(value, redactionReplacement);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return void 0;
+}
+function normalizeKnownAddress(value, redactionReplacement) {
+  const normalized = normalizeAddress(value, redactionReplacement);
+  if (!normalized) {
+    return void 0;
+  }
+  if (normalized.toLowerCase() === "unknown") {
+    return void 0;
+  }
+  return normalized;
+}
+function normalizeAddress(value, redactionReplacement) {
+  if (!value) {
+    return void 0;
+  }
+  let trimmed = value.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (redactionReplacement && trimmed === redactionReplacement) {
+    return void 0;
+  }
+  if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length > 1) {
+    trimmed = trimmed.slice(1, -1).trim();
+  }
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed.startsWith("[")) {
+    const end = trimmed.indexOf("]");
+    if (end !== -1) {
+      return trimmed.slice(1, end);
+    }
+  }
+  const colonCount = (trimmed.match(/:/g) ?? []).length;
+  if (colonCount === 1) {
+    const host = trimmed.split(":")[0];
+    return host || void 0;
+  }
+  return trimmed;
+}
+function remoteAddrHost(value) {
+  return normalizeAddress(value);
+}
+function headerValues(headers, name) {
+  if (!headers) {
+    return [];
+  }
+  const target = name.toLowerCase();
+  const values = [];
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() !== target) {
+      continue;
+    }
+    if (Array.isArray(value)) {
+      values.push(...value);
+    } else {
+      values.push(value);
+    }
+  }
+  return values;
+}
 function setRequestBodyAttributes(span, body) {
   if (!body.value) {
     return;
@@ -915,7 +1061,7 @@ function createSpanProcessor(mode, exporter) {
 }
 function sdkVersion() {
   if (true) {
-    return "0.5.0";
+    return "0.6.0";
   }
   return "unknown";
 }
@@ -981,14 +1127,14 @@ function createEmitter(config, exporter) {
 function startRequest(config, tracer, req) {
   const startTimeMs = Number.isFinite(req.startTimeMs) ? req.startTimeMs : Date.now();
   req.startTimeMs = startTimeMs;
-  const requestId = resolveRequestId(config, req.requestId, req.headers);
-  req.requestId = requestId;
+  const explicitRequestId = normalizeRequestIdCandidate(req.requestId);
+  req.requestId = explicitRequestId;
   if (req.route && config.route.normalize) {
     req.route = config.route.normalizer ? config.route.normalizer(req.route) : normalizeRoutePattern(req.route);
   }
   const span = spanFromTracer(tracer, spanNameFromRequest(req));
   const context = {
-    requestId,
+    requestId: explicitRequestId ?? "",
     traceId: span?.spanContext().traceId,
     spanId: span?.spanContext().spanId,
     setUserId: (id) => {
@@ -1067,8 +1213,10 @@ function endRequest(config, ctx, res, err) {
   const endTimeMs = Number.isFinite(res.endTimeMs) ? res.endTimeMs : Date.now();
   res.endTimeMs = endTimeMs;
   if (!state) {
+    const resolvedRequestId2 = resolveFinalRequestId(config, ctx.requestId, res.headers);
+    ctx.requestId = resolvedRequestId2;
     const fallbackLog = {
-      requestId: ctx.requestId,
+      requestId: resolvedRequestId2,
       serviceName: config.serviceName,
       method: res.statusCode ? "UNKNOWN" : "UNKNOWN",
       url: "",
@@ -1079,12 +1227,19 @@ function endRequest(config, ctx, res, err) {
     return fallbackLog;
   }
   const request = state.request;
+  const resolvedRequestId = resolveFinalRequestId(
+    config,
+    request.requestId || ctx.requestId,
+    res.headers
+  );
+  request.requestId = resolvedRequestId;
+  ctx.requestId = resolvedRequestId;
   const capture = resolveCapture(config.capture, state.captureOverride);
   const redaction = resolveRedaction(config.redaction, state.redactionOverride);
   const route = request.route;
   const url = sanitizeLogString(request.url);
   const log = {
-    requestId: request.requestId ?? ctx.requestId,
+    requestId: resolvedRequestId,
     traceId: state.span?.spanContext().traceId,
     spanId: state.span?.spanContext().spanId,
     serviceName: config.serviceName,
@@ -1111,7 +1266,16 @@ function endRequest(config, ctx, res, err) {
   const span = state.span;
   if (span) {
     try {
-      setRequestAttributes(span, request.method, redacted.url);
+      const clientAddressHeaders = redactHeaders(request.headers, redaction);
+      setRequestAttributes(
+        span,
+        {
+          ...request,
+          headers: clientAddressHeaders,
+          redactionReplacement: redaction.replacement
+        },
+        redacted.url
+      );
       setRequestIdAttribute(span, redacted.requestId);
       span.setAttribute("service.name", config.serviceName);
       if (redacted.statusCode != null) {
@@ -1152,22 +1316,40 @@ function endRequest(config, ctx, res, err) {
   }
   return redacted;
 }
-function resolveRequestId(config, requestId, headers) {
-  if (requestId) {
-    return requestId;
+function resolveFinalRequestId(config, explicitRequestId, responseHeaders) {
+  const explicit = normalizeRequestIdCandidate(explicitRequestId);
+  if (explicit) {
+    return explicit;
   }
-  const headerName = config.requestId.header.toLowerCase();
-  const headerValue = headers[headerName];
+  const headerValue = resolveHeaderRequestId(config.requestId.header, responseHeaders);
   if (headerValue) {
-    const value = Array.isArray(headerValue) ? headerValue[0] : headerValue;
-    if (value && value.trim()) {
-      return value.trim();
+    return headerValue;
+  }
+  return uuidv7();
+}
+function resolveHeaderRequestId(headerName, headers) {
+  if (!headers) {
+    return void 0;
+  }
+  const target = headerName.toLowerCase();
+  for (const [name, value] of Object.entries(headers)) {
+    if (name.toLowerCase() !== target) {
+      continue;
+    }
+    const entry = Array.isArray(value) ? value[0] : value;
+    const normalized = normalizeRequestIdCandidate(entry);
+    if (normalized) {
+      return normalized;
     }
   }
-  if (!config.requestId.generate) {
-    return uuidv7();
+  return void 0;
+}
+function normalizeRequestIdCandidate(value) {
+  if (!value) {
+    return void 0;
   }
-  return uuidv7();
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
 }
 function resolveCapture(base, override) {
   if (!override) {