@mereb/shared-packages 0.0.36 → 0.0.38

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './auth/jwks.js';
 export * from './cache/redis.js';
 export * from './config/env.js';
 export * from './logger.js';
+export { createFastifyLoggerOptions } from './logger.js';
 export type { Logger } from 'pino';
 export * from './messaging/kafka.js';
 export * from './observability/otel.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,YAAY,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,YAAY,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC"}

package/dist/index.js

@@ -2,6 +2,7 @@ export * from './auth/jwks.js';
 export * from './cache/redis.js';
 export * from './config/env.js';
 export * from './logger.js';
+export { createFastifyLoggerOptions } from './logger.js';
 export * from './messaging/kafka.js';
 export * from './observability/otel.js';
 export * from './media/s3.js';

package/dist/logger.d.ts

@@ -1,3 +1,14 @@
 import pino from 'pino';
+type TransportTarget = {
+    target: string;
+    level?: pino.LevelWithSilentOrString;
+    options?: Record<string, unknown>;
+};
+export declare function createFastifyLoggerOptions(name: string): pino.LoggerOptions & {
+    transport?: {
+        targets: TransportTarget[];
+    };
+};
 export declare function createLogger(name: string): pino.Logger;
+export {};
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAsCxB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CA4DtD"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAWxB,KAAK,eAAe,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AA6EF,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,MAAM,GACb,IAAI,CAAC,aAAa,GAAG;IAAC,SAAS,CAAC,EAAE;QAAC,OAAO,EAAE,eAAe,EAAE,CAAA;KAAC,CAAA;CAAC,CAUjE;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAWtD"}

package/dist/logger.js

@@ -27,8 +27,8 @@ function resolveSplunkConfig(name) {
         source: name
     };
 }
-export function createLogger(name) {
-    const transports = [];
+function buildTransportTargets(name) {
+    const targets = [];
     const splunkConfig = resolveSplunkConfig(name);
     const baseLevel = process.env.LOG_LEVEL ?? 'info';
     const isProd = process.env.NODE_ENV === 'production';
@@ -36,14 +36,18 @@ export function createLogger(name) {
         console.warn('Splunk token missing; HEC logging disabled');
     }
     if (isProd) {
-        transports.push({ stream: process.stdout });
+        targets.push({
+            target: 'pino/file',
+            options: { destination: 1 },
+            level: baseLevel
+        });
     }
     else {
-        const pretty = pino.transport({
+        targets.push({
             target: 'pino-pretty',
-            options: { translateTime: 'SYS:standard' }
+            options: { translateTime: 'SYS:standard' },
+            level: baseLevel
         });
-        transports.push({ stream: pretty });
     }
     if (splunkConfig) {
         const transportPath = join(dirname(fileURLToPath(import.meta.url)), 'transports', 'splunk-transport.js');
@@ -52,21 +56,31 @@ export function createLogger(name) {
             index: splunkConfig.index,
             source: splunkConfig.source
         });
-        const splunkStream = pino.transport({
+        targets.push({
             target: transportPath,
             level: 'info',
             options: splunkConfig
         });
-        transports.push({ stream: splunkStream, level: 'info' });
     }
-    const destination = transports.length === 1
-        ? transports[0].stream
-        : pino.multistream(transports.map((t) => ({
-            stream: t.stream,
-            level: t.level ?? baseLevel
-        })));
-    return pino({
-        name,
-        level: baseLevel
-    }, destination);
+    return targets;
+}
+export function createFastifyLoggerOptions(name) {
+    const baseLevel = process.env.LOG_LEVEL ?? 'info';
+    const targets = buildTransportTargets(name);
+    if (!targets.length) {
+        return { level: baseLevel };
+    }
+    return {
+        level: baseLevel,
+        transport: { targets }
+    };
+}
+export function createLogger(name) {
+    const baseLevel = process.env.LOG_LEVEL ?? 'info';
+    const targets = buildTransportTargets(name);
+    if (!targets.length) {
+        return pino({ name, level: baseLevel });
+    }
+    const transport = pino.transport({ targets });
+    return pino({ name, level: baseLevel }, transport);
 }

package/dist/observability/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AASpE,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC;AA2BD,wBAAgB,aAAa,CAAC,EACI,WAAW,EACX,YAAY,EACZ,gBAAqB,EACxB,EAAE,UAAU,QA+B1C;AAED,wBAAgB,oBAAoB,CAChC,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE,eAAe,EAAO,QAS3C"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AASpE,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC;AA2BD,wBAAgB,aAAa,CAAC,EACI,WAAW,EACX,YAAY,EACZ,gBAAqB,EACxB,EAAE,UAAU,QA8B1C;AAED,wBAAgB,oBAAoB,CAChC,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE,eAAe,EAAO,QAS3C"}

package/dist/observability/otel.js

@@ -4,8 +4,8 @@ import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { FastifyInstrumentation } from '@opentelemetry/instrumentation-fastify';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { FastifyOtelInstrumentation } from '@fastify/otel';
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 let initialized = false;
 function defaultEndpoint() {
@@ -25,7 +25,7 @@ function resolveEndpoint(override) {
     return fromEnv ?? defaultEndpoint();
 }
 function defaultInstrumentations() {
-    return [new HttpInstrumentation(), new FastifyInstrumentation()];
+    return [new HttpInstrumentation(), new FastifyOtelInstrumentation()];
 }
 export function initTelemetry({ serviceName, otlpEndpoint, instrumentations = [] }) {
     if (initialized) {
@@ -35,11 +35,14 @@ export function initTelemetry({ serviceName, otlpEndpoint, instrumentations = []
     const resource = new Resource({
         'service.name': serviceName
     });
-    const provider = new NodeTracerProvider({ resource });
-    provider.addSpanProcessor(new BatchSpanProcessor(new OTLPHttpTraceExporter({
+    const exporter = new OTLPHttpTraceExporter({
         // the HTTP exporter appends /v1/traces when no path is present
         url: endpoint
-    })));
+    });
+    const provider = new NodeTracerProvider({
+        resource,
+        spanProcessors: [new BatchSpanProcessor(exporter)]
+    });
     provider.register();
     registerInstrumentations({
         instrumentations: instrumentations.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@fastify/cors": "^9.0.1",
+    "@fastify/otel": "^0.16.0",
     "@fastify/rate-limit": "^10.2.0",
     "@fastify/sensible": "^5.6.0",
     "@fastify/under-pressure": "^9.0.3",
@@ -23,7 +24,6 @@
     "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
     "@opentelemetry/host-metrics": "^0.36.2",
     "@opentelemetry/instrumentation": "^0.52.0",
-    "@opentelemetry/instrumentation-fastify": "^0.52.0",
     "@opentelemetry/instrumentation-http": "^0.52.0",
     "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/sdk-metrics": "^1.18.0",