@drarzter/kafka-client 0.6.7 → 0.6.9

package/dist/core.mjs

@@ -15,7 +15,7 @@ import {
   getEnvelopeContext,
   runWithEnvelopeContext,
   topic
-} from "./chunk-ISYOEX4W.mjs";
+} from "./chunk-4526Y4PV.mjs";
 import "./chunk-EQQGB2QZ.mjs";
 export {
   HEADER_CORRELATION_ID,

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 export { KafkaClient, KafkaProcessingError, KafkaRetryExhaustedError, KafkaValidationError } from './core.mjs';
-import { T as TopicMapConstraint, C as ClientId, G as GroupId, K as KafkaInstrumentation, a as KafkaClientOptions, S as SchemaLike, b as ConsumerOptions, c as TopicDescriptor, I as IKafkaClient, d as KafkaHealthResult } from './types-CqjRm-Cd.mjs';
-export { B as BatchMessageItem, e as BatchMeta, f as BeforeConsumeResult, g as ConsumerHandle, h as ConsumerInterceptor, D as DeduplicationOptions, i as DlqReason, E as EnvelopeHeaderOptions, j as EventEnvelope, H as HEADER_CORRELATION_ID, k as HEADER_EVENT_ID, l as HEADER_LAMPORT_CLOCK, m as HEADER_SCHEMA_VERSION, n as HEADER_TIMESTAMP, o as HEADER_TRACEPARENT, p as InferSchema, q as KafkaLogger, r as KafkaMetrics, M as MessageHeaders, s as MessageLostContext, R as RetryOptions, t as SchemaParseContext, u as SendOptions, v as SubscribeRetryOptions, w as TTopicMessageMap, x as TopicsFrom, y as TransactionContext, z as buildEnvelopeHeaders, A as decodeHeaders, F as extractEnvelope, J as getEnvelopeContext, L as runWithEnvelopeContext, N as topic } from './types-CqjRm-Cd.mjs';
+import { T as TopicMapConstraint, C as ClientId, G as GroupId, K as KafkaInstrumentation, a as KafkaClientOptions, S as SchemaLike, b as ConsumerOptions, c as TopicDescriptor, I as IKafkaClient, d as KafkaHealthResult } from './types-736Gj0J3.mjs';
+export { B as BatchMessageItem, e as BatchMeta, f as BeforeConsumeResult, g as ConsumerHandle, h as ConsumerInterceptor, D as DeduplicationOptions, i as DlqReason, j as DlqReplayOptions, E as EnvelopeHeaderOptions, k as EventEnvelope, H as HEADER_CORRELATION_ID, l as HEADER_EVENT_ID, m as HEADER_LAMPORT_CLOCK, n as HEADER_SCHEMA_VERSION, o as HEADER_TIMESTAMP, p as HEADER_TRACEPARENT, q as InferSchema, r as KafkaLogger, s as KafkaMetrics, M as MessageHeaders, t as MessageLostContext, R as RetryOptions, u as SchemaParseContext, v as SendOptions, w as SubscribeRetryOptions, x as TTopicMessageMap, y as TopicsFrom, z as TransactionContext, A as buildEnvelopeHeaders, F as decodeHeaders, J as extractEnvelope, L as getEnvelopeContext, N as runWithEnvelopeContext, O as topic } from './types-736Gj0J3.mjs';
 import { DynamicModule, OnModuleInit } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from '@nestjs/core';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { KafkaClient, KafkaProcessingError, KafkaRetryExhaustedError, KafkaValidationError } from './core.js';
-import { T as TopicMapConstraint, C as ClientId, G as GroupId, K as KafkaInstrumentation, a as KafkaClientOptions, S as SchemaLike, b as ConsumerOptions, c as TopicDescriptor, I as IKafkaClient, d as KafkaHealthResult } from './types-CqjRm-Cd.js';
-export { B as BatchMessageItem, e as BatchMeta, f as BeforeConsumeResult, g as ConsumerHandle, h as ConsumerInterceptor, D as DeduplicationOptions, i as DlqReason, E as EnvelopeHeaderOptions, j as EventEnvelope, H as HEADER_CORRELATION_ID, k as HEADER_EVENT_ID, l as HEADER_LAMPORT_CLOCK, m as HEADER_SCHEMA_VERSION, n as HEADER_TIMESTAMP, o as HEADER_TRACEPARENT, p as InferSchema, q as KafkaLogger, r as KafkaMetrics, M as MessageHeaders, s as MessageLostContext, R as RetryOptions, t as SchemaParseContext, u as SendOptions, v as SubscribeRetryOptions, w as TTopicMessageMap, x as TopicsFrom, y as TransactionContext, z as buildEnvelopeHeaders, A as decodeHeaders, F as extractEnvelope, J as getEnvelopeContext, L as runWithEnvelopeContext, N as topic } from './types-CqjRm-Cd.js';
+import { T as TopicMapConstraint, C as ClientId, G as GroupId, K as KafkaInstrumentation, a as KafkaClientOptions, S as SchemaLike, b as ConsumerOptions, c as TopicDescriptor, I as IKafkaClient, d as KafkaHealthResult } from './types-736Gj0J3.js';
+export { B as BatchMessageItem, e as BatchMeta, f as BeforeConsumeResult, g as ConsumerHandle, h as ConsumerInterceptor, D as DeduplicationOptions, i as DlqReason, j as DlqReplayOptions, E as EnvelopeHeaderOptions, k as EventEnvelope, H as HEADER_CORRELATION_ID, l as HEADER_EVENT_ID, m as HEADER_LAMPORT_CLOCK, n as HEADER_SCHEMA_VERSION, o as HEADER_TIMESTAMP, p as HEADER_TRACEPARENT, q as InferSchema, r as KafkaLogger, s as KafkaMetrics, M as MessageHeaders, t as MessageLostContext, R as RetryOptions, u as SchemaParseContext, v as SendOptions, w as SubscribeRetryOptions, x as TTopicMessageMap, y as TopicsFrom, z as TransactionContext, A as buildEnvelopeHeaders, F as decodeHeaders, J as extractEnvelope, L as getEnvelopeContext, N as runWithEnvelopeContext, O as topic } from './types-736Gj0J3.js';
 import { DynamicModule, OnModuleInit } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from '@nestjs/core';
 

package/dist/index.js

@@ -556,6 +556,17 @@ async function executeWithRetry(fn, ctx, deps) {
       deps.instrumentation
     );
     if (!error) {
+      if (deps.eosCommitOnSuccess) {
+        try {
+          await deps.eosCommitOnSuccess();
+        } catch (commitErr) {
+          deps.logger.error(
+            `EOS offset commit failed after successful handler \u2014 message will be redelivered:`,
+            toError(commitErr).stack
+          );
+          return;
+        }
+      }
       for (const env of envelopes) deps.onMessage?.(env);
       return;
     }
@@ -574,16 +585,28 @@ async function executeWithRetry(fn, ctx, deps) {
     if (retryTopics && retry) {
       const cap = Math.min(backoffMs, maxBackoffMs);
       const delay = Math.floor(Math.random() * cap);
-      await sendToRetryTopic(
-        topic2,
-        rawMessages,
-        1,
-        retry.maxRetries,
-        delay,
-        isBatch ? envelopes.map((e) => e.headers) : envelopes[0]?.headers ?? {},
-        deps
-      );
-      deps.onRetry?.(envelopes[0], 1, retry.maxRetries);
+      if (deps.eosRouteToRetry) {
+        try {
+          await deps.eosRouteToRetry(rawMessages, envelopes, delay);
+          deps.onRetry?.(envelopes[0], 1, retry.maxRetries);
+        } catch (txErr) {
+          deps.logger.error(
+            `EOS routing to retry topic failed \u2014 message will be redelivered:`,
+            toError(txErr).stack
+          );
+        }
+      } else {
+        await sendToRetryTopic(
+          topic2,
+          rawMessages,
+          1,
+          retry.maxRetries,
+          delay,
+          isBatch ? envelopes.map((e) => e.headers) : envelopes[0]?.headers ?? {},
+          deps
+        );
+        deps.onRetry?.(envelopes[0], 1, retry.maxRetries);
+      }
     } else if (isLastAttempt) {
       if (dlq) {
         for (let i = 0; i < rawMessages.length; i++) {
@@ -683,6 +706,43 @@ async function handleEachMessage(payload, opts, deps) {
     timeoutMs,
     wrapWithTimeout
   } = opts;
+  const eos = opts.eosMainContext;
+  const nextOffsetStr = (parseInt(message.offset, 10) + 1).toString();
+  const commitOffset = eos ? async () => {
+    await eos.consumer.commitOffsets([
+      { topic: topic2, partition, offset: nextOffsetStr }
+    ]);
+  } : void 0;
+  const eosRouteToRetry = eos && retry ? async (rawMsgs, envelopes, delay) => {
+    const { topic: rtTopic, messages: rtMsgs } = buildRetryTopicPayload(
+      topic2,
+      rawMsgs,
+      1,
+      retry.maxRetries,
+      delay,
+      envelopes[0]?.headers ?? {}
+    );
+    const tx = await eos.txProducer.transaction();
+    try {
+      await tx.send({ topic: rtTopic, messages: rtMsgs });
+      await tx.sendOffsets({
+        consumer: eos.consumer,
+        topics: [
+          {
+            topic: topic2,
+            partitions: [{ partition, offset: nextOffsetStr }]
+          }
+        ]
+      });
+      await tx.commit();
+    } catch (txErr) {
+      try {
+        await tx.abort();
+      } catch {
+      }
+      throw txErr;
+    }
+  } : void 0;
   const envelope = await parseSingleMessage(
     message,
     topic2,
@@ -692,7 +752,10 @@ async function handleEachMessage(payload, opts, deps) {
     dlq,
     deps
   );
-  if (envelope === null) return;
+  if (envelope === null) {
+    await commitOffset?.();
+    return;
+  }
   if (opts.deduplication) {
     const isDuplicate = await applyDeduplication(
       envelope,
@@ -701,7 +764,10 @@ async function handleEachMessage(payload, opts, deps) {
       dlq,
       deps
     );
-    if (isDuplicate) return;
+    if (isDuplicate) {
+      await commitOffset?.();
+      return;
+    }
   }
   await executeWithRetry(
     () => {
@@ -722,7 +788,7 @@ async function handleEachMessage(payload, opts, deps) {
       retry,
       retryTopics
     },
-    deps
+    { ...deps, eosRouteToRetry, eosCommitOnSuccess: commitOffset }
   );
 }
 async function handleEachBatch(payload, opts, deps) {
@@ -737,6 +803,50 @@ async function handleEachBatch(payload, opts, deps) {
     timeoutMs,
     wrapWithTimeout
   } = opts;
+  const eos = opts.eosMainContext;
+  const lastRawOffset = batch.messages.length > 0 ? batch.messages[batch.messages.length - 1].offset : void 0;
+  const batchNextOffsetStr = lastRawOffset ? (parseInt(lastRawOffset, 10) + 1).toString() : void 0;
+  const commitBatchOffset = eos && batchNextOffsetStr ? async () => {
+    await eos.consumer.commitOffsets([
+      {
+        topic: batch.topic,
+        partition: batch.partition,
+        offset: batchNextOffsetStr
+      }
+    ]);
+  } : void 0;
+  const eosRouteToRetry = eos && retry && batchNextOffsetStr ? async (rawMsgs, envelopes2, delay) => {
+    const { topic: rtTopic, messages: rtMsgs } = buildRetryTopicPayload(
+      batch.topic,
+      rawMsgs,
+      1,
+      retry.maxRetries,
+      delay,
+      envelopes2.map((e) => e.headers)
+    );
+    const tx = await eos.txProducer.transaction();
+    try {
+      await tx.send({ topic: rtTopic, messages: rtMsgs });
+      await tx.sendOffsets({
+        consumer: eos.consumer,
+        topics: [
+          {
+            topic: batch.topic,
+            partitions: [
+              { partition: batch.partition, offset: batchNextOffsetStr }
+            ]
+          }
+        ]
+      });
+      await tx.commit();
+    } catch (txErr) {
+      try {
+        await tx.abort();
+      } catch {
+      }
+      throw txErr;
+    }
+  } : void 0;
   const envelopes = [];
   const rawMessages = [];
   for (const message of batch.messages) {
@@ -764,7 +874,10 @@ async function handleEachBatch(payload, opts, deps) {
     envelopes.push(envelope);
     rawMessages.push(message.value.toString());
   }
-  if (envelopes.length === 0) return;
+  if (envelopes.length === 0) {
+    await commitBatchOffset?.();
+    return;
+  }
   const meta = {
     partition: batch.partition,
     highWatermark: batch.highWatermark,
@@ -786,7 +899,7 @@ async function handleEachBatch(payload, opts, deps) {
       isBatch: true,
       retryTopics
     },
-    deps
+    { ...deps, eosRouteToRetry, eosCommitOnSuccess: commitBatchOffset }
   );
 }
 
@@ -1067,7 +1180,7 @@ async function startRetryTopicConsumers(originalTopics, originalGroupId, handleM
 // src/client/kafka.client/index.ts
 var { Kafka: KafkaClass, logLevel: KafkaLogLevel } = import_kafka_javascript.KafkaJS;
 var _activeTransactionalIds = /* @__PURE__ */ new Set();
-var KafkaClient = class {
+var KafkaClient = class _KafkaClient {
   kafka;
   producer;
   txProducer;
@@ -1094,13 +1207,8 @@ var KafkaClient = class {
   onRebalance;
   /** Transactional producer ID — configurable via `KafkaClientOptions.transactionalId`. */
   txId;
-  /** Internal event counters exposed via `getMetrics()`. */
-  _metrics = {
-    processedCount: 0,
-    retryCount: 0,
-    dlqCount: 0,
-    dedupCount: 0
-  };
+  /** Per-topic event counters, lazily created on first event. Aggregated by `getMetrics()`. */
+  _topicMetrics = /* @__PURE__ */ new Map();
   /** Monotonically increasing Lamport clock stamped on every outgoing message. */
   _lamportClock = 0;
   /** Per-groupId deduplication state: `"topic:partition"` → last processed clock. */
@@ -1244,13 +1352,20 @@ var KafkaClient = class {
         "retryTopics requires retry to be configured \u2014 set retry.maxRetries to enable the retry topic chain"
       );
     }
-    const { consumer, schemaMap, topicNames, gid, dlq, interceptors, retry } = await this.setupConsumer(topics, "eachMessage", options);
+    const setupOptions = options.retryTopics ? { ...options, autoCommit: false } : options;
+    const { consumer, schemaMap, topicNames, gid, dlq, interceptors, retry } = await this.setupConsumer(topics, "eachMessage", setupOptions);
     const deps = this.messageDeps;
     const timeoutMs = options.handlerTimeoutMs;
     const deduplication = this.resolveDeduplicationContext(
       gid,
       options.deduplication
     );
+    let eosMainContext;
+    if (options.retryTopics && retry) {
+      const mainTxId = `${gid}-main-tx`;
+      const txProducer = await this.createRetryTxProducer(mainTxId);
+      eosMainContext = { txProducer, consumer };
+    }
     await consumer.run({
       eachMessage: (payload) => this.trackInFlight(
         () => handleEachMessage(
@@ -1264,7 +1379,8 @@ var KafkaClient = class {
             retryTopics: options.retryTopics,
             timeoutMs,
             wrapWithTimeout: this.wrapWithTimeoutWarning.bind(this),
-            deduplication
+            deduplication,
+            eosMainContext
           },
           deps
         )
@@ -1296,18 +1412,26 @@ var KafkaClient = class {
         "retryTopics requires retry to be configured \u2014 set retry.maxRetries to enable the retry topic chain"
       );
     }
-    if (options.autoCommit !== false) {
+    if (options.retryTopics) {
+    } else if (options.autoCommit !== false) {
       this.logger.debug?.(
         `startBatchConsumer: autoCommit is enabled (default true). If your handler calls resolveOffset() or commitOffsetsIfNecessary(), set autoCommit: false to avoid offset conflicts.`
       );
     }
-    const { consumer, schemaMap, topicNames, gid, dlq, interceptors, retry } = await this.setupConsumer(topics, "eachBatch", options);
+    const setupOptions = options.retryTopics ? { ...options, autoCommit: false } : options;
+    const { consumer, schemaMap, topicNames, gid, dlq, interceptors, retry } = await this.setupConsumer(topics, "eachBatch", setupOptions);
     const deps = this.messageDeps;
     const timeoutMs = options.handlerTimeoutMs;
     const deduplication = this.resolveDeduplicationContext(
       gid,
       options.deduplication
     );
+    let eosMainContext;
+    if (options.retryTopics && retry) {
+      const mainTxId = `${gid}-main-tx`;
+      const txProducer = await this.createRetryTxProducer(mainTxId);
+      eosMainContext = { txProducer, consumer };
+    }
     await consumer.run({
       eachBatch: (payload) => this.trackInFlight(
         () => handleEachBatch(
@@ -1321,7 +1445,8 @@ var KafkaClient = class {
             retryTopics: options.retryTopics,
             timeoutMs,
             wrapWithTimeout: this.wrapWithTimeoutWarning.bind(this),
-            deduplication
+            deduplication,
+            eosMainContext
           },
           deps
         )
@@ -1378,6 +1503,18 @@ var KafkaClient = class {
       this.consumerCreationOptions.delete(groupId);
       this.dedupStates.delete(groupId);
       this.logger.log(`Consumer disconnected: group "${groupId}"`);
+      const mainTxId = `${groupId}-main-tx`;
+      const mainTxProducer = this.retryTxProducers.get(mainTxId);
+      if (mainTxProducer) {
+        await mainTxProducer.disconnect().catch(
+          (e) => this.logger.warn(
+            `Error disconnecting main tx producer "${mainTxId}":`,
+            toError(e).message
+          )
+        );
+        _activeTransactionalIds.delete(mainTxId);
+        this.retryTxProducers.delete(mainTxId);
+      }
       const companions = this.companionGroupIds.get(groupId) ?? [];
       for (const cGroupId of companions) {
         const cConsumer = this.consumers.get(cGroupId);
@@ -1428,6 +1565,144 @@ var KafkaClient = class {
       this.logger.log("All consumers disconnected");
     }
   }
+  pauseConsumer(groupId, assignments) {
+    const gid = groupId ?? this.defaultGroupId;
+    const consumer = this.consumers.get(gid);
+    if (!consumer) {
+      this.logger.warn(`pauseConsumer: no active consumer for group "${gid}"`);
+      return;
+    }
+    consumer.pause(
+      assignments.flatMap(
+        ({ topic: topic2, partitions }) => partitions.map((p) => ({ topic: topic2, partitions: [p] }))
+      )
+    );
+  }
+  resumeConsumer(groupId, assignments) {
+    const gid = groupId ?? this.defaultGroupId;
+    const consumer = this.consumers.get(gid);
+    if (!consumer) {
+      this.logger.warn(`resumeConsumer: no active consumer for group "${gid}"`);
+      return;
+    }
+    consumer.resume(
+      assignments.flatMap(
+        ({ topic: topic2, partitions }) => partitions.map((p) => ({ topic: topic2, partitions: [p] }))
+      )
+    );
+  }
+  /** DLQ header keys added by `sendToDlq` — stripped before re-publishing. */
+  static DLQ_HEADER_KEYS = /* @__PURE__ */ new Set([
+    "x-dlq-original-topic",
+    "x-dlq-failed-at",
+    "x-dlq-error-message",
+    "x-dlq-error-stack",
+    "x-dlq-attempt-count"
+  ]);
+  async replayDlq(topic2, options = {}) {
+    const dlqTopic = `${topic2}.dlq`;
+    await this.ensureAdminConnected();
+    const partitionOffsets = await this.admin.fetchTopicOffsets(dlqTopic);
+    const activePartitions = partitionOffsets.filter(
+      (p) => parseInt(p.high, 10) > 0
+    );
+    if (activePartitions.length === 0) {
+      this.logger.log(`replayDlq: "${dlqTopic}" is empty \u2014 nothing to replay`);
+      return { replayed: 0, skipped: 0 };
+    }
+    const highWatermarks = new Map(
+      activePartitions.map(({ partition, high }) => [
+        partition,
+        parseInt(high, 10)
+      ])
+    );
+    const processedOffsets = /* @__PURE__ */ new Map();
+    let replayed = 0;
+    let skipped = 0;
+    const tempGroupId = `${dlqTopic}-replay-${Date.now()}`;
+    await new Promise((resolve, reject) => {
+      const consumer = getOrCreateConsumer(
+        tempGroupId,
+        true,
+        true,
+        this.consumerOpsDeps
+      );
+      const cleanup = () => {
+        consumer.disconnect().catch(() => {
+        }).finally(() => {
+          this.consumers.delete(tempGroupId);
+          this.runningConsumers.delete(tempGroupId);
+          this.consumerCreationOptions.delete(tempGroupId);
+        });
+      };
+      consumer.connect().then(
+        () => subscribeWithRetry(consumer, [dlqTopic], this.logger)
+      ).then(
+        () => consumer.run({
+          eachMessage: async ({ partition, message }) => {
+            if (!message.value) return;
+            const offset = parseInt(message.offset, 10);
+            processedOffsets.set(partition, offset);
+            const headers = decodeHeaders(message.headers);
+            const targetTopic = options.targetTopic ?? headers["x-dlq-original-topic"];
+            const originalHeaders = Object.fromEntries(
+              Object.entries(headers).filter(
+                ([k]) => !_KafkaClient.DLQ_HEADER_KEYS.has(k)
+              )
+            );
+            const value = message.value.toString();
+            const shouldProcess = !options.filter || options.filter(headers, value);
+            if (!targetTopic || !shouldProcess) {
+              skipped++;
+            } else if (options.dryRun) {
+              this.logger.log(
+                `[DLQ replay dry-run] Would replay to "${targetTopic}"`
+              );
+              replayed++;
+            } else {
+              await this.producer.send({
+                topic: targetTopic,
+                messages: [{ value, headers: originalHeaders }]
+              });
+              replayed++;
+            }
+            const allDone = Array.from(highWatermarks.entries()).every(
+              ([p, hwm]) => (processedOffsets.get(p) ?? -1) >= hwm - 1
+            );
+            if (allDone) {
+              cleanup();
+              resolve();
+            }
+          }
+        })
+      ).catch((err) => {
+        cleanup();
+        reject(err);
+      });
+    });
+    this.logger.log(
+      `replayDlq: replayed ${replayed}, skipped ${skipped} from "${dlqTopic}"`
+    );
+    return { replayed, skipped };
+  }
+  async resetOffsets(groupId, topic2, position) {
+    const gid = groupId ?? this.defaultGroupId;
+    if (this.runningConsumers.has(gid)) {
+      throw new Error(
+        `resetOffsets: consumer group "${gid}" is still running. Call stopConsumer("${gid}") before resetting offsets.`
+      );
+    }
+    await this.ensureAdminConnected();
+    const partitionOffsets = await this.admin.fetchTopicOffsets(topic2);
+    const partitions = partitionOffsets.map(({ partition, low, high }) => ({
+      partition,
+      offset: position === "earliest" ? low : high
+    }));
+    await this.admin.setOffsets({ groupId: gid, topic: topic2, partitions });
+    this.logger.log(
+      `Offsets reset to ${position} for group "${gid}" on topic "${topic2}"`
+    );
+  }
   /**
    * Query consumer group lag per partition.
    * Lag = broker high-watermark − last committed offset.
@@ -1478,14 +1753,31 @@ var KafkaClient = class {
   getClientId() {
     return this.clientId;
   }
-  getMetrics() {
-    return { ...this._metrics };
+  getMetrics(topic2) {
+    if (topic2 !== void 0) {
+      const m = this._topicMetrics.get(topic2);
+      return m ? { ...m } : { processedCount: 0, retryCount: 0, dlqCount: 0, dedupCount: 0 };
+    }
+    const agg = {
+      processedCount: 0,
+      retryCount: 0,
+      dlqCount: 0,
+      dedupCount: 0
+    };
+    for (const m of this._topicMetrics.values()) {
+      agg.processedCount += m.processedCount;
+      agg.retryCount += m.retryCount;
+      agg.dlqCount += m.dlqCount;
+      agg.dedupCount += m.dedupCount;
+    }
+    return agg;
   }
-  resetMetrics() {
-    this._metrics.processedCount = 0;
-    this._metrics.retryCount = 0;
-    this._metrics.dlqCount = 0;
-    this._metrics.dedupCount = 0;
+  resetMetrics(topic2) {
+    if (topic2 !== void 0) {
+      this._topicMetrics.delete(topic2);
+      return;
+    }
+    this._topicMetrics.clear();
   }
   /** Gracefully disconnect producer, all consumers, and admin. */
   async disconnect(drainTimeoutMs = 3e4) {
@@ -1595,26 +1887,34 @@ var KafkaClient = class {
       }
     }
   }
+  metricsFor(topic2) {
+    let m = this._topicMetrics.get(topic2);
+    if (!m) {
+      m = { processedCount: 0, retryCount: 0, dlqCount: 0, dedupCount: 0 };
+      this._topicMetrics.set(topic2, m);
+    }
+    return m;
+  }
   notifyRetry(envelope, attempt, maxRetries) {
-    this._metrics.retryCount++;
+    this.metricsFor(envelope.topic).retryCount++;
     for (const inst of this.instrumentation) {
       inst.onRetry?.(envelope, attempt, maxRetries);
     }
   }
   notifyDlq(envelope, reason) {
-    this._metrics.dlqCount++;
+    this.metricsFor(envelope.topic).dlqCount++;
     for (const inst of this.instrumentation) {
       inst.onDlq?.(envelope, reason);
     }
   }
   notifyDuplicate(envelope, strategy) {
-    this._metrics.dedupCount++;
+    this.metricsFor(envelope.topic).dedupCount++;
     for (const inst of this.instrumentation) {
       inst.onDuplicate?.(envelope, strategy);
     }
   }
   notifyMessage(envelope) {
-    this._metrics.processedCount++;
+    this.metricsFor(envelope.topic).processedCount++;
     for (const inst of this.instrumentation) {
       inst.onMessage?.(envelope);
     }