@mereb/shared-packages 0.0.34 → 0.0.36

package/dist/messaging/kafka.d.ts

@@ -1,4 +1,4 @@
-import { type Consumer, Kafka, type KafkaConfig, type Producer } from 'kafkajs';
+import { type Consumer, type KafkaConfig, type Producer, Kafka } from 'kafkajs';
 export declare function getKafka(config: KafkaConfig): Kafka;
 export declare function getProducer(config: KafkaConfig): Promise<Producer>;
 export declare function createConsumer(config: KafkaConfig, groupId: string): Promise<Consumer>;
@@ -21,5 +21,6 @@ export type KafkaEnvConfigOptions = {
     sslInsecureDefault?: boolean;
 };
 export declare function buildKafkaConfigFromEnv(opts?: KafkaEnvConfigOptions): KafkaConfig | null;
+export declare function ensureTopicExists(config: KafkaConfig, topic: string, partitions?: number, replicationFactor?: number): Promise<void>;
 export declare function disconnectProducer(): Promise<void>;
 //# sourceMappingURL=kafka.d.ts.map

package/dist/messaging/kafka.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../src/messaging/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,QAAQ,EAAE,KAAK,EAAE,KAAK,WAAW,EAAgB,KAAK,QAAQ,EAAC,MAAM,SAAS,CAAC;AAK5F,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,SAG3C;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CASxE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAK5F;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAgB,uBAAuB,CACnC,IAAI,GAAE,qBAA0B,GACjC,WAAW,GAAG,IAAI,CA8BpB;AAED,wBAAsB,kBAAkB,kBAKvC"}
+{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../src/messaging/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,EAER,MAAM,SAAS,CAAC;AAKjB,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,SAG3C;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CASxE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAK5F;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAgB,uBAAuB,CACnC,IAAI,GAAE,qBAA0B,GACjC,WAAW,GAAG,IAAI,CA8BpB;AAED,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,MAAM,EACb,UAAU,SAAI,EACd,iBAAiB,SAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAsB,kBAAkB,kBAKvC"}

package/dist/messaging/kafka.js

@@ -45,6 +45,24 @@ export function buildKafkaConfigFromEnv(opts = {}) {
             : undefined
     };
 }
+export async function ensureTopicExists(config, topic, partitions = 1, replicationFactor = 1) {
+    const kafka = getKafka(config);
+    const admin = kafka.admin();
+    await admin.connect();
+    const existing = await admin.listTopics();
+    if (!existing.includes(topic)) {
+        await admin.createTopics({
+            topics: [
+                {
+                    topic,
+                    numPartitions: partitions,
+                    replicationFactor
+                }
+            ]
+        });
+    }
+    await admin.disconnect();
+}
 export async function disconnectProducer() {
     if (producerInstance) {
         await producerInstance.disconnect();

package/dist/observability/otel.d.ts

@@ -5,4 +5,5 @@ export interface OtelConfig {
     instrumentations?: Instrumentation[];
 }
 export declare function initTelemetry({ serviceName, otlpEndpoint, instrumentations }: OtelConfig): void;
+export declare function initDefaultTelemetry(serviceName: string, instrumentations?: Instrumentation[]): void;
 //# sourceMappingURL=otel.d.ts.map

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;AAOpE,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC;AAED,wBAAgB,aAAa,CAAC,EACI,WAAW,EACX,YAAY,EACZ,gBAAqB,EACxB,EAAE,UAAU,QA0B1C"}
+{"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"}

package/dist/observability/otel.js

@@ -2,24 +2,57 @@ import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
+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';
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 let initialized = false;
+function defaultEndpoint() {
+    const env = process.env.NODE_ENV ?? 'development';
+    const map = {
+        production: 'https://otel-collector.mereb.app',
+        staging: 'https://otel-collector-stg.mereb.app',
+        test: 'http://localhost:4318',
+        development: 'https://otel-collector-dev.mereb.app'
+    };
+    return map[env] ?? map.development;
+}
+function resolveEndpoint(override) {
+    const fromEnv = override ??
+        process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ??
+        process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
+    return fromEnv ?? defaultEndpoint();
+}
+function defaultInstrumentations() {
+    return [new HttpInstrumentation(), new FastifyInstrumentation()];
+}
 export function initTelemetry({ serviceName, otlpEndpoint, instrumentations = [] }) {
     if (initialized) {
         return;
     }
+    const endpoint = resolveEndpoint(otlpEndpoint);
     const resource = new Resource({
         'service.name': serviceName
     });
     const provider = new NodeTracerProvider({ resource });
-    if (otlpEndpoint) {
-        provider.addSpanProcessor(new BatchSpanProcessor(new OTLPTraceExporter({ url: otlpEndpoint })));
-    }
+    provider.addSpanProcessor(new BatchSpanProcessor(new OTLPHttpTraceExporter({
+        // the HTTP exporter appends /v1/traces when no path is present
+        url: endpoint
+    })));
     provider.register();
-    if (instrumentations.length) {
-        registerInstrumentations({ instrumentations });
-    }
+    registerInstrumentations({
+        instrumentations: instrumentations.length
+            ? instrumentations
+            : defaultInstrumentations()
+    });
     initialized = true;
 }
+export function initDefaultTelemetry(serviceName, instrumentations = []) {
+    initTelemetry({
+        serviceName,
+        instrumentations: instrumentations.length > 0
+            ? instrumentations
+            : defaultInstrumentations()
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,6 +20,7 @@
     "@fastify/under-pressure": "^9.0.3",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.52.0",
+    "@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",
@@ -41,7 +42,7 @@
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^8.18.1",
     "@typescript-eslint/parser": "^8.18.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.26.0",
     "husky": "^9.1.7",
     "rimraf": "^5.0.5",
     "typescript": "^5.4.5",