@depup/sentry__server-utils 11.0.0-depup.0 → 11.1.0-depup.0

package/build/cjs/index.js

@@ -7,7 +7,8 @@ const index$f = require('./ai/openai/index.js');
 const index$b = require('./ai/anthropic-ai/index.js');
 const index$d = require('./ai/google-genai/index.js');
 const index$e = require('./ai/mistral/index.js');
-const index$g = require('./ai/workers-ai/index.js');
+const index$g = require('./ai/typesafe/index.js');
+const index$h = require('./ai/workers-ai/index.js');
 const index$3 = require('./ai/langchain/index.js');
 const index$c = require('./ai/langgraph/index.js');
 const index = require('./ai/mastra/index.js');
@@ -19,10 +20,11 @@ const koaErrorHandler = require('./integrations/koa/koa-error-handler.js');
 const hapiErrorHandler = require('./integrations/hapi/hapi-error-handler.js');
 const tracingChannel = require('./tracing-channel.js');
 const moduleInjected = require('./utils/moduleInjected.js');
+const diagnosticsChannel = require('./utils/diagnosticsChannel.js');
 const eve = require('./eve.js');
 const index$8 = require('./orchestrion/config/index.js');
 const index$5 = require('./integrations/fastify/index.js');
-const index$m = require('./integrations/prisma/index.js');
+const index$n = require('./integrations/prisma/index.js');
 const amqplib = require('./integrations/amqplib.js');
 const anthropic = require('./integrations/anthropic.js');
 const index$1 = require('./integrations/aws-sdk/index.js');
@@ -31,27 +33,29 @@ const genericPool = require('./integrations/generic-pool.js');
 const googleGenai = require('./integrations/google-genai.js');
 const index$9 = require('./integrations/graphql/index.js');
 const index$a = require('./integrations/hapi/index.js');
-const index$i = require('./integrations/koa/index.js');
-const index$n = require('./integrations/redis/index.js');
-const index$h = require('./integrations/kafkajs/index.js');
+const index$j = require('./integrations/koa/index.js');
+const index$o = require('./integrations/redis/index.js');
+const index$i = require('./integrations/kafkajs/index.js');
 const knex = require('./integrations/knex.js');
 const langchain = require('./integrations/langchain.js');
 const langgraph = require('./integrations/langgraph.js');
 const flue = require('./integrations/flue.js');
 const mastra = require('./integrations/mastra.js');
+const mcpServer = require('./integrations/mcp-server.js');
 const lruMemoizer = require('./integrations/lru-memoizer.js');
-const index$j = require('./integrations/mongodb/index.js');
-const index$k = require('./integrations/mongoose/index.js');
+const index$k = require('./integrations/mongodb/index.js');
+const index$l = require('./integrations/mongoose/index.js');
 const mistral = require('./integrations/mistral.js');
 const groq = require('./integrations/groq.js');
 const togetherAi = require('./integrations/together-ai.js');
+const typesafe = require('./integrations/typesafe.js');
 const mysql = require('./integrations/mysql.js');
-const index$l = require('./integrations/mysql2/index.js');
+const index$m = require('./integrations/mysql2/index.js');
 const openai = require('./integrations/openai.js');
 const postgres = require('./integrations/postgres.js');
 const postgresJs = require('./integrations/postgres-js.js');
 const tedious = require('./integrations/tedious.js');
-const index$o = require('./integrations/vercel-ai/index.js');
+const index$p = require('./integrations/vercel-ai/index.js');
 const index$4 = require('./integrations/express/index.js');
 const errorHandler = require('./integrations/express/error-handler.js');
 const index$6 = require('./integrations/firebase/index.js');
@@ -68,7 +72,8 @@ exports.instrumentOpenAiClient = index$f.instrumentOpenAiClient;
 exports.instrumentAnthropicAiClient = index$b.instrumentAnthropicAiClient;
 exports.instrumentGoogleGenAIClient = index$d.instrumentGoogleGenAIClient;
 exports.instrumentMistralAiClient = index$e.instrumentMistralAiClient;
-exports.instrumentWorkersAiClient = index$g.instrumentWorkersAiClient;
+exports.instrumentTypeSafeClient = index$g.instrumentTypeSafeClient;
+exports.instrumentWorkersAiClient = index$h.instrumentWorkersAiClient;
 exports.createLangChainCallbackHandler = index$3.createLangChainCallbackHandler;
 exports.instrumentCreateReactAgent = index$c.instrumentCreateReactAgent;
 exports.instrumentStateGraph = index$c.instrumentStateGraph;
