@contrail/telemetry 2.2.0-alpha-tracing.1 → 2.2.0

package/lib/index.browser.d.ts

@@ -7,6 +7,7 @@
 import pino from 'pino';
 import type { Logger } from 'pino';
 export * from './semantic-conventions';
+export * from './tracing';
 export { ATTR_LOG_MESSAGE, ATTR_LOG_BODY, ATTR_LOG_PAYLOAD } from './logger/semantic-conventions';
 export { PINO_LEVEL_TO_OTEL_SEVERITY, PINO_LEVEL_TO_NAME } from './logger/logger-config';
 export { parseOtelResourceAttributes } from './logger/parse-otel-resource-attributes';

package/lib/index.browser.js

@@ -31,6 +31,7 @@ exports.flushLogs = flushLogs;
 const pino_1 = __importDefault(require("pino"));
 // --- Re-export browser-safe modules as-is ---
 __exportStar(require("./semantic-conventions"), exports);
+__exportStar(require("./tracing"), exports);
 var semantic_conventions_1 = require("./logger/semantic-conventions");
 Object.defineProperty(exports, "ATTR_LOG_MESSAGE", { enumerable: true, get: function () { return semantic_conventions_1.ATTR_LOG_MESSAGE; } });
 Object.defineProperty(exports, "ATTR_LOG_BODY", { enumerable: true, get: function () { return semantic_conventions_1.ATTR_LOG_BODY; } });

package/lib/tracing/trace-section.d.ts

@@ -1,3 +1,4 @@
 import { Attributes, Span } from '@opentelemetry/api';
-export type TraceSectionAttrs = Attributes | ((span: Span) => Attributes | void);
-export declare function traceSection<T>(name: string, attrs: TraceSectionAttrs, fn: (span: Span) => Promise<T>): Promise<T>;
+export type TraceSectionAttributes = Attributes | ((span: Span) => Attributes | void);
+export declare function traceSection<T>(name: string, attributes: TraceSectionAttributes, fn: (span: Span) => T): T;
+export declare function traceSection<T>(name: string, attributes: TraceSectionAttributes, fn: (span: Span) => Promise<T>): Promise<T>;

package/lib/tracing/trace-section.js

@@ -3,26 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.traceSection = traceSection;
 const api_1 = require("@opentelemetry/api");
 const tracer = api_1.trace.getTracer('contrail');
-async function traceSection(name, attrs, fn) {
-    return tracer.startActiveSpan(name, async (span) => {
+function applyAttributes(span, attributes) {
+    if (typeof attributes === 'function') {
+        const computed = attributes(span);
+        if (computed)
+            span.setAttributes(computed);
+    }
+    else {
+        span.setAttributes(attributes);
+    }
+}
+function recordError(span, err) {
+    const message = err instanceof Error ? err.message : String(err);
+    span.recordException(err instanceof Error ? err : new Error(message));
+    span.setStatus({ code: api_1.SpanStatusCode.ERROR, message });
+}
+function traceSection(name, attributes, fn) {
+    return tracer.startActiveSpan(name, (span) => {
         try {
-            if (typeof attrs === 'function') {
-                const computed = attrs(span);
-                if (computed)
-                    span.setAttributes(computed);
+            applyAttributes(span, attributes);
+            const result = fn(span);
+            if (result && typeof result.then === 'function') {
+                return result.then((val) => {
+                    span.end();
+                    return val;
+                }, (err) => {
+                    recordError(span, err);
+                    span.end();
+                    throw err;
+                });
             }
-            else {
-                span.setAttributes(attrs);
-            }
-            return await fn(span);
+            span.end();
+            return result;
         }
         catch (err) {
-            span.recordException(err);
-            span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: err.message });
-            throw err;
-        }
-        finally {
+            recordError(span, err);
             span.end();
+            throw err;
         }
     });
 }

package/lib/tracing/traced.decorator.d.ts

@@ -1,2 +1,2 @@
 import { Attributes } from '@opentelemetry/api';
-export declare function Traced(name: string, staticAttrs?: Attributes): (target: any, key: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export declare function Traced(name: string, staticAttributes?: Attributes): (target: any, key: string | symbol, descriptor: PropertyDescriptor) => PropertyDescriptor;

package/lib/tracing/traced.decorator.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Traced = Traced;
 const trace_section_1 = require("./trace-section");
-function Traced(name, staticAttrs = {}) {
+function Traced(name, staticAttributes = {}) {
     return function (target, key, descriptor) {
         var _a;
         const original = descriptor.value;
-        const className = (_a = target === null || target === void 0 ? void 0 : target.constructor) === null || _a === void 0 ? void 0 : _a.name;
-        const codeFunctionName = className && className !== 'Object' ? `${className}.${key}` : key;
-        const attrs = { ...staticAttrs, 'code.function.name': codeFunctionName };
+        const className = typeof target === 'function' ? target.name : (_a = target === null || target === void 0 ? void 0 : target.constructor) === null || _a === void 0 ? void 0 : _a.name;
+        const keyName = String(key);
+        const codeFunctionName = className && className !== 'Object' && className !== 'Function' ? `${className}.${keyName}` : keyName;
+        const attributes = { ...staticAttributes, 'code.function.name': codeFunctionName };
         descriptor.value = function (...args) {
-            return (0, trace_section_1.traceSection)(name, attrs, () => original.apply(this, args));
+            return (0, trace_section_1.traceSection)(name, attributes, () => original.apply(this, args));
         };
         return descriptor;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/telemetry",
-  "version": "2.2.0-alpha-tracing.1",
+  "version": "2.2.0",
   "description": "Telemetry and monitoring utilities for contrail services",
   "main": "lib/index.js",
   "browser": "lib/index.browser.js",