apitally 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/validationErrors.js

@@ -2,14 +2,13 @@ import { MAX_BODY_SIZE } from "./bodyCapture.js";
 import { brotliDecompressSync, unzipSync } from "node:zlib";
 //#region src/validationErrors.ts
 const VALIDATION_ERROR_EVENT_NAME = "apitally.request.validation_error";
-const MAX_GROUPS = 100;
+const MAX_ERRORS = 100;
 const MAX_CONSUMER_LENGTH = 128;
 const MAX_PATH_LENGTH = 2e3;
 const MAX_SOURCE_LENGTH = 32;
 const MAX_FIELD_LENGTH = 2048;
 const MAX_MESSAGE_LENGTH = 2048;
 const MAX_TYPE_LENGTH = 128;
-const MAX_COUNT = 2 ** 32 - 1;
 const SOURCE_ALIASES = {
 	body: "body",
 	query: "query",
@@ -22,48 +21,52 @@ const SOURCE_ALIASES = {
 	headers: "header",
 	cookies: "cookie"
 };
-const VALIDATION_ERROR_GROUPS_KEY = Symbol.for("apitally.validationErrorGroups");
-const validationErrorGroupsHolder = globalThis;
-const validationErrorGroups = validationErrorGroupsHolder[VALIDATION_ERROR_GROUPS_KEY] ?? /* @__PURE__ */ new Map();
-validationErrorGroupsHolder[VALIDATION_ERROR_GROUPS_KEY] = validationErrorGroups;
+const VALIDATION_ERROR_AGGREGATES_KEY = Symbol.for("apitally.validationErrorAggregates");
+const validationErrorAggregatesHolder = globalThis;
+const validationErrorAggregates = validationErrorAggregatesHolder[VALIDATION_ERROR_AGGREGATES_KEY] ?? /* @__PURE__ */ new Map();
+validationErrorAggregatesHolder[VALIDATION_ERROR_AGGREGATES_KEY] = validationErrorAggregates;
 function isValidationResponseStatus(statusCode) {
 	return statusCode === 400 || statusCode === 422;
 }
 function addValidationErrors(consumer, method, path, details) {
 	method = method.toUpperCase();
 	if (method === "OPTIONS" || !path) return;
+	consumer = consumer?.slice(0, MAX_CONSUMER_LENGTH);
 	for (const detail of details) {
-		const group = {
+		const fields = {
 			method,
 			path: path.slice(0, MAX_PATH_LENGTH),
 			source: detail.source.slice(0, MAX_SOURCE_LENGTH),
 			field: detail.field.slice(0, MAX_FIELD_LENGTH),
 			message: detail.message.slice(0, MAX_MESSAGE_LENGTH),
-			type: detail.type.slice(0, MAX_TYPE_LENGTH),
-			count: 1
+			type: detail.type.slice(0, MAX_TYPE_LENGTH)
 		};
-		if (consumer !== void 0) group.consumer = consumer.slice(0, MAX_CONSUMER_LENGTH);
-		const key = [
-			group.consumer ?? "",
-			group.method,
-			group.path,
-			group.source,
-			group.field,
-			group.message,
-			group.type
-		].join("\0");
-		const existing = validationErrorGroups.get(key);
-		if (existing) existing.count = Math.min(existing.count + 1, MAX_COUNT);
-		else if (validationErrorGroups.size < MAX_GROUPS) validationErrorGroups.set(key, group);
+		const key = Object.values(fields).join("\0");
+		let aggregate = validationErrorAggregates.get(key);
+		if (!aggregate) {
+			if (validationErrorAggregates.size >= MAX_ERRORS) continue;
+			aggregate = {
+				...fields,
+				counts: /* @__PURE__ */ new Map()
+			};
+			validationErrorAggregates.set(key, aggregate);
+		}
+		aggregate.counts.set(consumer, (aggregate.counts.get(consumer) ?? 0) + 1);
 	}
 }
 function drainValidationErrors() {
-	const groups = [...validationErrorGroups.values()];
-	validationErrorGroups.clear();
-	return groups;
+	const aggregates = [...validationErrorAggregates.values()];
+	validationErrorAggregates.clear();
+	return aggregates.map(({ counts, ...fields }) => ({
+		...fields,
+		counts: [...counts].map(([consumer, count]) => consumer === void 0 ? { count } : {
+			consumer,
+			count
+		})
+	}));
 }
 function resetValidationErrors() {
-	validationErrorGroups.clear();
+	validationErrorAggregates.clear();
 }
 function normalizeSource(source) {
 	return typeof source === "string" ? SOURCE_ALIASES[source.toLowerCase()] ?? "" : "";

package/dist/validationErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"validationErrors.js","names":[],"sources":["../src/validationErrors.ts"],"sourcesContent":["import { brotliDecompressSync, unzipSync } from \"node:zlib\";\nimport type { AnyValueMap } from \"@opentelemetry/api-logs\";\nimport { MAX_BODY_SIZE } from \"./bodyCapture.js\";\n\nexport const VALIDATION_ERROR_EVENT_NAME = \"apitally.request.validation_error\";\n\nconst MAX_GROUPS = 100;\nconst MAX_CONSUMER_LENGTH = 128;\nconst MAX_PATH_LENGTH = 2_000;\nconst MAX_SOURCE_LENGTH = 32;\nconst MAX_FIELD_LENGTH = 2_048;\nconst MAX_MESSAGE_LENGTH = 2_048;\nconst MAX_TYPE_LENGTH = 128;\nconst MAX_COUNT = 2 ** 32 - 1;\n\nconst SOURCE_ALIASES: Record<string, string> = {\n  body: \"body\",\n  query: \"query\",\n  path: \"path\",\n  header: \"header\",\n  cookie: \"cookie\",\n  querystring: \"query\",\n  params: \"path\",\n  path_params: \"path\",\n  headers: \"header\",\n  cookies: \"cookie\",\n};\n\nexport type ValidationErrorDetail = {\n  source: string;\n  field: string;\n  message: string;\n  type: string;\n};\n\ntype ValidationErrorGroup = ValidationErrorDetail & {\n  consumer?: string;\n  method: string;\n  path: string;\n  count: number;\n};\n\nconst VALIDATION_ERROR_GROUPS_KEY = Symbol.for(\"apitally.validationErrorGroups\");\nconst validationErrorGroupsHolder = globalThis as Record<\n  symbol,\n  Map<string, ValidationErrorGroup> | undefined\n>;\nconst validationErrorGroups =\n  validationErrorGroupsHolder[VALIDATION_ERROR_GROUPS_KEY] ??\n  new Map<string, ValidationErrorGroup>();\nvalidationErrorGroupsHolder[VALIDATION_ERROR_GROUPS_KEY] = validationErrorGroups;\n\nexport function isValidationResponseStatus(statusCode: number): boolean {\n  return statusCode === 400 || statusCode === 422;\n}\n\nexport function addValidationErrors(\n  consumer: string | undefined,\n  method: string,\n  path: string,\n  details: ValidationErrorDetail[],\n): void {\n  method = method.toUpperCase();\n  if (method === \"OPTIONS\" || !path) {\n    return;\n  }\n  for (const detail of details) {\n    const group: ValidationErrorGroup = {\n      method,\n      path: path.slice(0, MAX_PATH_LENGTH),\n      source: detail.source.slice(0, MAX_SOURCE_LENGTH),\n      field: detail.field.slice(0, MAX_FIELD_LENGTH),\n      message: detail.message.slice(0, MAX_MESSAGE_LENGTH),\n      type: detail.type.slice(0, MAX_TYPE_LENGTH),\n      count: 1,\n    };\n    if (consumer !== undefined) {\n      group.consumer = consumer.slice(0, MAX_CONSUMER_LENGTH);\n    }\n    const key = [\n      group.consumer ?? \"\",\n      group.method,\n      group.path,\n      group.source,\n      group.field,\n      group.message,\n      group.type,\n    ].join(\"\\0\");\n    const existing = validationErrorGroups.get(key);\n    if (existing) {\n      existing.count = Math.min(existing.count + 1, MAX_COUNT);\n    } else if (validationErrorGroups.size < MAX_GROUPS) {\n      validationErrorGroups.set(key, group);\n    }\n  }\n}\n\nexport function drainValidationErrors(): AnyValueMap[] {\n  const groups = [...validationErrorGroups.values()];\n  validationErrorGroups.clear();\n  return groups;\n}\n\nexport function resetValidationErrors(): void {\n  validationErrorGroups.clear();\n}\n\nexport function normalizeSource(source: unknown): string {\n  return typeof source === \"string\" ? (SOURCE_ALIASES[source.toLowerCase()] ?? \"\") : \"\";\n}\n\n// Zod, Standard Schema, and TypeBox issues share this shape. A Standard Schema\n// path segment may be an object carrying the key; a TypeBox path is a JSON pointer.\nexport function formatIssues(issues: unknown, source = \"\"): ValidationErrorDetail[] {\n  if (!Array.isArray(issues)) {\n    return [];\n  }\n  const details: ValidationErrorDetail[] = [];\n  for (const issue of issues) {\n    if (!isRecord(issue) || typeof issue.message !== \"string\") {\n      continue;\n    }\n    const path = Array.isArray(issue.path)\n      ? issue.path\n      : typeof issue.path === \"string\"\n        ? issue.path\n            .split(\"/\")\n            .filter(Boolean)\n            .map((segment) => segment.replace(/~1/g, \"/\").replace(/~0/g, \"~\"))\n        : [];\n    details.push({\n      source,\n      field: path\n        .map((segment: unknown) => (isRecord(segment) ? segment.key : segment))\n        .filter((segment) => typeof segment === \"string\" || typeof segment === \"number\")\n        .join(\".\"),\n      message: issue.message,\n      type: typeof issue.code === \"string\" ? issue.code : \"\",\n    });\n  }\n  return details;\n}\n\n// zod 3 serializes issues as `error.issues`; zod 4 hides them as a JSON string\n// in `error.message`.\nexport function extractZodValidationErrors(body: unknown): ValidationErrorDetail[] {\n  if (!isRecord(body)) {\n    return [];\n  }\n  const error = isRecord(body.error) ? body.error : undefined;\n  let issues = body.issues ?? error?.issues;\n  if (issues === undefined && error?.name === \"ZodError\" && typeof error.message === \"string\") {\n    try {\n      issues = JSON.parse(error.message);\n    } catch {\n      return [];\n    }\n  }\n  return formatIssues(issues);\n}\n\n// Recognized response shapes: zod issues, express-validator, and celebrate.\nexport function extractExpressValidationErrors(body: unknown): ValidationErrorDetail[] {\n  if (!isRecord(body)) {\n    return [];\n  }\n  const zodDetails = extractZodValidationErrors(body);\n  if (zodDetails.length > 0) {\n    return zodDetails;\n  }\n  if (Array.isArray(body.errors)) {\n    return extractExpressValidatorErrors(body.errors);\n  }\n  if (isRecord(body.validation)) {\n    return extractCelebrateErrors(body.validation);\n  }\n  return [];\n}\n\nfunction extractExpressValidatorErrors(errors: unknown[]): ValidationErrorDetail[] {\n  const details: ValidationErrorDetail[] = [];\n  for (const error of errors) {\n    if (\n      !isRecord(error) ||\n      error.type !== \"field\" ||\n      typeof error.path !== \"string\" ||\n      typeof error.msg !== \"string\"\n    ) {\n      continue;\n    }\n    const source = normalizeSource(error.location);\n    if (source) {\n      details.push({ source, field: error.path, message: error.msg, type: \"\" });\n    }\n  }\n  return details;\n}\n\n// Celebrate joins the messages of all failed keys into one sentence list, so\n// each key takes the sentence naming it.\nfunction extractCelebrateErrors(validation: Record<string, unknown>): ValidationErrorDetail[] {\n  const details: ValidationErrorDetail[] = [];\n  for (const error of Object.values(validation)) {\n    if (!isRecord(error) || !Array.isArray(error.keys) || typeof error.message !== \"string\") {\n      continue;\n    }\n    const sentences = error.message.split(\". \");\n    for (const key of error.keys) {\n      if (typeof key === \"string\") {\n        details.push({\n          source: normalizeSource(error.source),\n          field: key,\n          message: sentences.find((sentence) => sentence.includes(`\"${key}\"`)) ?? error.message,\n          type: \"\",\n        });\n      }\n    }\n  }\n  return details;\n}\n\nexport function parseJsonResponseBody(body: Buffer | undefined, contentEncoding: unknown): unknown {\n  if (!body) {\n    return undefined;\n  }\n  try {\n    const encoding =\n      typeof contentEncoding === \"string\" ? contentEncoding.trim().toLowerCase() : \"\";\n    let decoded = body;\n    if (encoding === \"br\") {\n      decoded = brotliDecompressSync(body, { maxOutputLength: MAX_BODY_SIZE });\n    } else if (encoding === \"gzip\" || encoding === \"deflate\") {\n      decoded = unzipSync(body, { maxOutputLength: MAX_BODY_SIZE });\n    } else if (encoding !== \"\" && encoding !== \"identity\") {\n      return undefined;\n    }\n    return JSON.parse(decoded.toString());\n  } catch {\n    // A body that cannot be decoded as JSON carries no recognizable validation details.\n  }\n  return undefined;\n}\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null;\n}\n"],"mappings":"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"}
+{"version":3,"file":"validationErrors.js","names":[],"sources":["../src/validationErrors.ts"],"sourcesContent":["import { brotliDecompressSync, unzipSync } from \"node:zlib\";\nimport type { AnyValueMap } from \"@opentelemetry/api-logs\";\nimport { MAX_BODY_SIZE } from \"./bodyCapture.js\";\n\nexport const VALIDATION_ERROR_EVENT_NAME = \"apitally.request.validation_error\";\n\nconst MAX_ERRORS = 100;\nconst MAX_CONSUMER_LENGTH = 128;\nconst MAX_PATH_LENGTH = 2_000;\nconst MAX_SOURCE_LENGTH = 32;\nconst MAX_FIELD_LENGTH = 2_048;\nconst MAX_MESSAGE_LENGTH = 2_048;\nconst MAX_TYPE_LENGTH = 128;\n\nconst SOURCE_ALIASES: Record<string, string> = {\n  body: \"body\",\n  query: \"query\",\n  path: \"path\",\n  header: \"header\",\n  cookie: \"cookie\",\n  querystring: \"query\",\n  params: \"path\",\n  path_params: \"path\",\n  headers: \"header\",\n  cookies: \"cookie\",\n};\n\nexport type ValidationErrorDetail = {\n  source: string;\n  field: string;\n  message: string;\n  type: string;\n};\n\ntype ValidationErrorAggregate = ValidationErrorDetail & {\n  method: string;\n  path: string;\n  counts: Map<string | undefined, number>;\n};\n\nconst VALIDATION_ERROR_AGGREGATES_KEY = Symbol.for(\"apitally.validationErrorAggregates\");\nconst validationErrorAggregatesHolder = globalThis as Record<\n  symbol,\n  Map<string, ValidationErrorAggregate> | undefined\n>;\nconst validationErrorAggregates =\n  validationErrorAggregatesHolder[VALIDATION_ERROR_AGGREGATES_KEY] ??\n  new Map<string, ValidationErrorAggregate>();\nvalidationErrorAggregatesHolder[VALIDATION_ERROR_AGGREGATES_KEY] = validationErrorAggregates;\n\nexport function isValidationResponseStatus(statusCode: number): boolean {\n  return statusCode === 400 || statusCode === 422;\n}\n\nexport function addValidationErrors(\n  consumer: string | undefined,\n  method: string,\n  path: string,\n  details: ValidationErrorDetail[],\n): void {\n  method = method.toUpperCase();\n  if (method === \"OPTIONS\" || !path) {\n    return;\n  }\n  consumer = consumer?.slice(0, MAX_CONSUMER_LENGTH);\n  for (const detail of details) {\n    const fields = {\n      method,\n      path: path.slice(0, MAX_PATH_LENGTH),\n      source: detail.source.slice(0, MAX_SOURCE_LENGTH),\n      field: detail.field.slice(0, MAX_FIELD_LENGTH),\n      message: detail.message.slice(0, MAX_MESSAGE_LENGTH),\n      type: detail.type.slice(0, MAX_TYPE_LENGTH),\n    };\n    const key = Object.values(fields).join(\"\\0\");\n    let aggregate = validationErrorAggregates.get(key);\n    if (!aggregate) {\n      if (validationErrorAggregates.size >= MAX_ERRORS) {\n        continue;\n      }\n      aggregate = { ...fields, counts: new Map() };\n      validationErrorAggregates.set(key, aggregate);\n    }\n    aggregate.counts.set(consumer, (aggregate.counts.get(consumer) ?? 0) + 1);\n  }\n}\n\nexport function drainValidationErrors(): AnyValueMap[] {\n  const aggregates = [...validationErrorAggregates.values()];\n  validationErrorAggregates.clear();\n  return aggregates.map(({ counts, ...fields }) => ({\n    ...fields,\n    counts: [...counts].map(([consumer, count]) =>\n      consumer === undefined ? { count } : { consumer, count },\n    ),\n  }));\n}\n\nexport function resetValidationErrors(): void {\n  validationErrorAggregates.clear();\n}\n\nexport function normalizeSource(source: unknown): string {\n  return typeof source === \"string\" ? (SOURCE_ALIASES[source.toLowerCase()] ?? \"\") : \"\";\n}\n\n// Zod, Standard Schema, and TypeBox issues share this shape. A Standard Schema\n// path segment may be an object carrying the key; a TypeBox path is a JSON pointer.\nexport function formatIssues(issues: unknown, source = \"\"): ValidationErrorDetail[] {\n  if (!Array.isArray(issues)) {\n    return [];\n  }\n  const details: ValidationErrorDetail[] = [];\n  for (const issue of issues) {\n    if (!isRecord(issue) || typeof issue.message !== \"string\") {\n      continue;\n    }\n    const path = Array.isArray(issue.path)\n      ? issue.path\n      : typeof issue.path === \"string\"\n        ? issue.path\n            .split(\"/\")\n            .filter(Boolean)\n            .map((segment) => segment.replace(/~1/g, \"/\").replace(/~0/g, \"~\"))\n        : [];\n    details.push({\n      source,\n      field: path\n        .map((segment: unknown) => (isRecord(segment) ? segment.key : segment))\n        .filter((segment) => typeof segment === \"string\" || typeof segment === \"number\")\n        .join(\".\"),\n      message: issue.message,\n      type: typeof issue.code === \"string\" ? issue.code : \"\",\n    });\n  }\n  return details;\n}\n\n// zod 3 serializes issues as `error.issues`; zod 4 hides them as a JSON string\n// in `error.message`.\nexport function extractZodValidationErrors(body: unknown): ValidationErrorDetail[] {\n  if (!isRecord(body)) {\n    return [];\n  }\n  const error = isRecord(body.error) ? body.error : undefined;\n  let issues = body.issues ?? error?.issues;\n  if (issues === undefined && error?.name === \"ZodError\" && typeof error.message === \"string\") {\n    try {\n      issues = JSON.parse(error.message);\n    } catch {\n      return [];\n    }\n  }\n  return formatIssues(issues);\n}\n\n// Recognized response shapes: zod issues, express-validator, and celebrate.\nexport function extractExpressValidationErrors(body: unknown): ValidationErrorDetail[] {\n  if (!isRecord(body)) {\n    return [];\n  }\n  const zodDetails = extractZodValidationErrors(body);\n  if (zodDetails.length > 0) {\n    return zodDetails;\n  }\n  if (Array.isArray(body.errors)) {\n    return extractExpressValidatorErrors(body.errors);\n  }\n  if (isRecord(body.validation)) {\n    return extractCelebrateErrors(body.validation);\n  }\n  return [];\n}\n\nfunction extractExpressValidatorErrors(errors: unknown[]): ValidationErrorDetail[] {\n  const details: ValidationErrorDetail[] = [];\n  for (const error of errors) {\n    if (\n      !isRecord(error) ||\n      error.type !== \"field\" ||\n      typeof error.path !== \"string\" ||\n      typeof error.msg !== \"string\"\n    ) {\n      continue;\n    }\n    const source = normalizeSource(error.location);\n    if (source) {\n      details.push({ source, field: error.path, message: error.msg, type: \"\" });\n    }\n  }\n  return details;\n}\n\n// Celebrate joins the messages of all failed keys into one sentence list, so\n// each key takes the sentence naming it.\nfunction extractCelebrateErrors(validation: Record<string, unknown>): ValidationErrorDetail[] {\n  const details: ValidationErrorDetail[] = [];\n  for (const error of Object.values(validation)) {\n    if (!isRecord(error) || !Array.isArray(error.keys) || typeof error.message !== \"string\") {\n      continue;\n    }\n    const sentences = error.message.split(\". \");\n    for (const key of error.keys) {\n      if (typeof key === \"string\") {\n        details.push({\n          source: normalizeSource(error.source),\n          field: key,\n          message: sentences.find((sentence) => sentence.includes(`\"${key}\"`)) ?? error.message,\n          type: \"\",\n        });\n      }\n    }\n  }\n  return details;\n}\n\nexport function parseJsonResponseBody(body: Buffer | undefined, contentEncoding: unknown): unknown {\n  if (!body) {\n    return undefined;\n  }\n  try {\n    const encoding =\n      typeof contentEncoding === \"string\" ? contentEncoding.trim().toLowerCase() : \"\";\n    let decoded = body;\n    if (encoding === \"br\") {\n      decoded = brotliDecompressSync(body, { maxOutputLength: MAX_BODY_SIZE });\n    } else if (encoding === \"gzip\" || encoding === \"deflate\") {\n      decoded = unzipSync(body, { maxOutputLength: MAX_BODY_SIZE });\n    } else if (encoding !== \"\" && encoding !== \"identity\") {\n      return undefined;\n    }\n    return JSON.parse(decoded.toString());\n  } catch {\n    // A body that cannot be decoded as JSON carries no recognizable validation details.\n  }\n  return undefined;\n}\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apitally",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Simple API monitoring, analytics and request logging for REST APIs built with AdonisJS, Elysia, Express, Fastify, H3, Hapi, Hono, Koa and NestJS.",
   "author": "Apitally <hello@apitally.io>",
   "license": "MIT",
@@ -289,7 +289,7 @@
     "elysia": "^1.4.29",
     "express": "^5.2.1",
     "fastify": "^5.11.0",
-    "h3": "2.0.1-rc.31",
+    "h3": "2.0.1-rc.32",
     "hono": "^4.12.31",
     "knip": "^6.29.0",
     "koa": "^3.2.1",

package/dist/consumer.cjs

@@ -1,61 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_logger = require("./logger.cjs");
-const require_context = require("./context.cjs");
-const require_requestAttributes = require("./requestAttributes.cjs");
-//#region src/consumer.ts
-const CONSUMER_IDENTIFIER_ATTRIBUTE = "apitally.consumer.identifier";
-const CONSUMER_NAME_ATTRIBUTE = "apitally.consumer.name";
-const CONSUMER_GROUP_ATTRIBUTE = "apitally.consumer.group";
-function setConsumer(consumer) {
-	try {
-		const holder = require_context.getConsumerHolder();
-		const record = require_context.getRequestRecord();
-		const normalized = normalizeConsumer(consumer);
-		if (!holder && !record || !normalized) return;
-		if (holder) {
-			holder.identifier = normalized.identifier;
-			holder.name = normalized.name;
-			holder.group = normalized.group;
-		}
-		writeConsumerAttributes(require_context.getServerSpan(), record, normalized);
-	} catch (error) {
-		require_logger.logDebug(`Error setting consumer: ${String(error)}`);
-	}
-}
-function writeConsumerAttributesFromContext(parentContext, span, record) {
-	const holder = parentContext.getValue(require_context.CONSUMER_HOLDER_KEY);
-	if (!holder?.identifier) return;
-	const consumer = normalizeConsumer({
-		identifier: holder.identifier,
-		name: holder.name,
-		group: holder.group
-	});
-	if (consumer) writeConsumerAttributes(span, record, consumer);
-}
-function writeConsumerAttributes(span, record, consumer) {
-	require_requestAttributes.writeRequestAttribute(span, record, CONSUMER_IDENTIFIER_ATTRIBUTE, consumer.identifier);
-	if (consumer.name) require_requestAttributes.writeRequestAttribute(span, record, CONSUMER_NAME_ATTRIBUTE, consumer.name);
-	if (consumer.group) require_requestAttributes.writeRequestAttribute(span, record, CONSUMER_GROUP_ATTRIBUTE, consumer.group);
-}
-function normalizeConsumer(consumer) {
-	if (typeof consumer === "object" && consumer !== null) {
-		const identifier = trimAndCap(consumer.identifier, 128);
-		if (!identifier) return;
-		return {
-			identifier,
-			name: trimAndCap(consumer.name, 64),
-			group: trimAndCap(consumer.group, 64)
-		};
-	}
-	const identifier = trimAndCap(consumer, 128);
-	return identifier ? { identifier } : void 0;
-}
-function trimAndCap(value, maxLength) {
-	if (typeof value !== "string" && typeof value !== "number") return;
-	return String(value).trim().slice(0, maxLength) || void 0;
-}
-//#endregion
-exports.setConsumer = setConsumer;
-exports.writeConsumerAttributesFromContext = writeConsumerAttributesFromContext;
-
-//# sourceMappingURL=consumer.cjs.map

package/dist/consumer.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"consumer.cjs","names":["getConsumerHolder","getRequestRecord","getServerSpan","CONSUMER_HOLDER_KEY"],"sources":["../src/consumer.ts"],"sourcesContent":["import type { Context, Span } from \"@opentelemetry/api\";\nimport {\n  CONSUMER_HOLDER_KEY,\n  type ConsumerHolder,\n  getConsumerHolder,\n  getRequestRecord,\n  getServerSpan,\n  type RequestRecord,\n} from \"./context.js\";\nimport { logDebug } from \"./logger.js\";\nimport { writeRequestAttribute } from \"./requestAttributes.js\";\n\nexport interface ApitallyConsumer {\n  identifier: string;\n  name?: string | null;\n  group?: string | null;\n}\n\nconst CONSUMER_IDENTIFIER_ATTRIBUTE = \"apitally.consumer.identifier\";\nconst CONSUMER_NAME_ATTRIBUTE = \"apitally.consumer.name\";\nconst CONSUMER_GROUP_ATTRIBUTE = \"apitally.consumer.group\";\n\nexport function setConsumer(consumer: ApitallyConsumer | string | null | undefined): void {\n  try {\n    const holder = getConsumerHolder();\n    const record = getRequestRecord();\n    const normalized = normalizeConsumer(consumer);\n    if ((!holder && !record) || !normalized) {\n      return;\n    }\n    if (holder) {\n      holder.identifier = normalized.identifier;\n      holder.name = normalized.name;\n      holder.group = normalized.group;\n    }\n    writeConsumerAttributes(getServerSpan(), record, normalized);\n  } catch (error) {\n    logDebug(`Error setting consumer: ${String(error)}`);\n  }\n}\n\n// Applies a consumer inherited in the parent context when a SERVER span starts.\nexport function writeConsumerAttributesFromContext(\n  parentContext: Context,\n  span: Span,\n  record: RequestRecord | undefined,\n): void {\n  const holder = parentContext.getValue(CONSUMER_HOLDER_KEY) as ConsumerHolder | undefined;\n  if (!holder?.identifier) {\n    return;\n  }\n  const consumer = normalizeConsumer({\n    identifier: holder.identifier,\n    name: holder.name,\n    group: holder.group,\n  });\n  if (consumer) {\n    writeConsumerAttributes(span, record, consumer);\n  }\n}\n\nfunction writeConsumerAttributes(\n  span: Span | undefined,\n  record: RequestRecord | undefined,\n  consumer: ApitallyConsumer,\n): void {\n  writeRequestAttribute(span, record, CONSUMER_IDENTIFIER_ATTRIBUTE, consumer.identifier);\n  if (consumer.name) {\n    writeRequestAttribute(span, record, CONSUMER_NAME_ATTRIBUTE, consumer.name);\n  }\n  if (consumer.group) {\n    writeRequestAttribute(span, record, CONSUMER_GROUP_ATTRIBUTE, consumer.group);\n  }\n}\n\nfunction normalizeConsumer(consumer: ApitallyConsumer | string | number | null | undefined) {\n  if (typeof consumer === \"object\" && consumer !== null) {\n    const identifier = trimAndCap(consumer.identifier, 128);\n    if (!identifier) {\n      return undefined;\n    }\n    return {\n      identifier,\n      name: trimAndCap(consumer.name, 64),\n      group: trimAndCap(consumer.group, 64),\n    };\n  }\n  const identifier = trimAndCap(consumer, 128);\n  return identifier ? { identifier } : undefined;\n}\n\nfunction trimAndCap(value: unknown, maxLength: number): string | undefined {\n  if (typeof value !== \"string\" && typeof value !== \"number\") {\n    return undefined;\n  }\n  return String(value).trim().slice(0, maxLength) || undefined;\n}\n"],"mappings":";;;;;AAkBA,MAAM,gCAAgC;AACtC,MAAM,0BAA0B;AAChC,MAAM,2BAA2B;AAEjC,SAAgB,YAAY,UAA8D;CACxF,IAAI;EACF,MAAM,SAASA,gBAAAA,kBAAkB;EACjC,MAAM,SAASC,gBAAAA,iBAAiB;EAChC,MAAM,aAAa,kBAAkB,QAAQ;EAC7C,IAAK,CAAC,UAAU,CAAC,UAAW,CAAC,YAC3B;EAEF,IAAI,QAAQ;GACV,OAAO,aAAa,WAAW;GAC/B,OAAO,OAAO,WAAW;GACzB,OAAO,QAAQ,WAAW;EAC5B;EACA,wBAAwBC,gBAAAA,cAAc,GAAG,QAAQ,UAAU;CAC7D,SAAS,OAAO;EACd,eAAA,SAAS,2BAA2B,OAAO,KAAK,GAAG;CACrD;AACF;AAGA,SAAgB,mCACd,eACA,MACA,QACM;CACN,MAAM,SAAS,cAAc,SAASC,gBAAAA,mBAAmB;CACzD,IAAI,CAAC,QAAQ,YACX;CAEF,MAAM,WAAW,kBAAkB;EACjC,YAAY,OAAO;EACnB,MAAM,OAAO;EACb,OAAO,OAAO;CAChB,CAAC;CACD,IAAI,UACF,wBAAwB,MAAM,QAAQ,QAAQ;AAElD;AAEA,SAAS,wBACP,MACA,QACA,UACM;CACN,0BAAA,sBAAsB,MAAM,QAAQ,+BAA+B,SAAS,UAAU;CACtF,IAAI,SAAS,MACX,0BAAA,sBAAsB,MAAM,QAAQ,yBAAyB,SAAS,IAAI;CAE5E,IAAI,SAAS,OACX,0BAAA,sBAAsB,MAAM,QAAQ,0BAA0B,SAAS,KAAK;AAEhF;AAEA,SAAS,kBAAkB,UAAiE;CAC1F,IAAI,OAAO,aAAa,YAAY,aAAa,MAAM;EACrD,MAAM,aAAa,WAAW,SAAS,YAAY,GAAG;EACtD,IAAI,CAAC,YACH;EAEF,OAAO;GACL;GACA,MAAM,WAAW,SAAS,MAAM,EAAE;GAClC,OAAO,WAAW,SAAS,OAAO,EAAE;EACtC;CACF;CACA,MAAM,aAAa,WAAW,UAAU,GAAG;CAC3C,OAAO,aAAa,EAAE,WAAW,IAAI,KAAA;AACvC;AAEA,SAAS,WAAW,OAAgB,WAAuC;CACzE,IAAI,OAAO,UAAU,YAAY,OAAO,UAAU,UAChD;CAEF,OAAO,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,SAAS,KAAK,KAAA;AACrD"}

package/dist/consumer.d.cts

@@ -1,12 +0,0 @@
-import { RequestRecord } from "./context.cjs";
-import { Context, Span } from "@opentelemetry/api";
-//#region src/consumer.d.ts
-export interface ApitallyConsumer {
-  identifier: string;
-  name?: string | null;
-  group?: string | null;
-}
-export declare function setConsumer(consumer: ApitallyConsumer | string | null | undefined): void;
-export declare function writeConsumerAttributesFromContext(parentContext: Context, span: Span, record: RequestRecord | undefined): void;
-//#endregion
-//# sourceMappingURL=consumer.d.cts.map

package/dist/consumer.d.ts

@@ -1,12 +0,0 @@
-import { RequestRecord } from "./context.js";
-import { Context, Span } from "@opentelemetry/api";
-//#region src/consumer.d.ts
-export interface ApitallyConsumer {
-  identifier: string;
-  name?: string | null;
-  group?: string | null;
-}
-export declare function setConsumer(consumer: ApitallyConsumer | string | null | undefined): void;
-export declare function writeConsumerAttributesFromContext(parentContext: Context, span: Span, record: RequestRecord | undefined): void;
-//#endregion
-//# sourceMappingURL=consumer.d.ts.map

package/dist/consumer.js

@@ -1,59 +0,0 @@
-import { logDebug } from "./logger.js";
-import { CONSUMER_HOLDER_KEY, getConsumerHolder, getRequestRecord, getServerSpan } from "./context.js";
-import { writeRequestAttribute } from "./requestAttributes.js";
-//#region src/consumer.ts
-const CONSUMER_IDENTIFIER_ATTRIBUTE = "apitally.consumer.identifier";
-const CONSUMER_NAME_ATTRIBUTE = "apitally.consumer.name";
-const CONSUMER_GROUP_ATTRIBUTE = "apitally.consumer.group";
-function setConsumer(consumer) {
-	try {
-		const holder = getConsumerHolder();
-		const record = getRequestRecord();
-		const normalized = normalizeConsumer(consumer);
-		if (!holder && !record || !normalized) return;
-		if (holder) {
-			holder.identifier = normalized.identifier;
-			holder.name = normalized.name;
-			holder.group = normalized.group;
-		}
-		writeConsumerAttributes(getServerSpan(), record, normalized);
-	} catch (error) {
-		logDebug(`Error setting consumer: ${String(error)}`);
-	}
-}
-function writeConsumerAttributesFromContext(parentContext, span, record) {
-	const holder = parentContext.getValue(CONSUMER_HOLDER_KEY);
-	if (!holder?.identifier) return;
-	const consumer = normalizeConsumer({
-		identifier: holder.identifier,
-		name: holder.name,
-		group: holder.group
-	});
-	if (consumer) writeConsumerAttributes(span, record, consumer);
-}
-function writeConsumerAttributes(span, record, consumer) {
-	writeRequestAttribute(span, record, CONSUMER_IDENTIFIER_ATTRIBUTE, consumer.identifier);
-	if (consumer.name) writeRequestAttribute(span, record, CONSUMER_NAME_ATTRIBUTE, consumer.name);
-	if (consumer.group) writeRequestAttribute(span, record, CONSUMER_GROUP_ATTRIBUTE, consumer.group);
-}
-function normalizeConsumer(consumer) {
-	if (typeof consumer === "object" && consumer !== null) {
-		const identifier = trimAndCap(consumer.identifier, 128);
-		if (!identifier) return;
-		return {
-			identifier,
-			name: trimAndCap(consumer.name, 64),
-			group: trimAndCap(consumer.group, 64)
-		};
-	}
-	const identifier = trimAndCap(consumer, 128);
-	return identifier ? { identifier } : void 0;
-}
-function trimAndCap(value, maxLength) {
-	if (typeof value !== "string" && typeof value !== "number") return;
-	return String(value).trim().slice(0, maxLength) || void 0;
-}
-//#endregion
-export { setConsumer, writeConsumerAttributesFromContext };
-
-//# sourceMappingURL=consumer.js.map

package/dist/consumer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"consumer.js","names":[],"sources":["../src/consumer.ts"],"sourcesContent":["import type { Context, Span } from \"@opentelemetry/api\";\nimport {\n  CONSUMER_HOLDER_KEY,\n  type ConsumerHolder,\n  getConsumerHolder,\n  getRequestRecord,\n  getServerSpan,\n  type RequestRecord,\n} from \"./context.js\";\nimport { logDebug } from \"./logger.js\";\nimport { writeRequestAttribute } from \"./requestAttributes.js\";\n\nexport interface ApitallyConsumer {\n  identifier: string;\n  name?: string | null;\n  group?: string | null;\n}\n\nconst CONSUMER_IDENTIFIER_ATTRIBUTE = \"apitally.consumer.identifier\";\nconst CONSUMER_NAME_ATTRIBUTE = \"apitally.consumer.name\";\nconst CONSUMER_GROUP_ATTRIBUTE = \"apitally.consumer.group\";\n\nexport function setConsumer(consumer: ApitallyConsumer | string | null | undefined): void {\n  try {\n    const holder = getConsumerHolder();\n    const record = getRequestRecord();\n    const normalized = normalizeConsumer(consumer);\n    if ((!holder && !record) || !normalized) {\n      return;\n    }\n    if (holder) {\n      holder.identifier = normalized.identifier;\n      holder.name = normalized.name;\n      holder.group = normalized.group;\n    }\n    writeConsumerAttributes(getServerSpan(), record, normalized);\n  } catch (error) {\n    logDebug(`Error setting consumer: ${String(error)}`);\n  }\n}\n\n// Applies a consumer inherited in the parent context when a SERVER span starts.\nexport function writeConsumerAttributesFromContext(\n  parentContext: Context,\n  span: Span,\n  record: RequestRecord | undefined,\n): void {\n  const holder = parentContext.getValue(CONSUMER_HOLDER_KEY) as ConsumerHolder | undefined;\n  if (!holder?.identifier) {\n    return;\n  }\n  const consumer = normalizeConsumer({\n    identifier: holder.identifier,\n    name: holder.name,\n    group: holder.group,\n  });\n  if (consumer) {\n    writeConsumerAttributes(span, record, consumer);\n  }\n}\n\nfunction writeConsumerAttributes(\n  span: Span | undefined,\n  record: RequestRecord | undefined,\n  consumer: ApitallyConsumer,\n): void {\n  writeRequestAttribute(span, record, CONSUMER_IDENTIFIER_ATTRIBUTE, consumer.identifier);\n  if (consumer.name) {\n    writeRequestAttribute(span, record, CONSUMER_NAME_ATTRIBUTE, consumer.name);\n  }\n  if (consumer.group) {\n    writeRequestAttribute(span, record, CONSUMER_GROUP_ATTRIBUTE, consumer.group);\n  }\n}\n\nfunction normalizeConsumer(consumer: ApitallyConsumer | string | number | null | undefined) {\n  if (typeof consumer === \"object\" && consumer !== null) {\n    const identifier = trimAndCap(consumer.identifier, 128);\n    if (!identifier) {\n      return undefined;\n    }\n    return {\n      identifier,\n      name: trimAndCap(consumer.name, 64),\n      group: trimAndCap(consumer.group, 64),\n    };\n  }\n  const identifier = trimAndCap(consumer, 128);\n  return identifier ? { identifier } : undefined;\n}\n\nfunction trimAndCap(value: unknown, maxLength: number): string | undefined {\n  if (typeof value !== \"string\" && typeof value !== \"number\") {\n    return undefined;\n  }\n  return String(value).trim().slice(0, maxLength) || undefined;\n}\n"],"mappings":";;;;AAkBA,MAAM,gCAAgC;AACtC,MAAM,0BAA0B;AAChC,MAAM,2BAA2B;AAEjC,SAAgB,YAAY,UAA8D;CACxF,IAAI;EACF,MAAM,SAAS,kBAAkB;EACjC,MAAM,SAAS,iBAAiB;EAChC,MAAM,aAAa,kBAAkB,QAAQ;EAC7C,IAAK,CAAC,UAAU,CAAC,UAAW,CAAC,YAC3B;EAEF,IAAI,QAAQ;GACV,OAAO,aAAa,WAAW;GAC/B,OAAO,OAAO,WAAW;GACzB,OAAO,QAAQ,WAAW;EAC5B;EACA,wBAAwB,cAAc,GAAG,QAAQ,UAAU;CAC7D,SAAS,OAAO;EACd,SAAS,2BAA2B,OAAO,KAAK,GAAG;CACrD;AACF;AAGA,SAAgB,mCACd,eACA,MACA,QACM;CACN,MAAM,SAAS,cAAc,SAAS,mBAAmB;CACzD,IAAI,CAAC,QAAQ,YACX;CAEF,MAAM,WAAW,kBAAkB;EACjC,YAAY,OAAO;EACnB,MAAM,OAAO;EACb,OAAO,OAAO;CAChB,CAAC;CACD,IAAI,UACF,wBAAwB,MAAM,QAAQ,QAAQ;AAElD;AAEA,SAAS,wBACP,MACA,QACA,UACM;CACN,sBAAsB,MAAM,QAAQ,+BAA+B,SAAS,UAAU;CACtF,IAAI,SAAS,MACX,sBAAsB,MAAM,QAAQ,yBAAyB,SAAS,IAAI;CAE5E,IAAI,SAAS,OACX,sBAAsB,MAAM,QAAQ,0BAA0B,SAAS,KAAK;AAEhF;AAEA,SAAS,kBAAkB,UAAiE;CAC1F,IAAI,OAAO,aAAa,YAAY,aAAa,MAAM;EACrD,MAAM,aAAa,WAAW,SAAS,YAAY,GAAG;EACtD,IAAI,CAAC,YACH;EAEF,OAAO;GACL;GACA,MAAM,WAAW,SAAS,MAAM,EAAE;GAClC,OAAO,WAAW,SAAS,OAAO,EAAE;EACtC;CACF;CACA,MAAM,aAAa,WAAW,UAAU,GAAG;CAC3C,OAAO,aAAa,EAAE,WAAW,IAAI,KAAA;AACvC;AAEA,SAAS,WAAW,OAAgB,WAAuC;CACzE,IAAI,OAAO,UAAU,YAAY,OAAO,UAAU,UAChD;CAEF,OAAO,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,SAAS,KAAK,KAAA;AACrD"}