@@ -83,12 +88,14 @@ exports.detectOrchestrionSetup = detect.detectOrchestrionSetup;
 exports.attachKoaErrorHandler = koaErrorHandler.attachKoaErrorHandler;
 exports.bindTracingChannelToSpan = tracingChannel.bindTracingChannelToSpan;
 exports.orchestrionModuleInjected = moduleInjected.orchestrionModuleInjected;
+exports.diagnosticsTracingChannel = diagnosticsChannel.tracingChannel;
+exports.subscribeDiagnosticsChannel = diagnosticsChannel.subscribe;
 exports.eveConversationHook = eve.eveConversationHook;
 exports.eveIntegration = eve.eveIntegration;
 exports.getInstrumentedModuleNames = index$8.getInstrumentedModuleNames;
 exports.fastifyIntegration = index$5.fastifyIntegration;
 exports.setupFastifyErrorHandler = index$5.setupFastifyErrorHandler;
-exports.prismaIntegration = index$m.prismaIntegration;
+exports.prismaIntegration = index$n.prismaIntegration;
 exports.amqplibIntegration = amqplib.amqplibIntegration;
 exports.anthropicAIIntegration = anthropic.anthropicAIIntegration;
 exports.awsIntegration = index$1.awsIntegration;
@@ -97,27 +104,29 @@ exports.genericPoolIntegration = genericPool.genericPoolIntegration;
 exports.googleGenAIIntegration = googleGenai.googleGenAIIntegration;
 exports.graphqlIntegration = index$9.graphqlIntegration;
 exports.hapiIntegration = index$a.hapiIntegration;
-exports.koaIntegration = index$i.koaIntegration;
-exports.redisIntegration = index$n.redisIntegration;
-exports.kafkaIntegration = index$h.kafkaIntegration;
+exports.koaIntegration = index$j.koaIntegration;
+exports.redisIntegration = index$o.redisIntegration;
+exports.kafkaIntegration = index$i.kafkaIntegration;
 exports.knexIntegration = knex.knexIntegration;
 exports.langChainIntegration = langchain.langChainIntegration;
 exports.langGraphIntegration = langgraph.langGraphIntegration;
 exports.flueIntegration = flue.flueIntegration;
 exports.mastraIntegration = mastra.mastraIntegration;
+exports.mcpServerIntegration = mcpServer.mcpServerIntegration;
 exports.lruMemoizerIntegration = lruMemoizer.lruMemoizerIntegration;
-exports.mongoIntegration = index$j.mongoIntegration;
-exports.mongooseIntegration = index$k.mongooseIntegration;
+exports.mongoIntegration = index$k.mongoIntegration;
+exports.mongooseIntegration = index$l.mongooseIntegration;
 exports.mistralAIIntegration = mistral.mistralAIIntegration;
 exports.groqIntegration = groq.groqIntegration;
 exports.togetherAIIntegration = togetherAi.togetherAIIntegration;
+exports.typesafeIntegration = typesafe.typesafeIntegration;
 exports.mysqlIntegration = mysql.mysqlIntegration;
-exports.mysql2Integration = index$l.mysql2Integration;
+exports.mysql2Integration = index$m.mysql2Integration;
 exports.openAIIntegration = openai.openAIIntegration;
 exports.postgresIntegration = postgres.postgresIntegration;
 exports.postgresJsIntegration = postgresJs.postgresJsIntegration;
 exports.tediousIntegration = tedious.tediousIntegration;
-exports.vercelAIIntegration = index$o.vercelAIIntegration;
+exports.vercelAIIntegration = index$p.vercelAIIntegration;
 exports.expressIntegration = index$4.expressIntegration;
 exports.expressErrorHandler = errorHandler.expressErrorHandler;
 exports.setupExpressErrorHandler = errorHandler.setupExpressErrorHandler;

