@palmetto/pubsub 2.2.6 → 2.2.8

package/dist/bullmq/subscriber.js

@@ -14,7 +14,7 @@ const interfaces_js_1 = require("../interfaces.js");
 const connection_js_1 = require("./connection.js");
 const lazy_load_js_1 = require("../lazy-load.js");
 const create_log_error_payload_js_1 = require("../create-log-error-payload.js");
-const dd_trace_wrapper_js_1 = require("../dd-trace.wrapper.js");
+const dd_trace_api_1 = require("dd-trace-api");
 class SubscribedMessage {
     constructor(owner, worker, logger) {
         this.owner = owner;
@@ -65,7 +65,7 @@ class BullMqSubscriber {
                 context: "BullMqSubscriber",
             });
             const worker = new BullMqPackage.Worker(config.name, (job) => __awaiter(this, void 0, void 0, function* () {
-                return yield (0, dd_trace_wrapper_js_1.getTracer)().trace("pubsub.bullmq.handle", {
+                return yield dd_trace_api_1.tracer.trace("pubsub.bullmq.handle", {
                     resource: `handle ${config.name}`,
                 }, () => __awaiter(this, void 0, void 0, function* () {
                     const context = {

package/dist/main.d.ts

@@ -1,4 +1,3 @@
-export { registerDdTrace } from "./dd-trace.wrapper.js";
 export * from "./errors.js";
 export * from "./interfaces.js";
 export * from "./publisher.js";

package/dist/main.js

@@ -14,9 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerDdTrace = void 0;
-var dd_trace_wrapper_js_1 = require("./dd-trace.wrapper.js");
-Object.defineProperty(exports, "registerDdTrace", { enumerable: true, get: function () { return dd_trace_wrapper_js_1.registerDdTrace; } });
 __exportStar(require("./errors.js"), exports);
 __exportStar(require("./interfaces.js"), exports);
 __exportStar(require("./publisher.js"), exports);

package/dist/publisher.js

@@ -15,7 +15,7 @@ const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const errors_js_1 = require("./errors.js");
 const message_logger_js_1 = require("./message-logger.js");
-const dd_trace_wrapper_js_1 = require("./dd-trace.wrapper.js");
+const dd_trace_api_1 = require("dd-trace-api");
 class Publisher {
     constructor(logger, providers) {
         var _a, _b;
@@ -57,7 +57,7 @@ class Publisher {
         if (messages.length === 0) {
             return Promise.resolve();
         }
-        return (0, dd_trace_wrapper_js_1.getTracer)().trace("pubsub.publish", {
+        return dd_trace_api_1.tracer.trace("pubsub.publish", {
             resource: `publish ${config.transport} ${config.name}`,
         }, (span) => {
             return this.publishImpl(config, messages, span);
@@ -113,8 +113,10 @@ class Publisher {
                     extra: Object.assign({ transport: provider.transport, name: config.name, durationMs: duration, batchSize: messages.length }, provider.enrichPublishedMesssageLog(config)),
                 });
             });
-            span.setTag("pubsub.duration_ms", duration);
-            span.setTag("pubsub.message_count", messages.length);
+            if (span) {
+                span.setTag("pubsub.duration_ms", duration);
+                span.setTag("pubsub.message_count", messages.length);
+            }
         });
     }
     close() {

package/dist/rabbitmq/publisher.js

@@ -117,10 +117,10 @@ class RabbitMqPublisher {
                 timestamp: Date.now(),
                 persistent: true,
             };
-            const oks = yield Promise.all(messages.map((message) => sender(Buffer.from(message, "utf8"), options)));
+            const oks = yield Promise.allSettled(messages.map((message) => sender(Buffer.from(message, "utf8"), options)));
             const failedMessages = oks
                 .map((ok, index) => ({ ok, index }))
-                .filter(({ ok }) => !ok)
+                .filter(({ ok }) => ok.status === "rejected")
                 .map(({ index }) => messages[index]);
             if (failedMessages.length > 0) {
                 const allOrSome = failedMessages.length === messages.length ? "all" : "some";

package/dist/rabbitmq/subscriber.d.ts

@@ -6,12 +6,13 @@ import { RabbitMqConnection } from "./connection.js";
 declare class SubscribedMessage {
     private readonly owner;
     private readonly logger;
+    private readonly queueName;
     readonly config: RabbitQueueExchangeConfiguration;
     readonly onMessage: (s: string, context: RabbitMqMessageContext) => Promise<MessageResult> | MessageResult;
     stop?: StopSubscribe | undefined;
     channel?: ChannelWrapper;
     busy: number;
-    constructor(owner: RabbitMqSubscriber, logger: Logger, config: RabbitQueueExchangeConfiguration, onMessage: (s: string, context: RabbitMqMessageContext) => Promise<MessageResult> | MessageResult, stop?: StopSubscribe | undefined);
+    constructor(owner: RabbitMqSubscriber, logger: Logger, queueName: string, config: RabbitQueueExchangeConfiguration, onMessage: (s: string, context: RabbitMqMessageContext) => Promise<MessageResult> | MessageResult, stop?: StopSubscribe | undefined);
     stopSubscribe(): Promise<void>;
 }
 export declare class RabbitMqSubscriber implements SubscriberProvider {

package/dist/rabbitmq/subscriber.js

@@ -15,11 +15,12 @@ const errors_js_1 = require("../errors.js");
 const config_js_1 = require("./config.js");
 const connection_js_1 = require("./connection.js");
 const create_log_error_payload_js_1 = require("../create-log-error-payload.js");
-const dd_trace_wrapper_js_1 = require("../dd-trace.wrapper.js");
+const dd_trace_api_1 = require("dd-trace-api");
 class SubscribedMessage {
-    constructor(owner, logger, config, onMessage, stop) {
+    constructor(owner, logger, queueName, config, onMessage, stop) {
         this.owner = owner;
         this.logger = logger;
+        this.queueName = queueName;
         this.config = config;
         this.onMessage = onMessage;
         this.stop = stop;
@@ -34,16 +35,16 @@ class SubscribedMessage {
                 this.stop = undefined;
                 this.owner.removeSubscriber(this);
                 if (this.busy) {
-                    (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, "RabbitMq subscriber waiting for handler to finish");
-                    const start = new Date().valueOf();
+                    (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, `RabbitMq subscriber waiting for ${this.queueName} handler to finish`);
+                    const start = Date.now();
                     const waitDelay = 5;
-                    let busyCheck = 1000 / waitDelay; // wait up to a second or so
+                    let busyCheck = 5000 / waitDelay; // wait a few seconds before shutdown
                     while (this.busy && busyCheck > 0) {
                         yield new Promise((resolve) => setTimeout(resolve, waitDelay));
                         busyCheck -= waitDelay;
                     }
-                    const delay = new Date().valueOf() - start;
-                    (_d = (_c = this.logger).debug) === null || _d === void 0 ? void 0 : _d.call(_c, `RabbitMq subscriber waited ${delay}ms for handler to finish`);
+                    const delay = Date.now() - start;
+                    (_d = (_c = this.logger).debug) === null || _d === void 0 ? void 0 : _d.call(_c, `RabbitMq subscriber waited ${delay}ms for ${this.queueName} handler to finish`);
                 }
                 yield s();
             }
@@ -73,7 +74,7 @@ class RabbitMqSubscriber {
         if (subscribedMessage) {
             throw new errors_js_1.AlreadySubscribingError(queueName);
         }
-        subscribedMessage = new SubscribedMessage(this, this.logger, config, onMessage);
+        subscribedMessage = new SubscribedMessage(this, this.logger, queueName, config, onMessage);
         this.subscribers.set(queueName, subscribedMessage);
         subscribedMessage.channel = this.connection.connection.createChannel({
             setup: (channel) => __awaiter(this, void 0, void 0, function* () {
@@ -84,9 +85,9 @@ class RabbitMqSubscriber {
     }
     close() {
         return __awaiter(this, void 0, void 0, function* () {
-            for (const subscribedMessage of this.subscribers.values()) {
-                yield subscribedMessage.stopSubscribe();
-            }
+            yield Promise.all(this.subscribers
+                .values()
+                .map((subscribedMessage) => subscribedMessage.stopSubscribe()));
             this.subscribers.clear();
         });
     }
@@ -123,7 +124,7 @@ class RabbitMqSubscriber {
                 ? setupResult.dlQueueName
                 : setupResult.queueName;
             const onRabbitMessage = (msg) => __awaiter(this, void 0, void 0, function* () {
-                yield (0, dd_trace_wrapper_js_1.getTracer)().trace("pubsub.rabbit.consume", {
+                yield dd_trace_api_1.tracer.trace("pubsub.rabbit.consume", {
                     resource: `consume ${config.transport} ${queueName}`,
                 }, (span) => __awaiter(this, void 0, void 0, function* () {
                     try {
@@ -135,7 +136,7 @@ class RabbitMqSubscriber {
                             message: "Unexpected error handling RabbitMq message",
                             error: (0, create_log_error_payload_js_1.createLogErrorPayload)(err),
                         });
-                        span.setTag("error", err);
+                        span === null || span === void 0 ? void 0 : span.setTag("error", err);
                         try {
                             channel.nack(msg, undefined, true);
                         }
@@ -163,9 +164,10 @@ class RabbitMqSubscriber {
             this.logger.log(`RabbitMQ consumer started for ${queueName}`);
             // stop will cancel the subscriber
             subscribedMessage.stop = () => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
+                var _a, _b, _c, _d;
+                (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, `RabbitMQ consumer stopping for ${queueName}`);
                 yield channel.close();
-                (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, `RabbitMQ consumer stopped for ${queueName}`);
+                (_d = (_c = this.logger).debug) === null || _d === void 0 ? void 0 : _d.call(_c, `RabbitMQ consumer stopped for ${queueName}`);
             });
         });
     }
@@ -207,7 +209,7 @@ class RabbitMqSubscriber {
                 timestamp: (_d = sentDates.firstSent) === null || _d === void 0 ? void 0 : _d.valueOf(),
                 headers: {
                     [RETRIES_HEADER]: retries + 1,
-                    [RETRYSENT_HEADER]: new Date().valueOf(),
+                    [RETRYSENT_HEADER]: Date.now(),
                 },
             }));
             if (ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@palmetto/pubsub",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "main": "./dist/main.js",
   "scripts": {
     "lint": "yarn run -T eslint --fix ./src",
@@ -25,6 +25,7 @@
     "amqp-connection-manager": "^4.1.14",
     "amqplib": "^0.10.8",
     "bullmq": "^5.58.0",
+    "opentracing": "^0.14.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
@@ -41,6 +42,7 @@
     "access": "public"
   },
   "dependencies": {
+    "dd-trace-api": "^1.0.0",
     "uuid": "^11.1.0"
   },
   "peerDependencies": {

package/dist/dd-trace.wrapper.d.ts

@@ -1,75 +0,0 @@
-export interface Span {
-    /**
-     * Adds a single tag to the span.  See `addTags()` for details.
-     *
-     * @param {string} key
-     * @param {any} value
-     */
-    setTag(key: string, value: unknown): this;
-}
-interface SpanOptions {
-    /**
-     * set of key-value pairs which will be set as tags on the newly created
-     * Span. Ownership of the object is passed to the created span for
-     * efficiency reasons (the caller should not modify this object after
-     * calling startSpan).
-     */
-    tags?: {
-        [key: string]: unknown;
-    };
-}
-/**
- * The Datadog Scope Manager. This is used for context propagation.
- */
-interface Scope {
-    /**
-     * Get the current active span or null if there is none.
-     *
-     * @returns {Span} The active span.
-     */
-    active(): Span | null;
-}
-interface TraceOptions {
-    /**
-     * The resource you are tracing. The resource name must not be longer than
-     * 5000 characters.
-     */
-    resource?: string;
-    /**
-     * The type of request.
-     */
-    type?: string;
-}
-interface Tracer {
-    /**
-     * Instruments a function by automatically creating a span activated on its
-     * scope.
-     *
-     * The span will automatically be finished when one of these conditions is
-     * met:
-     *
-     * * The function returns a promise, in which case the span will finish when
-     * the promise is resolved or rejected.
-     * * The function takes a callback as its second parameter, in which case the
-     * span will finish when that callback is called.
-     * * The function doesn't accept a callback and doesn't return a promise, in
-     * which case the span will finish at the end of the function execution.
-     */
-    trace<T>(name: string, options: TraceOptions & SpanOptions, fn: (span: Span) => Promise<T>): Promise<T>;
-    /**
-     * Returns a reference to the current scope.
-     */
-    scope(): Scope;
-}
-export declare function getTracer(): Tracer;
-/**
- * Registers the dd-trace tracer instance to be used by the pubsub package.
- *
- * Usage:
- *   import trace from 'dd-trace';
- *   registerDdTrace(trace.init());
- *
- * @param tracer the tracer instance
- */
-export declare function registerDdTrace(tracer: unknown): void;
-export {};

package/dist/dd-trace.wrapper.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTracer = getTracer;
-exports.registerDdTrace = registerDdTrace;
-class NoOpSpan {
-    finish() {
-        // no-op
-    }
-    setTag(_key, _value) {
-        return this;
-    }
-}
-class NoOpScope {
-    active() {
-        return null;
-    }
-}
-class NoOpTracer {
-    constructor() {
-        this.noOpSpan = new NoOpSpan();
-        this.noOpScope = new NoOpScope();
-    }
-    trace(_name, _options, fn) {
-        return fn(this.noOpSpan);
-    }
-    scope() {
-        return this.noOpScope;
-    }
-}
-let tracerInstance = new NoOpTracer();
-function getTracer() {
-    return tracerInstance;
-}
-/**
- * Registers the dd-trace tracer instance to be used by the pubsub package.
- *
- * Usage:
- *   import trace from 'dd-trace';
- *   registerDdTrace(trace.init());
- *
- * @param tracer the tracer instance
- */
-function registerDdTrace(tracer) {
-    tracerInstance = tracer;
-}