@pingops/otel 0.2.5 → 0.3.0

package/dist/index.cjs

@@ -134,6 +134,7 @@ var PingopsSpanProcessor = class {
 		});
 		this.config = {
 			debug: config.debug ?? false,
+			sdkVersion: config.sdkVersion,
 			headersAllowList: config.headersAllowList,
 			headersDenyList: config.headersDenyList,
 			domainAllowList: config.domainAllowList,
@@ -171,6 +172,7 @@ var PingopsSpanProcessor = class {
 			spanId: spanContext.spanId,
 			traceId: spanContext.traceId
 		});
+		if (this.config.sdkVersion) span.setAttribute("pingops.sdk.version", this.config.sdkVersion);
 		const propagatedAttributes = (0, _pingops_core.getPropagatedAttributesFromContext)(parentContext);
 		if (Object.keys(propagatedAttributes).length > 0) {
 			for (const [key, value] of Object.entries(propagatedAttributes)) if (typeof value === "string" || Array.isArray(value)) span.setAttribute(key, value);
@@ -423,6 +425,7 @@ function shouldIgnoreOutboundInstrumentation(requestUrl) {
 */
 function resolveOutboundSpanParentContext(activeContext, requestUrl) {
 	if (!(0, _opentelemetry_core.isTracingSuppressed)(activeContext)) return activeContext;
+	if (activeContext.getValue(_pingops_core.PINGOPS_INTENTIONAL_SUPPRESSION) === true) return activeContext;
 	if (isExporterRequestUrl(requestUrl)) return activeContext;
 	if (!hasLoggedSuppressionLeakWarning) {
 		logger.warn("Detected suppressed context for outbound user request; running instrumentation on ROOT_CONTEXT to prevent Noop spans from suppression leakage");
@@ -431,18 +434,74 @@ function resolveOutboundSpanParentContext(activeContext, requestUrl) {
 	return _opentelemetry_api.ROOT_CONTEXT;
 }
 
+//#endregion
+//#region src/instrumentations/body-utils.ts
+const HTTP_REQUEST_BODY = "http.request.body";
+const HTTP_RESPONSE_BODY = "http.response.body";
+const HTTP_REQUEST_BODY_SIZE = "http.request.body.size";
+const HTTP_RESPONSE_BODY_SIZE = "http.response.body.size";
+const DEFAULT_MAX_REQUEST_BODY_SIZE = 10 * 1024;
+const DEFAULT_MAX_RESPONSE_BODY_SIZE = 10 * 1024;
+/**
+* Gets domain rule configuration for a given URL.
+*/
+function getDomainRule(url$1, domainAllowList) {
+	if (!domainAllowList) return;
+	const domain = (0, _pingops_core.extractDomainFromUrl)(url$1);
+	for (const rule of domainAllowList) if (domain === rule.domain || domain.endsWith(`.${rule.domain}`) || domain === rule.domain.slice(1)) return rule;
+}
+/**
+* Determines if request body should be captured based on priority:
+* context > domain rule > global config > default (false).
+*/
+function shouldCaptureRequestBody(url$1) {
+	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_REQUEST_BODY);
+	if (contextValue !== void 0) return contextValue;
+	if (url$1) {
+		const domainRule = getDomainRule(url$1, getGlobalConfig()?.domainAllowList);
+		if (domainRule?.captureRequestBody !== void 0) return domainRule.captureRequestBody;
+	}
+	const globalConfig$1 = getGlobalConfig();
+	if (globalConfig$1?.captureRequestBody !== void 0) return globalConfig$1.captureRequestBody;
+	return false;
+}
+/**
+* Determines if response body should be captured based on priority:
+* context > domain rule > global config > default (false).
+*/
+function shouldCaptureResponseBody(url$1) {
+	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_RESPONSE_BODY);
+	if (contextValue !== void 0) return contextValue;
+	if (url$1) {
+		const domainRule = getDomainRule(url$1, getGlobalConfig()?.domainAllowList);
+		if (domainRule?.captureResponseBody !== void 0) return domainRule.captureResponseBody;
+	}
+	const globalConfig$1 = getGlobalConfig();
+	if (globalConfig$1?.captureResponseBody !== void 0) return globalConfig$1.captureResponseBody;
+	return false;
+}
+/**
+* Normalizes supported HTTP chunk types into a Buffer.
+*/
+function toBufferChunk(data) {
+	if (typeof data === "string") return Buffer.from(data);
+	if (Buffer.isBuffer(data)) return data;
+	if (data instanceof Uint8Array) return Buffer.from(data);
+	return null;
+}
+
 //#endregion
 //#region src/instrumentations/http/pingops-http.ts
 /**
 * Pingops HTTP instrumentation that extends HttpInstrumentation
 * with request/response body capture
 */
-const DEFAULT_MAX_REQUEST_BODY_SIZE$1 = 4 * 1024;
-const DEFAULT_MAX_RESPONSE_BODY_SIZE$1 = 4 * 1024;
 const LEGACY_ATTR_HTTP_URL = "http.url";
 const PingopsSemanticAttributes = {
-	HTTP_REQUEST_BODY: "http.request.body",
-	HTTP_RESPONSE_BODY: "http.response.body"
+	HTTP_REQUEST_BODY,
+	HTTP_RESPONSE_BODY,
+	HTTP_REQUEST_BODY_SIZE,
+	HTTP_RESPONSE_BODY_SIZE
 };
 /**
 * Manually flattens a nested object into dot-notation keys
@@ -455,7 +514,7 @@ function isPrimitiveArray(value) {
 }
 function flatten(obj, prefix = "") {
 	const result = {};
-	for (const key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) {
+	for (const key in obj) if (Object.hasOwn(obj, key)) {
 		const newKey = prefix ? `${prefix}.${key}` : key;
 		const value = obj[key];
 		if (isPlainObject(value)) Object.assign(result, flatten(value, newKey));
@@ -474,61 +533,12 @@ function setAttributeValue(span, attrName, attrValue) {
 	} else if (isPlainObject(attrValue)) span.setAttributes(flatten({ [attrName]: attrValue }));
 }
 /**
-* Extracts domain from URL
-*/
-function extractDomainFromUrl$1(url$1) {
-	try {
-		return new URL(url$1).hostname;
-	} catch {
-		const match = url$1.match(/^(?:https?:\/\/)?([^/]+)/);
-		return match ? match[1] : "";
-	}
-}
-/**
-* Gets domain rule configuration for a given URL
-*/
-function getDomainRule$1(url$1, domainAllowList) {
-	if (!domainAllowList) return;
-	const domain = extractDomainFromUrl$1(url$1);
-	for (const rule of domainAllowList) if (domain === rule.domain || domain.endsWith(`.${rule.domain}`) || domain === rule.domain.slice(1)) return rule;
-}
-/**
-* Determines if request body should be captured based on priority:
-* context > domain rule > global config > default (false)
-*/
-function shouldCaptureRequestBody$1(url$1) {
-	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_REQUEST_BODY);
-	if (contextValue !== void 0) return contextValue;
-	if (url$1) {
-		const domainRule = getDomainRule$1(url$1, getGlobalConfig()?.domainAllowList);
-		if (domainRule?.captureRequestBody !== void 0) return domainRule.captureRequestBody;
-	}
-	const globalConfig$1 = getGlobalConfig();
-	if (globalConfig$1?.captureRequestBody !== void 0) return globalConfig$1.captureRequestBody;
-	return false;
-}
-/**
-* Determines if response body should be captured based on priority:
-* context > domain rule > global config > default (false)
-*/
-function shouldCaptureResponseBody$1(url$1) {
-	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_RESPONSE_BODY);
-	if (contextValue !== void 0) return contextValue;
-	if (url$1) {
-		const domainRule = getDomainRule$1(url$1, getGlobalConfig()?.domainAllowList);
-		if (domainRule?.captureResponseBody !== void 0) return domainRule.captureResponseBody;
-	}
-	const globalConfig$1 = getGlobalConfig();
-	if (globalConfig$1?.captureResponseBody !== void 0) return globalConfig$1.captureResponseBody;
-	return false;
-}
-/**
-* Captures request body from string or Buffer data
+* Captures request body from a chunk buffer.
 */
 function captureRequestBody(span, data, maxSize, semanticAttr, url$1) {
-	if (!shouldCaptureRequestBody$1(url$1)) return;
+	if (!shouldCaptureRequestBody(url$1)) return;
 	if (data.length && data.length <= maxSize) try {
-		const requestBody = typeof data === "string" ? data : data.toString("utf-8");
+		const requestBody = data.toString("utf-8");
 		if (requestBody) setAttributeValue(span, semanticAttr, requestBody);
 	} catch (e) {
 		console.error("Error occurred while capturing request body:", e);
@@ -538,12 +548,12 @@ function captureRequestBody(span, data, maxSize, semanticAttr, url$1) {
 * Captures response body from chunks
 */
 function captureResponseBody(span, chunks, semanticAttr, responseHeaders, url$1, maxSize) {
-	if (!shouldCaptureResponseBody$1(url$1)) return;
+	if (!shouldCaptureResponseBody(url$1)) return;
 	if (chunks === null) {
 		const contentEncoding = responseHeaders?.["content-encoding"];
 		const contentType = responseHeaders?.["content-type"];
 		const toHeaderString = (value) => typeof value === "string" ? value : Array.isArray(value) ? value.join(", ") : "unknown";
-		setAttributeValue(span, semanticAttr, `[truncated response body; exceeded maxResponseBodySize=${maxSize ?? DEFAULT_MAX_RESPONSE_BODY_SIZE$1}; content-type=${toHeaderString(contentType)}; content-encoding=${toHeaderString(contentEncoding)}]`);
+		setAttributeValue(span, semanticAttr, `[truncated response body; exceeded maxResponseBodySize=${maxSize ?? DEFAULT_MAX_RESPONSE_BODY_SIZE}; content-type=${toHeaderString(contentType)}; content-encoding=${toHeaderString(contentEncoding)}]`);
 		return;
 	}
 	if (chunks.length) try {
@@ -615,6 +625,21 @@ function extractRequestUrlFromSpanOptions(options) {
 	if (!host) return;
 	return `${scheme}://${host}${typeof attrs[_opentelemetry_semantic_conventions.ATTR_SERVER_PORT] === "number" ? `:${attrs[_opentelemetry_semantic_conventions.ATTR_SERVER_PORT]}` : ""}${typeof attrs[_opentelemetry_semantic_conventions.ATTR_URL_PATH] === "string" ? attrs[_opentelemetry_semantic_conventions.ATTR_URL_PATH] : "/"}${typeof attrs[_opentelemetry_semantic_conventions.ATTR_URL_QUERY] === "string" && attrs[_opentelemetry_semantic_conventions.ATTR_URL_QUERY].length > 0 ? `?${attrs[_opentelemetry_semantic_conventions.ATTR_URL_QUERY]}` : ""}`;
 }
+function parseRequestPathAndQuery(pathWithQuery) {
+	const queryIndex = pathWithQuery.indexOf("?");
+	if (queryIndex < 0) return { path: pathWithQuery || "/" };
+	const path = pathWithQuery.slice(0, queryIndex) || "/";
+	const queryPart = pathWithQuery.slice(queryIndex);
+	return {
+		path,
+		query: queryPart.length > 0 ? queryPart : void 0
+	};
+}
+function extractClientRequestPath(request) {
+	if (!request || typeof request !== "object" || !("path" in request)) return;
+	const path = request.path;
+	return typeof path === "string" && path.length > 0 ? path : void 0;
+}
 const PingopsHttpSemanticAttributes = PingopsSemanticAttributes;
 var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_http.HttpInstrumentation {
 	constructor(config) {
@@ -647,18 +672,36 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 			const headers = extractRequestHeaders(request);
 			if (headers) captureRequestHeaders(span, headers);
 			if (request instanceof http.ClientRequest) {
-				const maxRequestBodySize = config?.maxRequestBodySize || DEFAULT_MAX_REQUEST_BODY_SIZE$1;
+				const maxRequestBodySize = config?.maxRequestBodySize || DEFAULT_MAX_REQUEST_BODY_SIZE;
+				let requestBodySize = 0;
+				span.setAttribute(PingopsSemanticAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize);
 				const hostHeader = request.getHeader("host");
 				const host = typeof hostHeader === "string" ? hostHeader : Array.isArray(hostHeader) ? hostHeader.join(",") : typeof hostHeader === "number" ? String(hostHeader) : void 0;
 				const url$1 = request.path && host ? `${request.protocol || "http:"}//${host}${request.path}` : void 0;
+				if (typeof request.path === "string" && request.path.length > 0) {
+					const { path, query } = parseRequestPathAndQuery(request.path);
+					span.setAttribute(_opentelemetry_semantic_conventions.ATTR_URL_PATH, path);
+					if (query) span.setAttribute(_opentelemetry_semantic_conventions.ATTR_URL_QUERY, query);
+				}
+				if (url$1) span.setAttribute(_opentelemetry_semantic_conventions.ATTR_URL_FULL, url$1);
 				const originalWrite = request.write.bind(request);
 				const originalEnd = request.end.bind(request);
 				request.write = ((data, ...rest) => {
-					if (typeof data === "string" || data instanceof Buffer) captureRequestBody(span, data, maxRequestBodySize, PingopsSemanticAttributes.HTTP_REQUEST_BODY, url$1);
+					const chunkBuffer = toBufferChunk(data);
+					if (chunkBuffer) {
+						requestBodySize += chunkBuffer.length;
+						span.setAttribute(PingopsSemanticAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize);
+						captureRequestBody(span, chunkBuffer, maxRequestBodySize, PingopsSemanticAttributes.HTTP_REQUEST_BODY, url$1);
+					}
 					return originalWrite(data, ...rest);
 				});
 				request.end = ((data, ...rest) => {
-					if (typeof data === "string" || data instanceof Buffer) captureRequestBody(span, data, maxRequestBodySize, PingopsSemanticAttributes.HTTP_REQUEST_BODY, url$1);
+					const chunkBuffer = toBufferChunk(data);
+					if (chunkBuffer) {
+						requestBodySize += chunkBuffer.length;
+						span.setAttribute(PingopsSemanticAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize);
+						captureRequestBody(span, chunkBuffer, maxRequestBodySize, PingopsSemanticAttributes.HTTP_REQUEST_BODY, url$1);
+					}
 					return originalEnd(data, ...rest);
 				});
 			}
@@ -670,19 +713,25 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 			const headers = extractResponseHeaders(response);
 			if (headers) captureResponseHeaders(span, headers);
 			if (response instanceof http.IncomingMessage) {
-				const maxResponseBodySize = config?.maxResponseBodySize || DEFAULT_MAX_RESPONSE_BODY_SIZE$1;
+				const requestPath = response.req instanceof http.ClientRequest ? extractClientRequestPath(response.req) : void 0;
+				if (requestPath) {
+					const { path, query } = parseRequestPathAndQuery(requestPath);
+					span.setAttribute(_opentelemetry_semantic_conventions.ATTR_URL_PATH, path);
+					if (query) span.setAttribute(_opentelemetry_semantic_conventions.ATTR_URL_QUERY, query);
+				}
+				const maxResponseBodySize = config?.maxResponseBodySize || DEFAULT_MAX_RESPONSE_BODY_SIZE;
 				const url$1 = response.url || void 0;
 				let chunks = [];
 				let totalSize = 0;
-				const shouldCapture = shouldCaptureResponseBody$1(url$1);
+				span.setAttribute(PingopsSemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 0);
+				const shouldCapture = shouldCaptureResponseBody(url$1);
 				response.prependListener("data", (chunk) => {
-					if (!chunk || !shouldCapture) return;
-					let chunkBuffer = null;
-					if (typeof chunk === "string") chunkBuffer = Buffer.from(chunk);
-					else if (Buffer.isBuffer(chunk)) chunkBuffer = chunk;
-					else if (chunk instanceof Uint8Array) chunkBuffer = Buffer.from(chunk);
+					if (!chunk) return;
+					const chunkBuffer = toBufferChunk(chunk);
 					if (!chunkBuffer) return;
 					totalSize += chunkBuffer.length;
+					span.setAttribute(PingopsSemanticAttributes.HTTP_RESPONSE_BODY_SIZE, totalSize);
+					if (!shouldCapture) return;
 					if (chunks && totalSize <= maxResponseBodySize) chunks.push(chunkBuffer);
 					else chunks = null;
 				});
@@ -690,6 +739,7 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 				const finalizeCapture = () => {
 					if (finalized) return;
 					finalized = true;
+					span.setAttribute(PingopsSemanticAttributes.HTTP_RESPONSE_BODY_SIZE, totalSize);
 					captureResponseBody(span, chunks, PingopsSemanticAttributes.HTTP_RESPONSE_BODY, headers, url$1, maxResponseBodySize);
 				};
 				response.prependOnceListener("end", finalizeCapture);
@@ -738,59 +788,6 @@ function createHttpInstrumentation(config) {
 
 //#endregion
 //#region src/instrumentations/undici/pingops-undici.ts
-const DEFAULT_MAX_REQUEST_BODY_SIZE = 4 * 1024;
-const DEFAULT_MAX_RESPONSE_BODY_SIZE = 4 * 1024;
-const HTTP_REQUEST_BODY = "http.request.body";
-const HTTP_RESPONSE_BODY = "http.response.body";
-/**
-* Extracts domain from URL
-*/
-function extractDomainFromUrl(url$1) {
-	try {
-		return new url.URL(url$1).hostname;
-	} catch {
-		const match = url$1.match(/^(?:https?:\/\/)?([^/]+)/);
-		return match ? match[1] : "";
-	}
-}
-/**
-* Gets domain rule configuration for a given URL
-*/
-function getDomainRule(url$1, domainAllowList) {
-	if (!domainAllowList) return;
-	const domain = extractDomainFromUrl(url$1);
-	for (const rule of domainAllowList) if (domain === rule.domain || domain.endsWith(`.${rule.domain}`) || domain === rule.domain.slice(1)) return rule;
-}
-/**
-* Determines if request body should be captured based on priority:
-* context > domain rule > global config > default (false)
-*/
-function shouldCaptureRequestBody(url$1) {
-	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_REQUEST_BODY);
-	if (contextValue !== void 0) return contextValue;
-	if (url$1) {
-		const domainRule = getDomainRule(url$1, getGlobalConfig()?.domainAllowList);
-		if (domainRule?.captureRequestBody !== void 0) return domainRule.captureRequestBody;
-	}
-	const globalConfig$1 = getGlobalConfig();
-	if (globalConfig$1?.captureRequestBody !== void 0) return globalConfig$1.captureRequestBody;
-	return false;
-}
-/**
-* Determines if response body should be captured based on priority:
-* context > domain rule > global config > default (false)
-*/
-function shouldCaptureResponseBody(url$1) {
-	const contextValue = _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_CAPTURE_RESPONSE_BODY);
-	if (contextValue !== void 0) return contextValue;
-	if (url$1) {
-		const domainRule = getDomainRule(url$1, getGlobalConfig()?.domainAllowList);
-		if (domainRule?.captureResponseBody !== void 0) return domainRule.captureResponseBody;
-	}
-	const globalConfig$1 = getGlobalConfig();
-	if (globalConfig$1?.captureResponseBody !== void 0) return globalConfig$1.captureResponseBody;
-	return false;
-}
 var UndiciInstrumentation = class extends _opentelemetry_instrumentation.InstrumentationBase {
 	_recordFromReq = /* @__PURE__ */ new WeakMap();
 	constructor(config = {}) {
@@ -898,7 +895,9 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 			[_opentelemetry_semantic_conventions.ATTR_URL_FULL]: requestUrl.toString(),
 			[_opentelemetry_semantic_conventions.ATTR_URL_PATH]: requestUrl.pathname,
 			[_opentelemetry_semantic_conventions.ATTR_URL_QUERY]: requestUrl.search,
-			[_opentelemetry_semantic_conventions.ATTR_URL_SCHEME]: urlScheme
+			[_opentelemetry_semantic_conventions.ATTR_URL_SCHEME]: urlScheme,
+			[HTTP_REQUEST_BODY_SIZE]: 0,
+			[HTTP_RESPONSE_BODY_SIZE]: 0
 		};
 		const schemePorts = {
 			https: "443",
@@ -941,6 +940,10 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 			responseBodyChunks: [],
 			requestBodySize: 0,
 			responseBodySize: 0,
+			requestBodyCaptureSize: 0,
+			responseBodyCaptureSize: 0,
+			requestBodyCaptureExceeded: false,
+			responseBodyCaptureExceeded: false,
 			url: requestUrl.toString()
 		});
 	}
@@ -987,11 +990,13 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		const record = this._recordFromReq.get(request);
 		if (!record) return;
 		const { span, attributes, startTime } = record;
+		span.setAttribute(HTTP_REQUEST_BODY_SIZE, record.requestBodySize);
+		span.setAttribute(HTTP_RESPONSE_BODY_SIZE, record.responseBodySize);
 		if (shouldCaptureResponseBody(record.url)) {
 			const maxResponseBodySize = this.getConfig().maxResponseBodySize ?? DEFAULT_MAX_RESPONSE_BODY_SIZE;
 			const contentEncoding = record.attributes?.["http.response.header.content-encoding"] ?? void 0;
 			const contentType = record.attributes?.["http.response.header.content-type"] ?? void 0;
-			if (record.responseBodySize === Infinity) span.setAttribute(HTTP_RESPONSE_BODY, `[truncated response body; exceeded maxResponseBodySize=${maxResponseBodySize}; content-type=${contentType ?? "unknown"}; content-encoding=${contentEncoding ?? "identity"}]`);
+			if (record.responseBodyCaptureExceeded) span.setAttribute(HTTP_RESPONSE_BODY, `[truncated response body; exceeded maxResponseBodySize=${maxResponseBodySize}; content-type=${contentType ?? "unknown"}; content-encoding=${contentEncoding ?? "identity"}]`);
 			else if (record.responseBodyChunks.length > 0) try {
 				const responseBodyBuffer = Buffer.concat(record.responseBodyChunks);
 				if ((0, _pingops_core.isCompressedContentEncoding)(contentEncoding)) {
@@ -1013,8 +1018,10 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		const record = this._recordFromReq.get(request);
 		if (!record) return;
 		const { span, attributes, startTime } = record;
+		span.setAttribute(HTTP_REQUEST_BODY_SIZE, record.requestBodySize);
+		span.setAttribute(HTTP_RESPONSE_BODY_SIZE, record.responseBodySize);
 		if (shouldCaptureRequestBody(record.url)) {
-			if (record.requestBodyChunks.length > 0 && record.requestBodySize !== Infinity) try {
+			if (record.requestBodyChunks.length > 0 && !record.requestBodyCaptureExceeded) try {
 				const requestBody = Buffer.concat(record.requestBodyChunks).toString("utf-8");
 				if (requestBody) span.setAttribute(HTTP_REQUEST_BODY, requestBody);
 			} catch (e) {
@@ -1035,24 +1042,29 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 	onBodyChunkSent({ request, chunk }) {
 		const record = this._recordFromReq.get(request);
 		if (!record) return;
+		record.requestBodySize += chunk.length;
 		if (!shouldCaptureRequestBody(record.url)) return;
 		const maxRequestBodySize = this.getConfig().maxRequestBodySize ?? DEFAULT_MAX_REQUEST_BODY_SIZE;
-		if (record.requestBodySize + chunk.length <= maxRequestBodySize) {
+		if (!record.requestBodyCaptureExceeded && record.requestBodyCaptureSize + chunk.length <= maxRequestBodySize) {
 			record.requestBodyChunks.push(chunk);
-			record.requestBodySize += chunk.length;
+			record.requestBodyCaptureSize += chunk.length;
 		} else {
-			record.requestBodySize = Infinity;
+			record.requestBodyCaptureExceeded = true;
 			record.requestBodyChunks = [];
+			record.requestBodyCaptureSize = 0;
 		}
 	}
 	onBodySent({ request }) {
 		const record = this._recordFromReq.get(request);
 		if (!record) return;
+		record.span.setAttribute(HTTP_REQUEST_BODY_SIZE, record.requestBodySize);
 		if (!shouldCaptureRequestBody(record.url)) {
 			record.requestBodyChunks = [];
+			record.requestBodyCaptureSize = 0;
+			record.requestBodyCaptureExceeded = false;
 			return;
 		}
-		if (record.requestBodySize === Infinity) {
+		if (record.requestBodyCaptureExceeded) {
 			const maxRequestBodySize = this.getConfig().maxRequestBodySize ?? DEFAULT_MAX_REQUEST_BODY_SIZE;
 			record.span.setAttribute(HTTP_REQUEST_BODY, `[truncated request body; exceeded maxRequestBodySize=${maxRequestBodySize}]`);
 		} else if (record.requestBodyChunks.length > 0) try {
@@ -1062,18 +1074,22 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 			this._diag.error("Error occurred while capturing request body:", e);
 		}
 		record.requestBodyChunks = [];
+		record.requestBodyCaptureSize = 0;
+		record.requestBodyCaptureExceeded = false;
 	}
 	onBodyChunkReceived({ request, chunk }) {
 		const record = this._recordFromReq.get(request);
 		if (!record) return;
+		record.responseBodySize += chunk.length;
 		if (!shouldCaptureResponseBody(record.url)) return;
 		const maxResponseBodySize = this.getConfig().maxResponseBodySize ?? DEFAULT_MAX_RESPONSE_BODY_SIZE;
-		if (record.responseBodySize + chunk.length <= maxResponseBodySize) {
+		if (!record.responseBodyCaptureExceeded && record.responseBodyCaptureSize + chunk.length <= maxResponseBodySize) {
 			record.responseBodyChunks.push(chunk);
-			record.responseBodySize += chunk.length;
+			record.responseBodyCaptureSize += chunk.length;
 		} else {
-			record.responseBodySize = Infinity;
+			record.responseBodyCaptureExceeded = true;
 			record.responseBodyChunks = [];
+			record.responseBodyCaptureSize = 0;
 		}
 	}
 	recordRequestDuration(attributes, startTime) {