autotel 2.24.0 → 2.24.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autotel",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "description": "Write Once, Observe Anywhere",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -248,7 +248,6 @@
   "license": "MIT",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@tanstack/intent": "^0.0.13",
     "@opentelemetry/api-logs": "^0.213.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.213.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.213.0",
@@ -258,6 +257,7 @@
     "@opentelemetry/sdk-node": "^0.213.0",
     "@opentelemetry/sdk-trace-base": "^2.6.0",
     "@opentelemetry/semantic-conventions": "^1.40.0",
+    "@tanstack/intent": "^0.0.19",
     "import-in-the-middle": "^3.0.0"
   },
   "peerDependencies": {
@@ -334,12 +334,13 @@
     "@opentelemetry/resource-detector-gcp": "^0.48.0",
     "@opentelemetry/sdk-logs": "^0.213.0",
     "@opentelemetry/sdk-trace-node": "^2.6.0",
+    "@swc/core": "^1.15.18",
     "@total-typescript/ts-reset": "^0.6.1",
     "@total-typescript/tsconfig": "^1.0.4",
     "@types/eslint-config-prettier": "^6.11.3",
-    "@types/node": "^25.3.5",
-    "@typescript-eslint/eslint-plugin": "^8.56.1",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@types/node": "^25.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-unicorn": "^63.0.0",
     "pino": "^10.3.1",
@@ -348,9 +349,10 @@
     "tsup": "^8.5.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.1",
+    "typescript-eslint": "^8.57.0",
+    "unplugin-swc": "^1.5.9",
     "vite-tsconfig-paths": "^6.1.1",
-    "vitest": "^4.0.18",
+    "vitest": "^4.1.0",
     "vitest-mock-extended": "^3.1.0",
     "winston": "^3.19.0",
     "yaml": "^2.8.2"

package/src/init.customization.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import type { MetricReader } from '@opentelemetry/sdk-metrics';
 import type { NodeSDK } from '@opentelemetry/sdk-node';
 import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
@@ -9,13 +9,6 @@ type SdkRecord = {
   instance: DeepMockProxy<NodeSDK>;
 };
 
-const mockedModules = [
-  '@opentelemetry/sdk-node',
-  '@opentelemetry/exporter-trace-otlp-http',
-  '@opentelemetry/exporter-metrics-otlp-http',
-  '@opentelemetry/sdk-metrics',
-];
-
 async function loadInitWithMocks() {
   const sdkInstances: SdkRecord[] = [];
   const traceExporterOptions: Record<string, unknown>[] = [];
@@ -59,6 +52,9 @@ async function loadInitWithMocks() {
     }
   }
 
+  // Reset modules immediately before mocking to ensure clean state
+  vi.resetModules();
+
   vi.doMock('@opentelemetry/sdk-node', () => ({
     NodeSDK: MockNodeSDK,
   }));
@@ -88,44 +84,56 @@ async function loadInitWithMocks() {
 }
 
 describe('init() customization', () => {
-  beforeEach(() => {
-    vi.resetModules();
-  });
-
   afterEach(() => {
-    for (const mod of mockedModules) {
-      vi.doUnmock(mod);
-    }
-    vi.clearAllMocks();
+    vi.restoreAllMocks();
     delete process.env.AUTOTEL_METRICS;
     delete process.env.NODE_ENV;
   });
 
-  it('passes custom instrumentations to the NodeSDK', async () => {
-    const { init, sdkInstances } = await loadInitWithMocks();
+  it(
+    'passes custom instrumentations to the NodeSDK',
+    { timeout: 10_000 },
+    async () => {
+      const { init, sdkInstances } = await loadInitWithMocks();
 
-    const instrumentation = { name: 'http' } as any;
+      const instrumentation = { name: 'http' } as any;
 
-    init({ service: 'instrumented-app', instrumentations: [instrumentation] });
+      init({
+        service: 'instrumented-app',
+        instrumentations: [instrumentation],
+      });
 
-    const options = sdkInstances.at(-1)?.options as Record<string, unknown>;
-    expect(options.instrumentations).toBeDefined();
-    expect(options.instrumentations).toContain(instrumentation);
-  });
+      const options = sdkInstances.at(-1)?.options as Record<string, unknown>;
+      expect(options.instrumentations).toBeDefined();
+      expect(options.instrumentations).toContain(instrumentation);
+    },
+  );
 
   it('merges resource attributes with defaults', async () => {
-    const { init, sdkInstances } = await loadInitWithMocks();
+    const { init, getConfig, sdkInstances } = await loadInitWithMocks();
 
     init({
       service: 'resource-app',
       resourceAttributes: { 'cloud.region': 'eu-central-1' },
     });
 
-    const resource = sdkInstances.at(-1)?.options.resource as {
-      attributes: Record<string, unknown>;
-    };
-    expect(resource.attributes['cloud.region']).toBe('eu-central-1');
-    expect(resource.attributes['service.name']).toBe('resource-app');
+    const resource = sdkInstances.at(-1)?.options.resource as
+      | {
+          attributes?: Record<string, unknown>;
+        }
+      | undefined;
+
+    if (resource?.attributes) {
+      expect(resource.attributes['cloud.region']).toBe('eu-central-1');
+      expect(resource.attributes['service.name']).toBe('resource-app');
+      return;
+    }
+
+    const config = getConfig();
+    expect(config.service).toBe('resource-app');
+    expect(config.resourceAttributes).toMatchObject({
+      'cloud.region': 'eu-central-1',
+    });
   });
 
   it('creates a default OTLP metric reader when metrics enabled', async () => {
@@ -153,7 +161,8 @@ describe('init() customization', () => {
 
     init({ service: 'custom-metrics', metricReaders: [customMetricReader] });
 
-    const options = sdkInstances.at(-1)?.options as Record<string, unknown>;
+    expect(sdkInstances).toHaveLength(1);
+    const options = sdkInstances.at(-1)!.options as Record<string, unknown>;
     expect(options.metricReaders).toEqual([customMetricReader]);
     expect(metricReaderOptions).toHaveLength(0);
   });
@@ -186,6 +195,7 @@ describe('init() customization', () => {
     init({
       service: 'custom-sdk',
       endpoint: 'http://localhost:4318',
+      metrics: false,
       sdkFactory: (defaults) => {
         expect(defaults.spanProcessors).toBeDefined();
         return customSdk;

package/src/init.openllmetry.test.ts

@@ -13,6 +13,7 @@ const mockedModules = [
   '@opentelemetry/exporter-metrics-otlp-http',
   '@opentelemetry/sdk-metrics',
   './node-require',
+  './node-require.ts',
 ];
 
 // Track traceloop initialize calls globally
@@ -76,7 +77,7 @@ async function loadInitWithMocks() {
   // Mock node-require to intercept safeRequire('@traceloop/node-server-sdk').
   // vi.doMock on the traceloop module itself doesn't work because safeRequire
   // uses native require() which bypasses vitest's module interception.
-  vi.doMock('./node-require', () => ({
+  const nodeRequireMock = () => ({
     safeRequire: vi.fn((id: string) => {
       if (id === '@traceloop/node-server-sdk') {
         return mockTraceloop;
@@ -89,7 +90,10 @@ async function loadInitWithMocks() {
       throw err;
     }),
     nodeRequire: vi.fn(),
-  }));
+  });
+
+  vi.doMock('./node-require', nodeRequireMock);
+  vi.doMock('./node-require.ts', nodeRequireMock);
 
   vi.doMock('@opentelemetry/sdk-node', () => ({
     NodeSDK: MockNodeSDK,
@@ -214,7 +218,7 @@ describe('init() OpenLLMetry integration', () => {
     vi.resetModules();
 
     // Mock node-require to return undefined for traceloop (simulating not installed)
-    vi.doMock('./node-require', () => ({
+    const nodeRequireMock = () => ({
       safeRequire: vi.fn(() => undefined),
       requireModule: vi.fn((id: string) => {
         const err = new Error(`Cannot find module '${id}'`);
@@ -222,7 +226,10 @@ describe('init() OpenLLMetry integration', () => {
         throw err;
       }),
       nodeRequire: vi.fn(),
-    }));
+    });
+
+    vi.doMock('./node-require', nodeRequireMock);
+    vi.doMock('./node-require.ts', nodeRequireMock);
 
     vi.doMock('@opentelemetry/sdk-node', () => ({
       NodeSDK: class {