pragma-log-manager-aws-lambda 1.0.0 → 1.1.0

package/dist/cjs/logger.d.ts

@@ -1,3 +1,7 @@
 import * as winston from "winston";
 import './tracing';
+export declare const getCurrentTrace: () => {
+    traceId: string;
+    spanId: string;
+};
 export declare const logger: winston.Logger;

package/dist/cjs/logger.js

@@ -33,17 +33,32 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
+exports.logger = exports.getCurrentTrace = void 0;
 const winston = __importStar(require("winston"));
 const moment = __importStar(require("moment-timezone"));
 require("./tracing");
-const tracing_1 = require("./tracing");
+const api_1 = require("@opentelemetry/api");
+const getCurrentTrace = () => {
+    const activeSpan = api_1.trace.getActiveSpan();
+    if (!activeSpan) {
+        return {
+            traceId: 'no-trace-id',
+            spanId: 'no-span-id',
+        };
+    }
+    const spanContext = activeSpan.spanContext();
+    return {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId,
+    };
+};
+exports.getCurrentTrace = getCurrentTrace;
 exports.logger = winston.createLogger({
     level: 'info',
     format: winston.format.combine(winston.format.timestamp({
         format: () => moment.tz('America/Bogota').format('YYYY-MM-DDTHH:mm:ss.SSS')
     }), winston.format.printf(({ level, message, timestamp, ...obj }) => {
-        const { traceId, spanId } = (0, tracing_1.getCurrentTrace)();
+        const { traceId, spanId } = (0, exports.getCurrentTrace)();
         const payload = obj.action;
         const error = obj.error;
         const transactionId = obj.transactionId;

package/dist/cjs/tracing.d.ts

@@ -1,5 +1 @@
 export declare const tracer: import("@opentelemetry/api").Tracer;
-export declare const getCurrentTrace: () => {
-    traceId: string;
-    spanId: string;
-};

package/dist/cjs/tracing.js

@@ -1,51 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentTrace = exports.tracer = void 0;
-const sdk_node_1 = require("@opentelemetry/sdk-node");
+exports.tracer = void 0;
+const api_1 = require("@opentelemetry/api");
 const resources_1 = require("@opentelemetry/resources");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
-const instrumentation_aws_lambda_1 = require("@opentelemetry/instrumentation-aws-lambda");
-const api_1 = require("@opentelemetry/api");
-let sdk = null;
-const initializeSDK = () => {
-    if (sdk)
-        return sdk;
-    const traceExporter = process.env.OTEL_EXPORTER_OTLP_ENDPOINT
-        ? new exporter_trace_otlp_http_1.OTLPTraceExporter({ url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT })
-        : undefined;
-    sdk = new sdk_node_1.NodeSDK({
-        resource: new resources_1.Resource({
-            [semantic_conventions_1.ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'default-lambda',
-        }),
-        instrumentations: [
-            new instrumentation_aws_lambda_1.AwsLambdaInstrumentation()
+let initialized = false;
+const initializeTracing = () => {
+    if (initialized)
+        return;
+    const resource = (0, resources_1.resourceFromAttributes)({
+        [semantic_conventions_1.ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'default-lambda',
+    });
+    const exporter = new exporter_trace_otlp_http_1.OTLPTraceExporter({
+        url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
+    });
+    const provider = new sdk_trace_node_1.NodeTracerProvider({
+        resource,
+        spanProcessors: [
+            new sdk_trace_base_1.BatchSpanProcessor(exporter),
         ],
-        traceExporter: traceExporter
     });
-    sdk.start();
-    return sdk;
+    provider.register();
+    initialized = true;
 };
-// Initialize SDK
-initializeSDK();
+initializeTracing();
 exports.tracer = api_1.trace.getTracer('default-tracer');
-const getCurrentTrace = () => {
-    const activeSpan = api_1.trace.getActiveSpan();
-    if (!activeSpan) {
-        return {
-            traceId: 'no-trace-id',
-            spanId: 'no-span-id'
-        };
-    }
-    const spanContext = activeSpan.spanContext();
-    return {
-        traceId: spanContext.traceId,
-        spanId: spanContext.spanId
-    };
-};
-exports.getCurrentTrace = getCurrentTrace;
-process.on('SIGTERM', () => {
-    if (sdk) {
-        sdk.shutdown().then();
-    }
-});

package/dist/esm/logger.d.ts

@@ -1,3 +1,7 @@
 import * as winston from "winston";
 import './tracing';
+export declare const getCurrentTrace: () => {
+    traceId: string;
+    spanId: string;
+};
 export declare const logger: winston.Logger;

package/dist/esm/logger.js

@@ -1,7 +1,21 @@
 import * as winston from "winston";
 import * as moment from "moment-timezone";
 import './tracing';
-import { getCurrentTrace } from "./tracing";
+import { trace } from "@opentelemetry/api";
+export const getCurrentTrace = () => {
+    const activeSpan = trace.getActiveSpan();
+    if (!activeSpan) {
+        return {
+            traceId: 'no-trace-id',
+            spanId: 'no-span-id',
+        };
+    }
+    const spanContext = activeSpan.spanContext();
+    return {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId,
+    };
+};
 export const logger = winston.createLogger({
     level: 'info',
     format: winston.format.combine(winston.format.timestamp({

package/dist/esm/tracing.d.ts

@@ -1,5 +1 @@
 export declare const tracer: import("@opentelemetry/api").Tracer;
-export declare const getCurrentTrace: () => {
-    traceId: string;
-    spanId: string;
-};

package/dist/esm/tracing.js

@@ -1,47 +1,27 @@
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { Resource } from '@opentelemetry/resources';
+import { trace } from '@opentelemetry/api';
+import { resourceFromAttributes } from '@opentelemetry/resources';
 import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { AwsLambdaInstrumentation } from '@opentelemetry/instrumentation-aws-lambda';
-import { trace } from '@opentelemetry/api';
-let sdk = null;
-const initializeSDK = () => {
-    if (sdk)
-        return sdk;
-    const traceExporter = process.env.OTEL_EXPORTER_OTLP_ENDPOINT
-        ? new OTLPTraceExporter({ url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT })
-        : undefined;
-    sdk = new NodeSDK({
-        resource: new Resource({
-            [ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'default-lambda',
-        }),
-        instrumentations: [
-            new AwsLambdaInstrumentation()
+let initialized = false;
+const initializeTracing = () => {
+    if (initialized)
+        return;
+    const resource = resourceFromAttributes({
+        [ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'default-lambda',
+    });
+    const exporter = new OTLPTraceExporter({
+        url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
+    });
+    const provider = new NodeTracerProvider({
+        resource,
+        spanProcessors: [
+            new BatchSpanProcessor(exporter),
         ],
-        traceExporter: traceExporter
     });
-    sdk.start();
-    return sdk;
+    provider.register();
+    initialized = true;
 };
-// Initialize SDK
-initializeSDK();
+initializeTracing();
 export const tracer = trace.getTracer('default-tracer');
-export const getCurrentTrace = () => {
-    const activeSpan = trace.getActiveSpan();
-    if (!activeSpan) {
-        return {
-            traceId: 'no-trace-id',
-            spanId: 'no-span-id'
-        };
-    }
-    const spanContext = activeSpan.spanContext();
-    return {
-        traceId: spanContext.traceId,
-        spanId: spanContext.spanId
-    };
-};
-process.on('SIGTERM', () => {
-    if (sdk) {
-        sdk.shutdown().then();
-    }
-});

package/dist/types/logger.d.ts

@@ -1,3 +1,7 @@
 import * as winston from "winston";
 import './tracing';
+export declare const getCurrentTrace: () => {
+    traceId: string;
+    spanId: string;
+};
 export declare const logger: winston.Logger;

package/dist/types/tracing.d.ts

@@ -1,5 +1 @@
 export declare const tracer: import("@opentelemetry/api").Tracer;
-export declare const getCurrentTrace: () => {
-    traceId: string;
-    spanId: string;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pragma-log-manager-aws-lambda",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "commonjs",
   "description": "OTEL - Winston implementation tracing for aws node lambdas in js",
   "author": "juan.ojeda@pragma.com.co",
@@ -22,25 +22,25 @@
     "build:types": "tsc --project tsconfig.types.json"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.52.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.52.0",
-    "@opentelemetry/instrumentation-aws-lambda": "^0.52.0",
-    "@opentelemetry/resources": "^1.19.0",
-    "@opentelemetry/sdk-node": "^0.52.1",
-    "@opentelemetry/semantic-conventions": "^1.19.0",
-    "winston": "^3.17.0"
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/resources": "2.1.0",
+    "@opentelemetry/sdk-trace-base": "2.1.0",
+    "@opentelemetry/sdk-trace-node": "2.1.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.215.0",
+    "@opentelemetry/semantic-conventions": "1.37.0",
+    "winston": "3.17.0"
   },
   "devDependencies": {
+    "@types/aws-lambda": "^8.10.92",
     "typescript": "^5.4.0"
   },
   "dependencies": {
-    "moment-timezone": "^0.6.0"
+    "moment-timezone": "0.6.0"
   },
   "overrides": {
-    "protobufjs": "^7.5.5"
+    "uuid": "14.0.0"
   },
   "resolutions": {
-    "protobufjs": "^7.5.5"
+    "uuid": "14.0.0"
   }
 }