@pingops/otel 0.2.2 → 0.2.4

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { HTTP_RESPONSE_CONTENT_ENCODING, PINGOPS_CAPTURE_REQUEST_BODY, PINGOPS_C
 import { INVALID_SPAN_CONTEXT, ROOT_CONTEXT, SpanKind, SpanStatusCode, ValueType, context, propagation, trace } from "@opentelemetry/api";
 import "@opentelemetry/sdk-trace-node";
 import "@opentelemetry/resources";
-import { ATTR_ERROR_TYPE, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_REQUEST_METHOD_ORIGINAL, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_NETWORK_PEER_ADDRESS, ATTR_NETWORK_PEER_PORT, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, ATTR_URL_FULL, ATTR_URL_PATH, ATTR_URL_QUERY, ATTR_URL_SCHEME, ATTR_USER_AGENT_ORIGINAL, METRIC_HTTP_CLIENT_REQUEST_DURATION } from "@opentelemetry/semantic-conventions";
+import { ATTR_ERROR_TYPE, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_REQUEST_METHOD_ORIGINAL, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_HTTP_URL, ATTR_NETWORK_PEER_ADDRESS, ATTR_NETWORK_PEER_PORT, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, ATTR_URL_FULL, ATTR_URL_PATH, ATTR_URL_QUERY, ATTR_URL_SCHEME, ATTR_USER_AGENT_ORIGINAL, METRIC_HTTP_CLIENT_REQUEST_DURATION } from "@opentelemetry/semantic-conventions";
 import { ClientRequest, IncomingMessage } from "http";
 import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
 import { hrTime, hrTimeDuration, hrTimeToMilliseconds, isTracingSuppressed } from "@opentelemetry/core";
@@ -32,6 +32,21 @@ function getGlobalConfig() {
 //#endregion
 //#region src/span-processor.ts
 const logger$2 = createLogger("[PingOps Processor]");
+function normalizePath$1(pathname) {
+	return pathname.replace(/\/+/g, "/").replace(/\/$/, "");
+}
+function isExporterRequestUrl$1(url, exporterUrl) {
+	try {
+		const request = new URL(url);
+		const exporter = new URL(exporterUrl);
+		if (request.origin !== exporter.origin) return false;
+		const requestPath = normalizePath$1(request.pathname);
+		const exporterPath = normalizePath$1(exporter.pathname);
+		return requestPath === exporterPath || requestPath.startsWith(`${exporterPath}/`);
+	} catch {
+		return false;
+	}
+}
 /**
 * Creates a filtered span wrapper that applies header filtering to attributes
 *
@@ -65,6 +80,7 @@ function createFilteredSpan(span, domainAllowList, globalHeadersAllowList, globa
 */
 var PingopsSpanProcessor = class {
 	processor;
+	exporterTraceUrl;
 	config;
 	/**
 	* Creates a new PingopsSpanProcessor instance.
@@ -74,8 +90,9 @@ var PingopsSpanProcessor = class {
 	constructor(config) {
 		const exportMode = config.exportMode ?? "batched";
 		const apiKey = config.apiKey || process.env.PINGOPS_API_KEY || "";
+		this.exporterTraceUrl = `${config.baseUrl}/v1/traces`;
 		const exporter = new OTLPTraceExporter({
-			url: `${config.baseUrl}/v1/traces`,
+			url: this.exporterTraceUrl,
 			headers: {
 				Authorization: apiKey ? `Bearer ${apiKey}` : "",
 				"Content-Type": "application/json"
@@ -103,7 +120,7 @@ var PingopsSpanProcessor = class {
 			domainAllowList: config.domainAllowList,
 			maxRequestBodySize: config.maxRequestBodySize,
 			maxResponseBodySize: config.maxResponseBodySize,
-			exportTraceUrl: `${config.baseUrl}/v1/traces`
+			exportTraceUrl: this.exporterTraceUrl
 		});
 		logger$2.info("Initialized PingopsSpanProcessor", {
 			baseUrl: config.baseUrl,
@@ -164,6 +181,14 @@ var PingopsSpanProcessor = class {
 			}
 			const attributes = span.attributes;
 			const url = getHttpUrlFromAttributes(attributes) ?? "";
+			if (url && isExporterRequestUrl$1(url, this.exporterTraceUrl)) {
+				logger$2.debug("Skipping exporter span to prevent self-instrumentation", {
+					spanName: span.name,
+					spanId: spanContext.spanId,
+					url
+				});
+				return;
+			}
 			logger$2.debug("Extracted URL for domain filtering", {
 				spanName: span.name,
 				url,
@@ -335,9 +360,12 @@ async function shutdownTracerProvider() {
 //#region src/instrumentations/suppression-guard.ts
 const logger = createLogger("[PingOps SuppressionGuard]");
 let hasLoggedSuppressionLeakWarning = false;
-function normalizeUrl(url) {
+function normalizePath(pathname) {
+	return pathname.replace(/\/+/g, "/").replace(/\/$/, "");
+}
+function parseUrl(url) {
 	try {
-		return new URL(url).toString();
+		return new URL(url);
 	} catch {
 		return null;
 	}
@@ -346,10 +374,20 @@ function isExporterRequestUrl(requestUrl) {
 	if (!requestUrl) return false;
 	const exporterUrl = getGlobalConfig()?.exportTraceUrl;
 	if (!exporterUrl) return false;
-	const normalizedRequestUrl = normalizeUrl(requestUrl);
-	const normalizedExporterUrl = normalizeUrl(exporterUrl);
-	if (!normalizedRequestUrl || !normalizedExporterUrl) return false;
-	return normalizedRequestUrl.startsWith(normalizedExporterUrl);
+	const parsedRequestUrl = parseUrl(requestUrl);
+	const parsedExporterUrl = parseUrl(exporterUrl);
+	if (!parsedRequestUrl || !parsedExporterUrl) return false;
+	if (parsedRequestUrl.origin !== parsedExporterUrl.origin) return false;
+	const requestPath = normalizePath(parsedRequestUrl.pathname);
+	const exporterPath = normalizePath(parsedExporterUrl.pathname);
+	return requestPath === exporterPath || requestPath.startsWith(`${exporterPath}/`);
+}
+/**
+* Determines whether an outbound request should be skipped from instrumentation
+* to prevent exporter self-instrumentation loops.
+*/
+function shouldIgnoreOutboundInstrumentation(requestUrl) {
+	return isExporterRequestUrl(requestUrl);
 }
 /**
 * Returns a context for outbound span creation that neutralizes leaked suppression
@@ -527,6 +565,16 @@ function captureRequestHeaders(span, headers) {
 function captureResponseHeaders(span, headers) {
 	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));
 }
+function extractRequestUrlFromSpanOptions(options) {
+	const attrs = options.attributes;
+	if (!attrs) return;
+	if (typeof attrs[ATTR_URL_FULL] === "string") return attrs[ATTR_URL_FULL];
+	if (typeof attrs[ATTR_HTTP_URL] === "string") return attrs[ATTR_HTTP_URL];
+	const scheme = typeof attrs[ATTR_URL_SCHEME] === "string" ? attrs[ATTR_URL_SCHEME] : "http";
+	const host = typeof attrs[ATTR_SERVER_ADDRESS] === "string" ? attrs[ATTR_SERVER_ADDRESS] : void 0;
+	if (!host) return;
+	return `${scheme}://${host}${typeof attrs[ATTR_SERVER_PORT] === "number" ? `:${attrs[ATTR_SERVER_PORT]}` : ""}${typeof attrs[ATTR_URL_PATH] === "string" ? attrs[ATTR_URL_PATH] : "/"}${typeof attrs[ATTR_URL_QUERY] === "string" && attrs[ATTR_URL_QUERY].length > 0 ? `?${attrs[ATTR_URL_QUERY]}` : ""}`;
+}
 const PingopsHttpSemanticAttributes = PingopsSemanticAttributes;
 var PingopsHttpInstrumentation = class extends HttpInstrumentation {
 	constructor(config) {
@@ -544,7 +592,7 @@ var PingopsHttpInstrumentation = class extends HttpInstrumentation {
 		const originalStartHttpSpan = target._startHttpSpan.bind(this);
 		target._startHttpSpan = (name, options, ctx = context.active()) => {
 			if (options.kind !== SpanKind.CLIENT) return originalStartHttpSpan(name, options, ctx);
-			return originalStartHttpSpan(name, options, resolveOutboundSpanParentContext(ctx, typeof options.attributes?.["url.full"] === "string" ? options.attributes["url.full"] : void 0));
+			return originalStartHttpSpan(name, options, resolveOutboundSpanParentContext(ctx, extractRequestUrlFromSpanOptions(options)));
 		};
 	}
 	_createConfig(config) {
@@ -607,6 +655,14 @@ var PingopsHttpInstrumentation = class extends HttpInstrumentation {
 /**
 * HTTP instrumentation for OpenTelemetry
 */
+function toRequestUrl$1(request) {
+	if (typeof request.href === "string" && request.href.length > 0) return request.href;
+	const protocol = typeof request.protocol === "string" && request.protocol.length > 0 ? request.protocol : "http:";
+	const hostnameOrHost = typeof request.hostname === "string" && request.hostname.length > 0 ? request.hostname : request.host;
+	if (!hostnameOrHost) return;
+	const hasPortInHost = hostnameOrHost.includes(":");
+	return `${protocol}//${hostnameOrHost}${request.port != null && !hasPortInHost ? `:${request.port}` : ""}${typeof request.path === "string" ? request.path : typeof request.pathname === "string" ? request.pathname : "/"}`;
+}
 /**
 * Creates an HTTP instrumentation instance.
 * All outgoing HTTP requests are instrumented when the SDK is initialized.
@@ -616,12 +672,16 @@ var PingopsHttpInstrumentation = class extends HttpInstrumentation {
 */
 function createHttpInstrumentation(config) {
 	const globalConfig$1 = getGlobalConfig();
+	const userIgnoreOutgoingRequestHook = config?.ignoreOutgoingRequestHook;
 	return new PingopsHttpInstrumentation({
+		...config,
 		ignoreIncomingRequestHook: () => true,
-		ignoreOutgoingRequestHook: () => false,
+		ignoreOutgoingRequestHook: (request) => {
+			if (shouldIgnoreOutboundInstrumentation(toRequestUrl$1(request))) return true;
+			return userIgnoreOutgoingRequestHook?.(request) ?? false;
+		},
 		maxRequestBodySize: globalConfig$1?.maxRequestBodySize,
-		maxResponseBodySize: globalConfig$1?.maxResponseBodySize,
-		...config
+		maxResponseBodySize: globalConfig$1?.maxResponseBodySize
 	});
 }
 
@@ -1000,6 +1060,13 @@ var UndiciInstrumentation = class extends InstrumentationBase {
 /**
 * Undici instrumentation for OpenTelemetry
 */
+function toRequestUrl(request) {
+	try {
+		return new URL(request.path, request.origin).toString();
+	} catch {
+		return;
+	}
+}
 /**
 * Creates an Undici instrumentation instance.
 * All requests are instrumented when the SDK is initialized.
@@ -1010,7 +1077,9 @@ function createUndiciInstrumentation() {
 	const globalConfig$1 = getGlobalConfig();
 	return new UndiciInstrumentation({
 		enabled: true,
-		ignoreRequestHook: () => false,
+		ignoreRequestHook: (request) => {
+			return shouldIgnoreOutboundInstrumentation(toRequestUrl(request));
+		},
 		maxRequestBodySize: globalConfig$1?.maxRequestBodySize,
 		maxResponseBodySize: globalConfig$1?.maxResponseBodySize
 	});