@contrail/telemetry 2.0.4-beta.0 → 2.0.5-alpha-log-body.0

package/CHANGELOG.md

@@ -7,6 +7,18 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.5] - 2026-04-17
+
+### Added
+
+- **`contrail.log.body` attribute** — Every OTel log record now carries a `contrail.log.body` custom attribute that duplicates the log body. This enables grouping and filtering by log message in observability UIs (e.g. Dash0) that only expose custom attributes, not the standard `body` field.
+
+## [2.0.4] - 2026-04-16
+
+### Added
+
+- **Duplicate module detection** — logs a `stderr` warning at cold start if two copies of `@contrail/telemetry` are loaded, so silent log loss and broken context propagation are immediately visible.
+
 ## [2.0.3] - 2026-04-15
 
 ### Changed

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './logger';
-export * from './metrics';
 export * from './semantic-conventions';

package/lib/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./logger"), exports);
-__exportStar(require("./metrics"), exports);
 __exportStar(require("./semantic-conventions"), exports);

package/lib/logger/index.d.ts

@@ -1,7 +1,7 @@
 import pino from 'pino';
 export { parseOtelResourceAttributes } from './parse-otel-resource-attributes';
 export { PINO_LEVEL_TO_OTEL_SEVERITY, PINO_LEVEL_TO_NAME } from './logger-config';
-export { ATTR_LOG_MESSAGE, ATTR_LOG_PAYLOAD } from './semantic-conventions';
+export { ATTR_LOG_MESSAGE, ATTR_LOG_BODY, ATTR_LOG_PAYLOAD } from './semantic-conventions';
 export { loggerStorage, withLogAttributes } from './log-context';
 export declare const baseLogger: pino.Logger<never, boolean>;
 export declare const logger: pino.Logger;

package/lib/logger/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a, _b, _c, _d, _e, _f, _g;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.baseLogger = exports.withLogAttributes = exports.loggerStorage = exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_MESSAGE = exports.PINO_LEVEL_TO_NAME = exports.PINO_LEVEL_TO_OTEL_SEVERITY = exports.parseOtelResourceAttributes = void 0;
+exports.logger = exports.baseLogger = exports.withLogAttributes = exports.loggerStorage = exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_BODY = exports.ATTR_LOG_MESSAGE = exports.PINO_LEVEL_TO_NAME = exports.PINO_LEVEL_TO_OTEL_SEVERITY = exports.parseOtelResourceAttributes = void 0;
 exports.addStream = addStream;
 exports.flushLogs = flushLogs;
 const pino_1 = __importDefault(require("pino"));
@@ -28,10 +28,36 @@ Object.defineProperty(exports, "PINO_LEVEL_TO_OTEL_SEVERITY", { enumerable: true
 Object.defineProperty(exports, "PINO_LEVEL_TO_NAME", { enumerable: true, get: function () { return logger_config_2.PINO_LEVEL_TO_NAME; } });
 var semantic_conventions_3 = require("./semantic-conventions");
 Object.defineProperty(exports, "ATTR_LOG_MESSAGE", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_MESSAGE; } });
+Object.defineProperty(exports, "ATTR_LOG_BODY", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_BODY; } });
 Object.defineProperty(exports, "ATTR_LOG_PAYLOAD", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_PAYLOAD; } });
 var log_context_1 = require("./log-context");
 Object.defineProperty(exports, "loggerStorage", { enumerable: true, get: function () { return log_context_1.loggerStorage; } });
 Object.defineProperty(exports, "withLogAttributes", { enumerable: true, get: function () { return log_context_1.withLogAttributes; } });
+// --- Singleton Guard ---
+// The logger uses AsyncLocalStorage for request context propagation. If two copies
+// of this module are loaded (e.g. due to a version mismatch causing npm to install
+// a nested duplicate), each copy has its own AsyncLocalStorage instance and its own
+// OTel LoggerProvider. Context set in one copy won't be visible in the other, and
+// flushLogs() will only flush the provider it closes over — silently dropping logs.
+//
+// Symbol.for uses the global symbol registry, which is shared across all module
+// instances, so this check fires correctly even when two copies are loaded.
+//
+// Local dev note: running `npm i` inside a lib package directory causes npm v7+ to
+// auto-install peer deps locally. If that package is then symlinked into a service,
+// the nested node_modules travels with it and re-creates the duplicate. Published
+// tarballs don't ship node_modules, so this is local-only.
+const TELEMETRY_SINGLETON_KEY = Symbol.for('@contrail/telemetry/logger-initialized');
+const globalRecord = globalThis;
+if (globalRecord[TELEMETRY_SINGLETON_KEY]) {
+    process.stderr.write('[WARN] @contrail/telemetry loaded twice — duplicate module instance detected. ' +
+        'flushLogs() will only flush one provider and log context may not propagate correctly. ' +
+        'Ensure @contrail/telemetry is listed as a peerDependency in any library that re-exports ' +
+        'it, and that the host service lists it in its own package.json.\n');
+}
+else {
+    globalRecord[TELEMETRY_SINGLETON_KEY] = true;
+}
 // --- Environment & Resource Setup ---
 const semantic_conventions_4 = require("../semantic-conventions");
 const LAMBDA_ENV_OTEL_ATTRIBUTES = getLambdaEnvAttributes();
