@palmetto/pubsub 2.2.5 → 2.2.6

package/README.md

@@ -114,6 +114,10 @@ yarn add @palmetto/pubsub zod
 
 1. Register with dd-trace for improved trace logs
 
+   Datadog trace logs will include publisher and subscriber actions using the queue/job/exchange name.
+
+   ![alt text](dd-trace-sample.png)
+
    ```ts
    import tracer from "dd-trace";
    import { registerDdTrace } from "@palmetto/pubsub";

package/dist/bullmq/publisher.js

@@ -38,18 +38,23 @@ class BullMqPublisher {
     }
     publish(config, messages) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const queue = yield this.getQueue(config);
-            yield Promise.all(messages.map((message) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, `Publishing message to ${queue.name} - ${message}`);
-                yield queue.add(config.job || connection_js_1.BULLMQ_DEFAULTJOB, message, {
+            (_b = (_a = this.logger).debug) === null || _b === void 0 ? void 0 : _b.call(_a, `Publishing ${messages.length} messages to ${queue.name}`);
+            const job = {
+                name: config.job || connection_js_1.BULLMQ_DEFAULTJOB,
+                opts: {
                     attempts: config.retries,
                     backoff: {
                         type: "fixed",
                         delay: config.retryDelay || 30000,
                     },
-                });
-            })));
+                },
+            };
+            const jobs = messages.map((data) => {
+                return Object.assign(Object.assign({}, job), { data });
+            });
+            yield queue.addBulk(jobs);
         });
     }
     init(config) {

package/dist/main.d.ts

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

package/dist/main.js

@@ -14,7 +14,9 @@ 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 });
-__exportStar(require("./dd-trace.wrapper.js"), exports);
+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

@@ -54,6 +54,9 @@ class Publisher {
     }
     publish(config, message) {
         const messages = Array.isArray(message) ? message : [message];
+        if (messages.length === 0) {
+            return Promise.resolve();
+        }
         return (0, dd_trace_wrapper_js_1.getTracer)().trace("pubsub.publish", {
             resource: `publish ${config.transport} ${config.name}`,
         }, (span) => {
@@ -64,7 +67,7 @@ class Publisher {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider(config);
             const { schema, schemaId } = this.assertSchema(config);
-            const jsons = messages.map((msg) => {
+            const mappedMessages = messages.map((msg) => {
                 if (!msg.id) {
                     msg.id = (0, uuid_1.v4)();
                 }
@@ -82,26 +85,32 @@ class Publisher {
                 if (!check.success) {
                     (0, message_logger_js_1.logMessage)({
                         note: "Publish message failed schema validation",
-                        message: messages,
+                        message: msg,
                         level: "error",
                         logger: this.logger,
                         extra: Object.assign({ transport: provider.transport, name: config.name }, provider.enrichPublishedMesssageLog(config)),
                     });
-                    throw new errors_js_1.SchemaValidationError(`Schema did not accept the published message: ${check.error.message}`);
+                    return { json: JSON.stringify(msg), error: check.error };
                 }
                 const json = JSON.stringify(check.data);
                 return { json, data: check.data };
             });
+            const errors = mappedMessages.filter((mm) => mm.error);
+            if (errors.length > 0) {
+                const errorMessage = errors.map((mm) => { var _a; return (_a = mm.error) === null || _a === void 0 ? void 0 : _a.message; }).join(", ");
+                throw new errors_js_1.SchemaValidationError(`Schema did not accept ${errors.length} of ${messages.length} message(s): ${errorMessage}`);
+            }
+            const jsons = mappedMessages.filter((j) => j.data).map((j) => j.json);
             const start = (0, message_logger_js_1.startTiming)();
-            yield provider.publish(config, jsons.map((j) => j.json));
+            yield provider.publish(config, jsons);
             const duration = (0, message_logger_js_1.getDuration)(start);
-            jsons.forEach((msg) => {
+            mappedMessages.forEach((msg) => {
                 (0, message_logger_js_1.logMessage)({
                     note: "Published message",
                     message: msg.data,
                     level: config.messageLogLevel,
                     logger: this.logger,
-                    extra: Object.assign({ transport: provider.transport, name: config.name, durationMs: duration }, provider.enrichPublishedMesssageLog(config)),
+                    extra: Object.assign({ transport: provider.transport, name: config.name, durationMs: duration, batchSize: messages.length }, provider.enrichPublishedMesssageLog(config)),
                 });
             });
             span.setTag("pubsub.duration_ms", duration);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@palmetto/pubsub",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "main": "./dist/main.js",
   "scripts": {
     "lint": "yarn run -T eslint --fix ./src",