package/build/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/index.ts"],"sourcesContent":["export * from './exports';\n\n// Exports using diagnostics channels\nexport { detectOrchestrionSetup } from './orchestrion/detect';\n// oxlint-disable-next-line typescript/no-deprecated -- re-exported so the deprecated `setupKoaErrorHandler` can delegate\nexport { attachKoaErrorHandler } from './integrations/koa/koa-error-handler';\nimport { attachHapiErrorHandler as _attachHapiErrorHandler } from './integrations/hapi/hapi-error-handler';\nexport { bindTracingChannelToSpan } from './tracing-channel';\nexport type { TracingChannelPayloadWithSpan } from './tracing-channel';\nexport type { InstrumentationConfig } from './orchestrion/apmTypes';\n// Runtime target of the bundler-injected module snippet. The snippet imports it\n// from this entry alongside the module's subscriber factory (see\n// `orchestrion/bundler/moduleInjectedTransform.ts`); it is a plain runtime\n// helper with no orchestrion build-time dependency.\nexport { orchestrionModuleInjected } from './utils/moduleInjected';\nexport { eveConversationHook, eveIntegration } from './eve';\nexport { getInstrumentedModuleNames } from './orchestrion/config';\nexport {\n  fastifyIntegration,\n  // oxlint-disable-next-line typescript/no-deprecated\n  setupFastifyErrorHandler,\n} from './integrations/fastify';\n\n/**\n * @deprecated This is a temporary export to avoid breaking changes. It will be removed in the next major version.\n */\nexport const attachHapiErrorHandler = _attachHapiErrorHandler;\n\n// Integrations\nexport { prismaIntegration } from './integrations/prisma';\nexport { amqplibIntegration } from './integrations/amqplib';\nexport { anthropicAIIntegration } from './integrations/anthropic';\nexport { awsIntegration } from './integrations/aws-sdk';\nexport { dataloaderIntegration } from './integrations/dataloader';\nexport { genericPoolIntegration } from './integrations/generic-pool';\nexport { googleGenAIIntegration } from './integrations/google-genai';\nexport { graphqlIntegration } from './integrations/graphql';\nexport { hapiIntegration } from './integrations/hapi';\nexport { koaIntegration } from './integrations/koa';\nexport { redisIntegration } from './integrations/redis';\nexport { kafkaIntegration } from './integrations/kafkajs';\nexport { knexIntegration } from './integrations/knex';\nexport { langChainIntegration } from './integrations/langchain';\nexport { langGraphIntegration } from './integrations/langgraph';\nexport { createFlueInstrumentation } from './ai/flue';\nexport { flueIntegration } from './integrations/flue';\nexport type { FlueOptions } from './ai/flue';\nexport { mastraIntegration } from './integrations/mastra';\nexport { SentryMastraExporter } from './ai/mastra';\nexport { lruMemoizerIntegration } from './integrations/lru-memoizer';\nexport { mongoIntegration } from './integrations/mongodb';\nexport { mongooseIntegration } from './integrations/mongoose';\nexport { mistralAIIntegration } from './integrations/mistral';\nexport { groqIntegration } from './integrations/groq';\nexport { togetherAIIntegration } from './integrations/together-ai';\nexport { mysqlIntegration } from './integrations/mysql';\nexport { mysql2Integration } from './integrations/mysql2';\nexport { openAIIntegration } from './integrations/openai';\nexport { postgresIntegration } from './integrations/postgres';\nexport { postgresJsIntegration } from './integrations/postgres-js';\nexport { tediousIntegration } from './integrations/tedious';\nexport { vercelAIIntegration } from './integrations/vercel-ai';\nexport { expressIntegration } from './integrations/express';\nexport type { ExpressIntegrationOptions } from './integrations/express/types';\n/* oxlint-disable typescript/no-deprecated -- deprecated Express error-handler exports, kept until the next major */\nexport { expressErrorHandler, setupExpressErrorHandler } from './integrations/express/error-handler';\n/* oxlint-enable typescript/no-deprecated */\nexport { firebaseIntegration } from './integrations/firebase';\n\nexport { getTracingIntegrations, getErrorIntegrations } from './integrations';\n"],"names":["_attachHapiErrorHandler"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0BO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,sBAAA,CAAA,CAAA,CAAyBA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../src/index.ts"],"sourcesContent":["export * from './exports';\n\n// Exports using diagnostics channels\nexport { detectOrchestrionSetup } from './orchestrion/detect';\n// oxlint-disable-next-line typescript/no-deprecated -- re-exported so the deprecated `setupKoaErrorHandler` can delegate\nexport { attachKoaErrorHandler } from './integrations/koa/koa-error-handler';\nimport { attachHapiErrorHandler as _attachHapiErrorHandler } from './integrations/hapi/hapi-error-handler';\nexport { bindTracingChannelToSpan } from './tracing-channel';\nexport type { TracingChannelPayloadWithSpan } from './tracing-channel';\nexport type { InstrumentationConfig } from './orchestrion/apmTypes';\n// Runtime target of the bundler-injected module snippet. The snippet imports it\n// from this entry alongside the module's subscriber factory (see\n// `orchestrion/bundler/moduleInjectedTransform.ts`); it is a plain runtime\n// helper with no orchestrion build-time dependency.\nexport { orchestrionModuleInjected } from './utils/moduleInjected';\nexport {\n  subscribe as subscribeDiagnosticsChannel,\n  tracingChannel as diagnosticsTracingChannel,\n} from './utils/diagnosticsChannel';\nexport { eveConversationHook, eveIntegration } from './eve';\nexport { getInstrumentedModuleNames } from './orchestrion/config';\nexport {\n  fastifyIntegration,\n  // oxlint-disable-next-line typescript/no-deprecated\n  setupFastifyErrorHandler,\n} from './integrations/fastify';\n\n/**\n * @deprecated This is a temporary export to avoid breaking changes. It will be removed in the next major version.\n */\nexport const attachHapiErrorHandler = _attachHapiErrorHandler;\n\n// Integrations\nexport { prismaIntegration } from './integrations/prisma';\nexport { amqplibIntegration } from './integrations/amqplib';\nexport { anthropicAIIntegration } from './integrations/anthropic';\nexport { awsIntegration } from './integrations/aws-sdk';\nexport { dataloaderIntegration } from './integrations/dataloader';\nexport { genericPoolIntegration } from './integrations/generic-pool';\nexport { googleGenAIIntegration } from './integrations/google-genai';\nexport { graphqlIntegration } from './integrations/graphql';\nexport { hapiIntegration } from './integrations/hapi';\nexport { koaIntegration } from './integrations/koa';\nexport { redisIntegration } from './integrations/redis';\nexport { kafkaIntegration } from './integrations/kafkajs';\nexport { knexIntegration } from './integrations/knex';\nexport { langChainIntegration } from './integrations/langchain';\nexport { langGraphIntegration } from './integrations/langgraph';\nexport { createFlueInstrumentation } from './ai/flue';\nexport { flueIntegration } from './integrations/flue';\nexport type { FlueOptions } from './ai/flue';\nexport { mastraIntegration } from './integrations/mastra';\nexport { mcpServerIntegration } from './integrations/mcp-server';\nexport { SentryMastraExporter } from './ai/mastra';\nexport { lruMemoizerIntegration } from './integrations/lru-memoizer';\nexport { mongoIntegration } from './integrations/mongodb';\nexport { mongooseIntegration } from './integrations/mongoose';\nexport { mistralAIIntegration } from './integrations/mistral';\nexport { groqIntegration } from './integrations/groq';\nexport { togetherAIIntegration } from './integrations/together-ai';\nexport { typesafeIntegration } from './integrations/typesafe';\nexport { mysqlIntegration } from './integrations/mysql';\nexport { mysql2Integration } from './integrations/mysql2';\nexport { openAIIntegration } from './integrations/openai';\nexport { postgresIntegration } from './integrations/postgres';\nexport { postgresJsIntegration } from './integrations/postgres-js';\nexport { tediousIntegration } from './integrations/tedious';\nexport { vercelAIIntegration } from './integrations/vercel-ai';\nexport { expressIntegration } from './integrations/express';\nexport type { ExpressIntegrationOptions } from './integrations/express/types';\n/* oxlint-disable typescript/no-deprecated -- deprecated Express error-handler exports, kept until the next major */\nexport { expressErrorHandler, setupExpressErrorHandler } from './integrations/express/error-handler';\n/* oxlint-enable typescript/no-deprecated */\nexport { firebaseIntegration } from './integrations/firebase';\n\nexport { getTracingIntegrations, getErrorIntegrations } from './integrations';\n"],"names":["_attachHapiErrorHandler"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,sBAAA,CAAA,CAAA,CAAyBA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA,CAAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/index.no-diagnostic-channels.js

