@pingops/otel 0.2.1 → 0.2.2

package/dist/index.cjs

@@ -34,11 +34,11 @@ require("@opentelemetry/resources");
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 let http = require("http");
 let _opentelemetry_instrumentation_http = require("@opentelemetry/instrumentation-http");
+let _opentelemetry_core = require("@opentelemetry/core");
 let diagnostics_channel = require("diagnostics_channel");
 diagnostics_channel = __toESM(diagnostics_channel);
 let url = require("url");
 let _opentelemetry_instrumentation = require("@opentelemetry/instrumentation");
-let _opentelemetry_core = require("@opentelemetry/core");
 
 //#region src/config-store.ts
 let globalConfig = null;
@@ -59,7 +59,7 @@ function getGlobalConfig() {
 
 //#endregion
 //#region src/span-processor.ts
-const logger$1 = (0, _pingops_core.createLogger)("[PingOps Processor]");
+const logger$2 = (0, _pingops_core.createLogger)("[PingOps Processor]");
 /**
 * Creates a filtered span wrapper that applies header filtering to attributes
 *
@@ -77,7 +77,7 @@ const logger$1 = (0, _pingops_core.createLogger)("[PingOps Processor]");
 function createFilteredSpan(span, domainAllowList, globalHeadersAllowList, globalHeadersDenyList, globalCaptureRequestBody, globalCaptureResponseBody, headerRedaction) {
 	const payload = (0, _pingops_core.extractSpanPayload)(span, domainAllowList, globalHeadersAllowList, globalHeadersDenyList, globalCaptureRequestBody, globalCaptureResponseBody, headerRedaction);
 	const filteredAttributes = payload?.attributes ?? span.attributes;
-	logger$1.debug("Payload", { payload });
+	logger$2.debug("Payload", { payload });
 	return new Proxy(span, { get(target, prop) {
 		if (prop === "attributes") return filteredAttributes;
 		const value = target[prop];
@@ -130,9 +130,10 @@ var PingopsSpanProcessor = class {
 			captureResponseBody: config.captureResponseBody,
 			domainAllowList: config.domainAllowList,
 			maxRequestBodySize: config.maxRequestBodySize,
-			maxResponseBodySize: config.maxResponseBodySize
+			maxResponseBodySize: config.maxResponseBodySize,
+			exportTraceUrl: `${config.baseUrl}/v1/traces`
 		});
-		logger$1.info("Initialized PingopsSpanProcessor", {
+		logger$2.info("Initialized PingopsSpanProcessor", {
 			baseUrl: config.baseUrl,
 			exportMode,
 			batchSize: config.batchSize,
@@ -148,7 +149,7 @@ var PingopsSpanProcessor = class {
 	*/
 	onStart(span, parentContext) {
 		const spanContext = span.spanContext();
-		logger$1.debug("Span started", {
+		logger$2.debug("Span started", {
 			spanName: span.name,
 			spanId: spanContext.spanId,
 			traceId: spanContext.traceId
@@ -156,7 +157,7 @@ var PingopsSpanProcessor = class {
 		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);
-			logger$1.debug("Set propagated attributes on span", {
+			logger$2.debug("Set propagated attributes on span", {
 				spanName: span.name,
 				attributeKeys: Object.keys(propagatedAttributes)
 			});
@@ -174,7 +175,7 @@ var PingopsSpanProcessor = class {
 	*/
 	onEnd(span) {
 		const spanContext = span.spanContext();
-		logger$1.debug("Span ended, processing", {
+		logger$2.debug("Span ended, processing", {
 			spanName: span.name,
 			spanId: spanContext.spanId,
 			traceId: spanContext.traceId,
@@ -182,7 +183,7 @@ var PingopsSpanProcessor = class {
 		});
 		try {
 			if (!(0, _pingops_core.isSpanEligible)(span)) {
-				logger$1.debug("Span not eligible, skipping", {
+				logger$2.debug("Span not eligible, skipping", {
 					spanName: span.name,
 					spanId: spanContext.spanId,
 					reason: "not CLIENT or missing HTTP/GenAI attributes"
@@ -191,7 +192,7 @@ var PingopsSpanProcessor = class {
 			}
 			const attributes = span.attributes;
 			const url$1 = (0, _pingops_core.getHttpUrlFromAttributes)(attributes) ?? "";
-			logger$1.debug("Extracted URL for domain filtering", {
+			logger$2.debug("Extracted URL for domain filtering", {
 				spanName: span.name,
 				url: url$1,
 				hasHttpUrl: !!attributes["http.url"],
@@ -200,17 +201,17 @@ var PingopsSpanProcessor = class {
 			});
 			if (url$1) {
 				if (!(0, _pingops_core.shouldCaptureSpan)(url$1, this.config.domainAllowList, this.config.domainDenyList)) {
-					logger$1.info("Span filtered out by domain rules", {
+					logger$2.info("Span filtered out by domain rules", {
 						spanName: span.name,
 						spanId: spanContext.spanId,
 						url: url$1
 					});
 					return;
 				}
-			} else logger$1.debug("No URL found for domain filtering, proceeding", { spanName: span.name });
+			} else logger$2.debug("No URL found for domain filtering, proceeding", { spanName: span.name });
 			const filteredSpan = createFilteredSpan(span, this.config.domainAllowList, this.config.headersAllowList, this.config.headersDenyList, this.config.captureRequestBody, this.config.captureResponseBody, this.config.headerRedaction);
 			this.processor.onEnd(filteredSpan);
-			logger$1.info("Span passed all filters and queued for export", {
+			logger$2.info("Span passed all filters and queued for export", {
 				spanName: span.name,
 				spanId: spanContext.spanId,
 				traceId: spanContext.traceId,
@@ -218,7 +219,7 @@ var PingopsSpanProcessor = class {
 				hasHeaderFiltering: !!(this.config.headersAllowList || this.config.headersDenyList)
 			});
 		} catch (error) {
-			logger$1.error("Error processing span", {
+			logger$2.error("Error processing span", {
 				spanName: span.name,
 				spanId: spanContext.spanId,
 				error: error instanceof Error ? error.message : String(error)
@@ -231,12 +232,12 @@ var PingopsSpanProcessor = class {
 	* @returns Promise that resolves when all pending operations are complete
 	*/
 	async forceFlush() {
-		logger$1.info("Force flushing spans");
+		logger$2.info("Force flushing spans");
 		try {
 			await this.processor.forceFlush();
-			logger$1.info("Force flush complete");
+			logger$2.info("Force flush complete");
 		} catch (error) {
-			logger$1.error("Error during force flush", { error: error instanceof Error ? error.message : String(error) });
+			logger$2.error("Error during force flush", { error: error instanceof Error ? error.message : String(error) });
 			throw error;
 		}
 	}
@@ -246,12 +247,12 @@ var PingopsSpanProcessor = class {
 	* @returns Promise that resolves when shutdown is complete
 	*/
 	async shutdown() {
-		logger$1.info("Shutting down processor");
+		logger$2.info("Shutting down processor");
 		try {
 			await this.processor.shutdown();
-			logger$1.info("Processor shutdown complete");
+			logger$2.info("Processor shutdown complete");
 		} catch (error) {
-			logger$1.error("Error during processor shutdown", { error: error instanceof Error ? error.message : String(error) });
+			logger$2.error("Error during processor shutdown", { error: error instanceof Error ? error.message : String(error) });
 			throw error;
 		}
 	}
@@ -266,7 +267,7 @@ const PINGOPS_GLOBAL_SYMBOL = Symbol.for("pingops");
 /**
 * Logger instance for tracer provider
 */
-const logger = (0, _pingops_core.createLogger)("[PingOps TracerProvider]");
+const logger$1 = (0, _pingops_core.createLogger)("[PingOps TracerProvider]");
 /**
 * Creates initial global state
 */
@@ -281,21 +282,21 @@ function getGlobalState() {
 	try {
 		const g = globalThis;
 		if (typeof g !== "object" || g === null) {
-			logger.warn("globalThis is not available, using fallback state");
+			logger$1.warn("globalThis is not available, using fallback state");
 			return initialState;
 		}
 		if (!g[PINGOPS_GLOBAL_SYMBOL]) {
-			logger.debug("Creating new global state");
+			logger$1.debug("Creating new global state");
 			Object.defineProperty(g, PINGOPS_GLOBAL_SYMBOL, {
 				value: initialState,
 				writable: false,
 				configurable: false,
 				enumerable: false
 			});
-		} else logger.debug("Retrieved existing global state");
+		} else logger$1.debug("Retrieved existing global state");
 		return g[PINGOPS_GLOBAL_SYMBOL];
 	} catch (err) {
-		logger.error("Failed to access global state:", err instanceof Error ? err.message : String(err));
+		logger$1.error("Failed to access global state:", err instanceof Error ? err.message : String(err));
 		return initialState;
 	}
 }
@@ -313,11 +314,11 @@ function setPingopsTracerProvider(provider) {
 	const state = getGlobalState();
 	const hadProvider = state.isolatedTracerProvider !== null;
 	state.isolatedTracerProvider = provider;
-	if (provider) logger.info("Set isolated TracerProvider", {
+	if (provider) logger$1.info("Set isolated TracerProvider", {
 		hadPrevious: hadProvider,
 		providerType: provider.constructor.name
 	});
-	else logger.info("Cleared isolated TracerProvider", { hadPrevious: hadProvider });
+	else logger$1.info("Cleared isolated TracerProvider", { hadPrevious: hadProvider });
 }
 /**
 * Gets the TracerProvider for PingOps tracing operations.
@@ -331,31 +332,65 @@ function setPingopsTracerProvider(provider) {
 function getPingopsTracerProvider() {
 	const { isolatedTracerProvider } = getGlobalState();
 	if (isolatedTracerProvider) {
-		logger.debug("Using isolated TracerProvider", { providerType: isolatedTracerProvider.constructor.name });
+		logger$1.debug("Using isolated TracerProvider", { providerType: isolatedTracerProvider.constructor.name });
 		return isolatedTracerProvider;
 	}
 	const globalProvider = _opentelemetry_api.trace.getTracerProvider();
-	logger.debug("Using global TracerProvider", { providerType: globalProvider.constructor.name });
+	logger$1.debug("Using global TracerProvider", { providerType: globalProvider.constructor.name });
 	return globalProvider;
 }
 /**
 * Shuts down the TracerProvider and flushes remaining spans
 */
 async function shutdownTracerProvider() {
-	logger.info("Shutting down TracerProvider");
+	logger$1.info("Shutting down TracerProvider");
 	const providerWithShutdown = getPingopsTracerProvider();
 	if (providerWithShutdown && typeof providerWithShutdown.shutdown === "function") {
-		logger.debug("Calling provider.shutdown()");
+		logger$1.debug("Calling provider.shutdown()");
 		try {
 			await providerWithShutdown.shutdown();
-			logger.info("TracerProvider shutdown complete");
+			logger$1.info("TracerProvider shutdown complete");
 		} catch (error) {
-			logger.error("Error during TracerProvider shutdown:", error instanceof Error ? error.message : String(error));
+			logger$1.error("Error during TracerProvider shutdown:", error instanceof Error ? error.message : String(error));
 			throw error;
 		}
-	} else logger.warn("TracerProvider does not have shutdown method, skipping");
+	} else logger$1.warn("TracerProvider does not have shutdown method, skipping");
 	setPingopsTracerProvider(null);
-	logger.info("TracerProvider shutdown finished");
+	logger$1.info("TracerProvider shutdown finished");
+}
+
+//#endregion
+//#region src/instrumentations/suppression-guard.ts
+const logger = (0, _pingops_core.createLogger)("[PingOps SuppressionGuard]");
+let hasLoggedSuppressionLeakWarning = false;
+function normalizeUrl(url$1) {
+	try {
+		return new URL(url$1).toString();
+	} catch {
+		return null;
+	}
+}
+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);
+}
+/**
+* Returns a context for outbound span creation that neutralizes leaked suppression
+* for user traffic while preserving suppression for exporter requests.
+*/
+function resolveOutboundSpanParentContext(activeContext, requestUrl) {
+	if (!(0, _opentelemetry_core.isTracingSuppressed)(activeContext)) 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");
+		hasLoggedSuppressionLeakWarning = true;
+	} else logger.debug("Suppressed context detected for outbound user request; using ROOT_CONTEXT");
+	return _opentelemetry_api.ROOT_CONTEXT;
 }
 
 //#endregion
@@ -525,6 +560,20 @@ var PingopsHttpInstrumentation = class extends _opentelemetry_instrumentation_ht
 	constructor(config) {
 		super(config);
 		this._config = this._createConfig(config);
+		this._installOutgoingSuppressionGuard();
+	}
+	/**
+	* HttpInstrumentation's span creation is private, so we wrap the instance method
+	* to swap suppressed parent contexts with ROOT_CONTEXT for outgoing user requests.
+	*/
+	_installOutgoingSuppressionGuard() {
+		const target = this;
+		if (typeof target._startHttpSpan !== "function") return;
+		const originalStartHttpSpan = target._startHttpSpan.bind(this);
+		target._startHttpSpan = (name, options, ctx = _opentelemetry_api.context.active()) => {
+			if (options.kind !== _opentelemetry_api.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));
+		};
 	}
 	_createConfig(config) {
 		return {
@@ -782,16 +831,16 @@ var UndiciInstrumentation = class extends _opentelemetry_instrumentation.Instrum
 		if (hookAttributes) Object.entries(hookAttributes).forEach(([key, val]) => {
 			attributes[key] = val;
 		});
-		const activeCtx = _opentelemetry_api.context.active();
-		const currentSpan = _opentelemetry_api.trace.getSpan(activeCtx);
+		const spanParentContext = resolveOutboundSpanParentContext(_opentelemetry_api.context.active(), requestUrl.toString());
+		const currentSpan = _opentelemetry_api.trace.getSpan(spanParentContext);
 		let span;
 		if (config.requireParentforSpans && (!currentSpan || !_opentelemetry_api.trace.isSpanContextValid(currentSpan.spanContext()))) span = _opentelemetry_api.trace.wrapSpanContext(_opentelemetry_api.INVALID_SPAN_CONTEXT);
 		else span = this.tracer.startSpan(requestMethod === "_OTHER" ? "HTTP" : requestMethod, {
 			kind: _opentelemetry_api.SpanKind.CLIENT,
 			attributes
-		}, activeCtx);
+		}, spanParentContext);
 		(0, _opentelemetry_instrumentation.safeExecuteInTheMiddle)(() => config.requestHook?.(span, request), (e) => e && this._diag.error("caught requestHook error: ", e), true);
-		const requestContext = _opentelemetry_api.trace.setSpan(_opentelemetry_api.context.active(), span);
+		const requestContext = _opentelemetry_api.trace.setSpan(spanParentContext, span);
 		const addedHeaders = {};
 		_opentelemetry_api.propagation.inject(requestContext, addedHeaders);
 		const headerEntries = Object.entries(addedHeaders);