@@ -138,6 +164,7 @@ function createOtelStream() {
                     // environment, even if user code accidentally sets a conflicting key.
                     attributes: {
                         ...safeAttributes,
+                        [semantic_conventions_2.ATTR_LOG_BODY]: message,
                         ...lambdaEnvAttributes,
                         ...spanAttributes,
                     },

package/lib/logger/semantic-conventions.d.ts

@@ -5,6 +5,11 @@
  * Attribute key for the log message body.
  */
 export declare const ATTR_LOG_MESSAGE: "contrail.message";
+/**
+ * Custom attribute that duplicates the log body so it is available for
+ * grouping / filtering in observability UIs that only expose custom attributes.
+ */
+export declare const ATTR_LOG_BODY: "contrail.log.body";
 /**
  * Attribute key for user-provided log payload objects.
  */

package/lib/logger/semantic-conventions.js

@@ -3,11 +3,16 @@
  * Log-specific semantic conventions.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_MESSAGE = void 0;
+exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_BODY = exports.ATTR_LOG_MESSAGE = void 0;
 /**
  * Attribute key for the log message body.
  */
 exports.ATTR_LOG_MESSAGE = 'contrail.message';
+/**
+ * Custom attribute that duplicates the log body so it is available for
+ * grouping / filtering in observability UIs that only expose custom attributes.
+ */
+exports.ATTR_LOG_BODY = 'contrail.log.body';
 /**
  * Attribute key for user-provided log payload objects.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/telemetry",
-  "version": "2.0.4-beta.0",
+  "version": "2.0.5-alpha-log-body.0",
   "description": "Telemetry and monitoring utilities for contrail services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,10 +20,8 @@
     "@opentelemetry/api-logs": "^0.211.0",
     "@opentelemetry/core": "^2.5.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.211.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.211.0",
     "@opentelemetry/resources": "^2.5.0",
     "@opentelemetry/sdk-logs": "^0.211.0",
-    "@opentelemetry/sdk-metrics": "^2.5.0",
     "@opentelemetry/sdk-trace-base": "^2.5.0",
     "@opentelemetry/semantic-conventions": "^1.39.0",
     "pino": "^10.1.0"

package/lib/metrics/index.d.ts

@@ -1,4 +0,0 @@
-export declare function getMeter(name: string): import("@opentelemetry/api").Meter;
-export declare function flushMetrics(options?: {
-    timeoutMs?: number;
-}): Promise<void>;

package/lib/metrics/index.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMeter = getMeter;
-exports.flushMetrics = flushMetrics;
-const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
-const exporter_metrics_otlp_http_1 = require("@opentelemetry/exporter-metrics-otlp-http");
-const resources_1 = require("@opentelemetry/resources");
-const parse_otel_resource_attributes_1 = require("../logger/parse-otel-resource-attributes");
-const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
-const shouldExportToOtlp = Boolean(otlpEndpoint);
-const resource = (0, resources_1.resourceFromAttributes)((0, parse_otel_resource_attributes_1.parseOtelResourceAttributes)());
-const readers = shouldExportToOtlp
-    ? [
-        new sdk_metrics_1.PeriodicExportingMetricReader({
-            exporter: new exporter_metrics_otlp_http_1.OTLPMetricExporter(),
-            exportIntervalMillis: 30000,
-        }),
-    ]
-    : [];
-const meterProvider = new sdk_metrics_1.MeterProvider({ resource, readers });
-function getMeter(name) {
-    return meterProvider.getMeter(name);
-}
-async function flushMetrics(options) {
-    var _a;
-    const timeoutMs = (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : 5000;
-    try {
-        await Promise.race([
-            meterProvider.forceFlush(),
-            new Promise((_, reject) => setTimeout(() => reject(new Error(`Metrics flush timed out after ${timeoutMs}ms`)), timeoutMs)),
-        ]);
-    }
-    catch (error) {
-        process.stderr.write(`[OTel Metrics Flush Failed] ${JSON.stringify({
-            error: error instanceof Error ? error.message : String(error),
-            timeoutMs,
-            timestamp: new Date().toISOString(),
-        })}\n`);
-    }
-}