@@ -7,7 +7,8 @@ const index$7 = require('./ai/openai/index.js');
 const index$3 = require('./ai/anthropic-ai/index.js');
 const index$5 = require('./ai/google-genai/index.js');
 const index$6 = require('./ai/mistral/index.js');
-const index$8 = require('./ai/workers-ai/index.js');
+const index$8 = require('./ai/typesafe/index.js');
+const index$9 = require('./ai/workers-ai/index.js');
 const index$2 = require('./ai/langchain/index.js');
 const index$4 = require('./ai/langgraph/index.js');
 const index = require('./ai/mastra/index.js');
@@ -26,7 +27,8 @@ exports.instrumentOpenAiClient = index$7.instrumentOpenAiClient;
 exports.instrumentAnthropicAiClient = index$3.instrumentAnthropicAiClient;
 exports.instrumentGoogleGenAIClient = index$5.instrumentGoogleGenAIClient;
 exports.instrumentMistralAiClient = index$6.instrumentMistralAiClient;
-exports.instrumentWorkersAiClient = index$8.instrumentWorkersAiClient;
+exports.instrumentTypeSafeClient = index$8.instrumentTypeSafeClient;
+exports.instrumentWorkersAiClient = index$9.instrumentWorkersAiClient;
 exports.createLangChainCallbackHandler = index$2.createLangChainCallbackHandler;
 exports.instrumentCreateReactAgent = index$4.instrumentCreateReactAgent;
 exports.instrumentStateGraph = index$4.instrumentStateGraph;

