@pingops/otel 0.1.2 → 0.2.0

package/dist/index.cjs

@@ -128,7 +128,9 @@ var PingopsSpanProcessor = class {
 		setGlobalConfig({
 			captureRequestBody: config.captureRequestBody,
 			captureResponseBody: config.captureResponseBody,
-			domainAllowList: config.domainAllowList
+			domainAllowList: config.domainAllowList,
+			maxRequestBodySize: config.maxRequestBodySize,
+			maxResponseBodySize: config.maxResponseBodySize
 		});
 		logger$1.info("Initialized PingopsSpanProcessor", {
 			baseUrl: config.baseUrl,
@@ -360,19 +362,13 @@ async function shutdownTracerProvider() {
 //#region src/instrumentations/http/pingops-http.ts
 /**
 * Pingops HTTP instrumentation that extends HttpInstrumentation
-* with request/response body capture and network timing metrics
+* with request/response body capture
 */
 const DEFAULT_MAX_REQUEST_BODY_SIZE$1 = 4 * 1024;
 const DEFAULT_MAX_RESPONSE_BODY_SIZE$1 = 4 * 1024;
-const NETWORK_TIMINGS_PROP_NAME = "__networkTimings";
 const PingopsSemanticAttributes = {
 	HTTP_REQUEST_BODY: "http.request.body",
-	HTTP_RESPONSE_BODY: "http.response.body",
-	NETWORK_DNS_LOOKUP_DURATION: "net.dns.lookup.duration",
-	NETWORK_TCP_CONNECT_DURATION: "net.tcp.connect.duration",
-	NETWORK_TLS_HANDSHAKE_DURATION: "net.tls.handshake.duration",
-	NETWORK_TTFB_DURATION: "net.ttfb.duration",
-	NETWORK_CONTENT_TRANSFER_DURATION: "net.content.transfer.duration"
+	HTTP_RESPONSE_BODY: "http.response.body"
 };
 /**
 * Manually flattens a nested object into dot-notation keys
@@ -400,30 +396,6 @@ function setAttributeValue(span, attrName, attrValue) {
 	} else span.setAttribute(attrName, attrValue);
 }
 /**
-* Processes network timings and sets them as span attributes (no spans created)
-*/
-function processNetworkTimings(span, networkTimings) {
-	if (networkTimings.startAt && networkTimings.dnsLookupAt) span.setAttribute(PingopsSemanticAttributes.NETWORK_DNS_LOOKUP_DURATION, networkTimings.dnsLookupAt - networkTimings.startAt);
-	if (networkTimings.dnsLookupAt && networkTimings.tcpConnectionAt) span.setAttribute(PingopsSemanticAttributes.NETWORK_TCP_CONNECT_DURATION, networkTimings.tcpConnectionAt - networkTimings.dnsLookupAt);
-	if (networkTimings.tcpConnectionAt && networkTimings.tlsHandshakeAt) span.setAttribute(PingopsSemanticAttributes.NETWORK_TLS_HANDSHAKE_DURATION, networkTimings.tlsHandshakeAt - networkTimings.tcpConnectionAt);
-	const startTTFB = networkTimings.tlsHandshakeAt || networkTimings.tcpConnectionAt;
-	if (networkTimings.firstByteAt && startTTFB) span.setAttribute(PingopsSemanticAttributes.NETWORK_TTFB_DURATION, networkTimings.firstByteAt - startTTFB);
-	if (networkTimings.firstByteAt && networkTimings.endAt) span.setAttribute(PingopsSemanticAttributes.NETWORK_CONTENT_TRANSFER_DURATION, networkTimings.endAt - networkTimings.firstByteAt);
-}
-/**
-* Initializes network timings on a span
-*/
-function initializeNetworkTimings(span) {
-	const networkTimings = { startAt: Date.now() };
-	Object.defineProperty(span, NETWORK_TIMINGS_PROP_NAME, {
-		enumerable: false,
-		configurable: true,
-		writable: false,
-		value: networkTimings
-	});
-	return networkTimings;
-}
-/**
 * Extracts domain from URL
 */
 function extractDomainFromUrl$1(url$1) {
@@ -487,26 +459,66 @@ function captureRequestBody(span, data, maxSize, semanticAttr, url$1) {
 /**
 * Captures response body from chunks
 */
-function captureResponseBody(span, chunks, semanticAttr, url$1) {
+function captureResponseBody(span, chunks, semanticAttr, responseHeaders, url$1) {
 	if (!shouldCaptureResponseBody$1(url$1)) return;
 	if (chunks && chunks.length) try {
-		const responseBody = Buffer.concat(chunks).toString("utf8");
-		if (responseBody) setAttributeValue(span, semanticAttr, responseBody);
+		const concatedChunks = Buffer.concat(chunks);
+		const contentEncoding = responseHeaders?.["content-encoding"];
+		if ((0, _pingops_core.isCompressedContentEncoding)(contentEncoding)) {
+			setAttributeValue(span, semanticAttr, concatedChunks.toString("base64"));
+			const encStr = typeof contentEncoding === "string" ? contentEncoding : Array.isArray(contentEncoding) ? contentEncoding.map(String).join(", ") : void 0;
+			if (encStr) setAttributeValue(span, _pingops_core.HTTP_RESPONSE_CONTENT_ENCODING, encStr);
+		} else {
+			const bodyStr = (0, _pingops_core.bufferToBodyString)(concatedChunks);
+			if (bodyStr != null) setAttributeValue(span, semanticAttr, bodyStr);
+		}
 	} catch (e) {
 		console.error("Error occurred while capturing response body:", e);
 	}
 }
 /**
+* Extracts headers from a request object (ClientRequest or IncomingMessage)
+* Handles both types efficiently by checking for available methods/properties
+*/
+function extractRequestHeaders(request) {
+	if ("headers" in request && request.headers) return request.headers;
+	if (typeof request.getHeaders === "function") try {
+		const headers = request.getHeaders();
+		const result = {};
+		for (const [key, value] of Object.entries(headers)) if (value !== void 0) result[key] = typeof value === "number" ? String(value) : Array.isArray(value) ? value.map(String) : String(value);
+		return result;
+	} catch {
+		return null;
+	}
+	return null;
+}
+/**
+* Extracts headers from a response object (ServerResponse or IncomingMessage)
+* Handles both types efficiently by checking for available methods/properties
+*/
+function extractResponseHeaders(response) {
+	if ("headers" in response && response.headers) return response.headers;
+	if (typeof response.getHeaders === "function") try {
+		const headers = response.getHeaders();
+		const result = {};
+		for (const [key, value] of Object.entries(headers)) if (value !== void 0) result[key] = typeof value === "number" ? String(value) : Array.isArray(value) ? value.map(String) : String(value);
+		return result;
+	} catch {
+		return null;
+	}
+	return null;
+}
+/**
 * Captures HTTP request headers as span attributes
 */
 function captureRequestHeaders(span, headers) {
-	for (const [key, value] of Object.entries(headers)) if (value !== void 0) span.setAttribute(`pingops.http.request.header.${key.toLowerCase()}`, Array.isArray(value) ? value.join(",") : String(value));
+	for (const [key, value] of Object.entries(headers)) if (value !== void 0) span.setAttribute(`http.request.header.${key.toLowerCase()}`, Array.isArray(value) ? value.join(",") : String(value));
 }
 /**
 * Captures HTTP response headers as span attributes
 */
 function captureResponseHeaders(span, headers) {
-	for (const [key, value] of Object.entries(headers)) if (value !== void 0) span.setAttribute(`pingops.http.response.header.${key.toLowerCase()}`, Array.isArray(value) ? value.join(",") : String(value));
+	for (const [key, value] of Object.entries(headers)) if (value !== void 0) span.setAttribute(`http.response.header.${key.toLowerCase()}`, Array.isArray(value) ? value.join(",") : String(value));
 }
 const PingopsHttpSemanticAttributes = PingopsSemanticAttributes;
 var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_http.HttpInstrumentation {
@@ -523,10 +535,9 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 	}
 	_createRequestHook(originalRequestHook, config) {
 		return (span, request) => {
-			const headers = request.headers;
+			const headers = extractRequestHeaders(request);
 			if (headers) captureRequestHeaders(span, headers);
 			if (request instanceof http.ClientRequest) {
-				const networkTimings = initializeNetworkTimings(span);
 				const maxRequestBodySize = config?.maxRequestBodySize || DEFAULT_MAX_REQUEST_BODY_SIZE$1;
 				const url$1 = request.path && request.getHeader("host") ? `${request.protocol || "http:"}//${request.getHeader("host")}${request.path}` : void 0;
 				const originalWrite = request.write.bind(request);
@@ -539,27 +550,15 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 					if (typeof data === "string" || data instanceof Buffer) captureRequestBody(span, data, maxRequestBodySize, PingopsSemanticAttributes.HTTP_REQUEST_BODY, url$1);
 					return originalEnd(data);
 				};
-				request.on("socket", (socket) => {
-					socket.on("lookup", () => {
-						networkTimings.dnsLookupAt = Date.now();
-					});
-					socket.on("connect", () => {
-						networkTimings.tcpConnectionAt = Date.now();
-					});
-					socket.on("secureConnect", () => {
-						networkTimings.tlsHandshakeAt = Date.now();
-					});
-				});
 			}
 			if (originalRequestHook) originalRequestHook(span, request);
 		};
 	}
 	_createResponseHook(originalResponseHook, config) {
 		return (span, response) => {
-			const headers = response.headers;
+			const headers = extractResponseHeaders(response);
 			if (headers) captureResponseHeaders(span, headers);
 			if (response instanceof http.IncomingMessage) {
-				const networkTimings = span[NETWORK_TIMINGS_PROP_NAME];
 				const maxResponseBodySize = config?.maxResponseBodySize || DEFAULT_MAX_RESPONSE_BODY_SIZE$1;
 				const url$1 = response.url || void 0;
 				let chunks = [];
@@ -574,14 +573,7 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 					}
 				});
 				response.prependOnceListener("end", () => {
-					if (networkTimings) {
-						networkTimings.endAt = Date.now();
-						processNetworkTimings(span, networkTimings);
-					}
-					captureResponseBody(span, chunks, PingopsSemanticAttributes.HTTP_RESPONSE_BODY, url$1);
-				});
-				if (networkTimings) response.once("readable", () => {
-					networkTimings.firstByteAt = Date.now();
+					captureResponseBody(span, chunks, PingopsSemanticAttributes.HTTP_RESPONSE_BODY, headers, url$1);
 				});
 			}
 			if (originalResponseHook) originalResponseHook(span, response);
@@ -595,19 +587,19 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 * HTTP instrumentation for OpenTelemetry
 */
 /**
-* Creates an HTTP instrumentation instance
+* Creates an HTTP instrumentation instance.
+* All outgoing HTTP requests are instrumented when the SDK is initialized.
 *
-* @param isGlobalInstrumentationEnabled - Function that checks if global instrumentation is enabled
 * @param config - Optional configuration for the instrumentation
 * @returns PingopsHttpInstrumentation instance
 */
-function createHttpInstrumentation(isGlobalInstrumentationEnabled, config) {
+function createHttpInstrumentation(config) {
+	const globalConfig$1 = getGlobalConfig();
 	return new PingopsHttpInstrumentation({
 		ignoreIncomingRequestHook: () => true,
-		ignoreOutgoingRequestHook: () => {
-			if (isGlobalInstrumentationEnabled()) return false;
-			return _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_HTTP_ENABLED) !== true;
-		},
+		ignoreOutgoingRequestHook: () => false,
+		maxRequestBodySize: globalConfig$1?.maxRequestBodySize,
+		maxResponseBodySize: globalConfig$1?.maxResponseBodySize,
 		...config
 	});
 }
@@ -864,9 +856,19 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		if (!record) return;
 		const { span, attributes, startTime } = record;
 		if (shouldCaptureResponseBody(record.url)) {
-			if (record.responseBodyChunks.length > 0 && record.responseBodySize !== Infinity) try {
-				const responseBody = Buffer.concat(record.responseBodyChunks).toString("utf-8");
-				if (responseBody) span.setAttribute(HTTP_RESPONSE_BODY, responseBody);
+			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"}]`);
+			else if (record.responseBodyChunks.length > 0) try {
+				const responseBodyBuffer = Buffer.concat(record.responseBodyChunks);
+				if ((0, _pingops_core.isCompressedContentEncoding)(contentEncoding)) {
+					span.setAttribute(HTTP_RESPONSE_BODY, responseBodyBuffer.toString("base64"));
+					if (contentEncoding) span.setAttribute(_pingops_core.HTTP_RESPONSE_CONTENT_ENCODING, contentEncoding);
+				} else {
+					const bodyStr = (0, _pingops_core.bufferToBodyString)(responseBodyBuffer);
+					if (bodyStr != null) span.setAttribute(HTTP_RESPONSE_BODY, bodyStr);
+				}
 			} catch (e) {
 				this._diag.error("Error occurred while capturing response body:", e);
 			}
@@ -905,7 +907,10 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		if (record.requestBodySize + chunk.length <= maxRequestBodySize) {
 			record.requestBodyChunks.push(chunk);
 			record.requestBodySize += chunk.length;
-		} else if (record.requestBodyChunks.length === 0) record.requestBodySize = Infinity;
+		} else {
+			record.requestBodySize = Infinity;
+			record.requestBodyChunks = [];
+		}
 	}
 	onBodySent({ request }) {
 		const record = this._recordFromReq.get(request);
@@ -914,7 +919,10 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 			record.requestBodyChunks = [];
 			return;
 		}
-		if (record.requestBodyChunks.length > 0 && record.requestBodySize !== Infinity) try {
+		if (record.requestBodySize === Infinity) {
+			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 {
 			const requestBody = Buffer.concat(record.requestBodyChunks).toString("utf-8");
 			if (requestBody) record.span.setAttribute(HTTP_REQUEST_BODY, requestBody);
 		} catch (e) {
@@ -930,7 +938,10 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		if (record.responseBodySize + chunk.length <= maxResponseBodySize) {
 			record.responseBodyChunks.push(chunk);
 			record.responseBodySize += chunk.length;
-		} else if (record.responseBodyChunks.length === 0) record.responseBodySize = Infinity;
+		} else {
+			record.responseBodySize = Infinity;
+			record.responseBodyChunks = [];
+		}
 	}
 	recordRequestDuration(attributes, startTime) {
 		const metricsAttributes = {};
@@ -969,18 +980,18 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 * Undici instrumentation for OpenTelemetry
 */
 /**
-* Creates an Undici instrumentation instance
+* Creates an Undici instrumentation instance.
+* All requests are instrumented when the SDK is initialized.
 *
-* @param isGlobalInstrumentationEnabled - Function that checks if global instrumentation is enabled
 * @returns UndiciInstrumentation instance
 */
-function createUndiciInstrumentation(isGlobalInstrumentationEnabled) {
+function createUndiciInstrumentation() {
+	const globalConfig$1 = getGlobalConfig();
 	return new UndiciInstrumentation({
 		enabled: true,
-		ignoreRequestHook: () => {
-			if (isGlobalInstrumentationEnabled()) return false;
-			return _opentelemetry_api.context.active().getValue(_pingops_core.PINGOPS_HTTP_ENABLED) !== true;
-		}
+		ignoreRequestHook: () => false,
+		maxRequestBodySize: globalConfig$1?.maxRequestBodySize,
+		maxResponseBodySize: globalConfig$1?.maxResponseBodySize
 	});
 }
 
@@ -990,18 +1001,14 @@ let installed = false;
 /**
 * Registers instrumentations for Node.js environment.
 * This function is idempotent and can be called multiple times safely.
+* When the SDK is initialized, all HTTP requests are instrumented.
 *
-* Instrumentation behavior:
-* - If global instrumentation is enabled: all HTTP requests are instrumented
-* - If global instrumentation is NOT enabled: only requests within wrapHttp blocks are instrumented
-*
-* @param isGlobalInstrumentationEnabled - Function that checks if global instrumentation is enabled
 * @returns Array of Instrumentation instances
 */
-function getInstrumentations(isGlobalInstrumentationEnabled) {
+function getInstrumentations() {
 	if (installed) return [];
 	installed = true;
-	return [createHttpInstrumentation(isGlobalInstrumentationEnabled), createUndiciInstrumentation(isGlobalInstrumentationEnabled)];
+	return [createHttpInstrumentation(), createUndiciInstrumentation()];
 }
 
 //#endregion