package/build/cjs/index.no-diagnostic-channels.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.no-diagnostic-channels.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.no-diagnostic-channels.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/integrations/amqplib.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const diagnosticsChannel = require('node:diagnostics_channel');
+const diagnosticsChannel = require('../utils/diagnosticsChannel.js');
 const core = require('@sentry/core');
 const attributes = require('@sentry/conventions/attributes');
 const op = require('@sentry/conventions/op');
@@ -9,19 +9,6 @@ const instrumentation = require('../orchestrion/instrumentation.js');
 const channels = require('../orchestrion/channels.js');
 const tracingChannel = require('../tracing-channel.js');
 
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
-  if (e) {
-    for (const k in e) {
-      n[k] = e[k];
-    }
-  }
-  n.default = e;
-  return n;
-}
-
-const diagnosticsChannel__namespace = /*#__PURE__*/_interopNamespaceDefault(diagnosticsChannel);
-
 const INTEGRATION_NAME = "Amqplib";
 const PUBLISHER_ORIGIN = "auto.amqplib.publisher";
 const CONSUMER_ORIGIN = "auto.amqplib.consumer";
@@ -65,7 +52,7 @@ function instrumentAmqplib() {
   subscribeSettle();
 }
 function subscribePublish() {
-  tracingChannel.bindTracingChannelToSpan(diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_PUBLISH), (data) => {
+  tracingChannel.bindTracingChannelToSpan(diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_PUBLISH), (data) => {
     if (data.self?.[CHANNEL_IS_CONFIRM_PUBLISHING]) {
       return void 0;
     }
@@ -73,7 +60,7 @@ function subscribePublish() {
   });
 }
 function subscribeConfirmPublish() {
-  const channel = diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_CONFIRM_PUBLISH);
+  const channel = diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_CONFIRM_PUBLISH);
   tracingChannel.bindTracingChannelToSpan(channel, (data) => {
     if (data.self) {
       data.self[CHANNEL_IS_CONFIRM_PUBLISHING] = true;
@@ -88,7 +75,7 @@ function subscribeConfirmPublish() {
   });
 }
 function subscribeConsume() {
-  const channel = diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_CONSUME);
+  const channel = diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_CONSUME);
   channel.start.subscribe(NOOP);
   channel.asyncEnd.subscribe((message) => {
     const data = message;
@@ -107,7 +94,7 @@ function subscribeConsume() {
 }
 function subscribeDispatch() {
   tracingChannel.bindTracingChannelToSpan(
-    diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_DISPATCH),
+    diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_DISPATCH),
     (data) => {
       const channel = data.self;
       const fields = data.arguments[0];
@@ -141,16 +128,16 @@ function subscribeDispatch() {
   );
 }
 function subscribeSettle() {
-  diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_ACK).start.subscribe((message) => handleAck(message, false, END_OP.Ack));
-  diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_NACK).start.subscribe((message) => handleAck(message, true, END_OP.Nack));
-  diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_REJECT).start.subscribe((message) => handleAck(message, true, END_OP.Reject));
-  diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_ACK_ALL).start.subscribe((message) => {
+  diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_ACK).start.subscribe((message) => handleAck(message, false, END_OP.Ack));
+  diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_NACK).start.subscribe((message) => handleAck(message, true, END_OP.Nack));
+  diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_REJECT).start.subscribe((message) => handleAck(message, true, END_OP.Reject));
+  diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_ACK_ALL).start.subscribe((message) => {
     const data = message;
     if (data.self) {
       endAllSpansOnChannel(data.self, false, END_OP.AckAll, void 0);
     }
   });
-  diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_NACK_ALL).start.subscribe((message) => {
+  diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_NACK_ALL).start.subscribe((message) => {
     const data = message;
     if (data.self) {
       endAllSpansOnChannel(data.self, true, END_OP.NackAll, data.arguments[0]);
@@ -158,7 +145,7 @@ function subscribeSettle() {
   });
 }
 function subscribeConnect() {
-  const channel = diagnosticsChannel__namespace.tracingChannel(channels.CHANNELS.AMQPLIB_CONNECT);
+  const channel = diagnosticsChannel.tracingChannel(channels.CHANNELS.AMQPLIB_CONNECT);
   channel.start.subscribe(NOOP);
   channel.asyncEnd.subscribe((message) => {
     const data = message;