@mastra/deployer 0.1.0-alpha.61 → 0.1.0-alpha.62

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @mastra/deployer
 
+## 0.1.0-alpha.62
+
+### Patch Changes
+
+- 382f4dc: move telemetry init to instrumentation.mjs file in build directory
+- Updated dependencies [016493a]
+- Updated dependencies [382f4dc]
+- Updated dependencies [176bc42]
+- Updated dependencies [d68b532]
+- Updated dependencies [fe3dcb0]
+- Updated dependencies [e448a26]
+- Updated dependencies [fd75f3c]
+- Updated dependencies [ccf115c]
+- Updated dependencies [a221426]
+  - @mastra/core@0.2.0-alpha.110
+
 ## 0.1.0-alpha.61
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.ts

@@ -54,6 +54,7 @@ export declare abstract class Bundler extends MastraBundler {
     protected outputDir: string;
     constructor(name: string, component?: 'BUNDLER' | 'DEPLOYER');
     prepare(outputDirectory: string): Promise<void>;
+    writeInstrumentationFile(outputDirectory: string): Promise<void>;
     writePackageJson(outputDirectory: string, dependencies: Map<string, string>): Promise<void>;
     protected createBundler(inputOptions: InputOptions, outputOptions: Partial<OutputOptions> & {
         dir: string;
@@ -307,6 +308,10 @@ export declare function queryVectors(c: Context): Promise<Response>;
 
 export declare function removeAllExceptDeployer(): babel_2.PluginObj;
 
+export declare function removeAllExceptTelemetryConfig(result: {
+    hasCustomConfig: boolean;
+}): babel_2.PluginObj;
+
 export declare function removeDeployer(): babel_2.PluginObj;
 
 export declare function removeDeployer_alias_1(mastraEntry: string): Plugin_2;
@@ -342,4 +347,10 @@ declare type Variables = {
     playground: boolean;
 };
 
+declare function writeTelemetryConfig(entryFile: string, outputDir: string): Promise<{
+    hasCustomConfig: boolean;
+}>;
+export { writeTelemetryConfig }
+export { writeTelemetryConfig as writeTelemetryConfig_alias_1 }
+
 export { }

package/dist/build/index.d.ts

@@ -7,3 +7,4 @@ export { getWatcherInputOptions } from '../_tsup-dts-rollup.js';
 export { analyzeBundle_alias_1 as analyzeBundle } from '../_tsup-dts-rollup.js';
 export { FileService_alias_2 as FileService } from '../_tsup-dts-rollup.js';
 export { Deps_alias_2 as Deps } from '../_tsup-dts-rollup.js';
+export { writeTelemetryConfig } from '../_tsup-dts-rollup.js';

package/dist/build/index.js

@@ -1,5 +1,5 @@
-export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-I7EFK2FV.js';
-export { Deps } from '../chunk-Q3WKR6OZ.js';
+export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-VCRMX3ZD.js';
+export { Deps, writeTelemetryConfig } from '../chunk-E4D6R3B4.js';
 export { analyzeBundle } from '../chunk-ERNQNTBH.js';
 export { createBundler, getInputOptions as getBundlerInputOptions } from '../chunk-KXS4XYEJ.js';
 import '../chunk-YNXJO2XU.js';

package/dist/bundler/index.js

@@ -1,5 +1,5 @@
-export { Bundler } from '../chunk-XSSW3PB4.js';
-import '../chunk-Q3WKR6OZ.js';
+export { Bundler } from '../chunk-3MSZJSZW.js';
+import '../chunk-E4D6R3B4.js';
 import '../chunk-ERNQNTBH.js';
 import '../chunk-KXS4XYEJ.js';
 import '../chunk-YNXJO2XU.js';

package/dist/{chunk-XSSW3PB4.js → chunk-3MSZJSZW.js}

@@ -1,12 +1,13 @@
-import { Deps } from './chunk-Q3WKR6OZ.js';
+import { Deps, writeTelemetryConfig } from './chunk-E4D6R3B4.js';
 import { analyzeBundle } from './chunk-ERNQNTBH.js';
 import { createBundler, getInputOptions } from './chunk-KXS4XYEJ.js';
 import { MastraBundler } from '@mastra/core/bundler';
 import virtual from '@rollup/plugin-virtual';
-import { ensureDir } from 'fs-extra';
+import { ensureDir, copy } from 'fs-extra';
 import { existsSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import fsExtra from 'fs-extra/esm';
 
 var Bundler = class extends MastraBundler {
@@ -20,6 +21,11 @@ var Bundler = class extends MastraBundler {
     await ensureDir(join(outputDirectory, this.analyzeOutputDir));
     await ensureDir(join(outputDirectory, this.outputDir));
   }
+  async writeInstrumentationFile(outputDirectory) {
+    const instrumentationFile = join(outputDirectory, "instrumentation.mjs");
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    await copy(join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
+  }
   async writePackageJson(outputDirectory, dependencies) {
     this.logger.debug(`Writing project's package.json`);
     await ensureDir(outputDirectory);
@@ -75,13 +81,13 @@ var Bundler = class extends MastraBundler {
       "node",
       this.logger
     );
-    await this.writePackageJson(
-      join(outputDirectory, this.outputDir),
-      Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
-        acc.set(dep, "latest");
-        return acc;
-      }, /* @__PURE__ */ new Map())
-    );
+    await writeTelemetryConfig(mastraEntryFile, join(outputDirectory, this.outputDir));
+    const dependenciesToInstall = Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
+      acc.set(dep, "latest");
+      return acc;
+    }, /* @__PURE__ */ new Map());
+    await this.writePackageJson(join(outputDirectory, this.outputDir), dependenciesToInstall);
+    await this.writeInstrumentationFile(join(outputDirectory, this.outputDir));
     this.logger.info("Bundling Mastra application");
     const inputOptions = await getInputOptions(mastraEntryFile, analyzedBundleInfo, "node");
     if (isVirtual) {

package/dist/{chunk-Q3WKR6OZ.js → chunk-E4D6R3B4.js}

@@ -7,6 +7,10 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fsExtra from 'fs-extra/esm';
 import fsPromises from 'fs/promises';
+import * as babel from '@babel/core';
+import babel__default from '@babel/core';
+import { rollup } from 'rollup';
+import esbuild from 'rollup-plugin-esbuild';
 
 // src/deploy/log.ts
 var createPinoStream = (logger) => {
@@ -175,5 +179,113 @@ var Deps = class extends MastraBase {
     await fsPromises.writeFile("package.json", JSON.stringify(packageJson, null, 2));
   }
 };
+function removeAllExceptTelemetryConfig(result) {
+  let mastraClass = null;
+  const t = babel__default.types;
+  return {
+    name: "remove-all-except-telemetry-config",
+    visitor: {
+      ExportNamedDeclaration: {
+        // remove all exports
+        exit(path2) {
+          path2.remove();
+        }
+      },
+      ImportDeclaration(path2) {
+        if ((path2.node.source.value === "@mastra/core" || path2.node.source.value === "@mastra/core/mastra") && path2.node.specifiers) {
+          mastraClass = path2.node.specifiers.find(
+            // @ts-ignore - no need to type
+            (p) => p.imported?.name === "Mastra"
+          )?.local?.name ?? null;
+        }
+      },
+      NewExpression(path2) {
+        if (mastraClass && path2.node.callee.name === mastraClass) {
+          let telemetry = path2.node.arguments[0]?.properties?.find(
+            // @ts-ignore
+            (prop) => prop.key.name === "telemetry"
+          );
+          const programPath = path2.scope.getProgramParent().path;
+          if (!programPath) {
+            return;
+          }
+          if (telemetry) {
+            result.hasCustomConfig = true;
+          } else {
+            telemetry = {
+              value: t.objectExpression([])
+            };
+          }
+          const exportDeclaration = t.exportNamedDeclaration(
+            t.variableDeclaration("const", [t.variableDeclarator(t.identifier("telemetry"), telemetry.value)]),
+            []
+          );
+          programPath.node.body.push(exportDeclaration);
+        }
+      }
+    }
+  };
+}
+
+// src/build/telemetry.ts
+async function writeTelemetryConfig(entryFile, outputDir) {
+  const result = {
+    hasCustomConfig: false
+  };
+  const bundle = await rollup({
+    input: {
+      "telemetry-config": entryFile
+    },
+    treeshake: true,
+    plugins: [
+      // transpile typescript to something we understand
+      esbuild({
+        target: "node20",
+        platform: "node",
+        minify: false
+      }),
+      {
+        name: "get-telemetry-config",
+        transform(code, id) {
+          if (!this.getModuleInfo(id)?.isEntry) {
+            return;
+          }
+          return new Promise((resolve, reject) => {
+            babel.transform(
+              code,
+              {
+                babelrc: false,
+                configFile: false,
+                filename: id,
+                plugins: [removeAllExceptTelemetryConfig(result)]
+              },
+              (err, result2) => {
+                if (err) {
+                  return reject(err);
+                }
+                resolve({
+                  code: result2.code,
+                  map: result2.map
+                });
+              }
+            );
+          });
+        }
+      },
+      // let esbuild remove all unused imports
+      esbuild({
+        target: "node20",
+        platform: "node",
+        minify: false
+      })
+    ]
+  });
+  await bundle.write({
+    dir: outputDir,
+    format: "es",
+    entryFileNames: "[name].mjs"
+  });
+  return result;
+}
 
-export { Deps, createChildProcessLogger, createPinoStream };
+export { Deps, createChildProcessLogger, createPinoStream, writeTelemetryConfig };

package/dist/index.js

@@ -1,8 +1,8 @@
-import { Bundler } from './chunk-XSSW3PB4.js';
-import { FileService } from './chunk-I7EFK2FV.js';
-export { FileService, getBundler, getWatcher } from './chunk-I7EFK2FV.js';
-import { Deps } from './chunk-Q3WKR6OZ.js';
-export { Deps, createChildProcessLogger, createPinoStream } from './chunk-Q3WKR6OZ.js';
+import { FileService } from './chunk-VCRMX3ZD.js';
+export { FileService, getBundler, getWatcher } from './chunk-VCRMX3ZD.js';
+import { Bundler } from './chunk-3MSZJSZW.js';
+import { Deps } from './chunk-E4D6R3B4.js';
+export { Deps, createChildProcessLogger, createPinoStream } from './chunk-E4D6R3B4.js';
 import './chunk-ERNQNTBH.js';
 import './chunk-KXS4XYEJ.js';
 import './chunk-YNXJO2XU.js';

package/dist/templates/instrumentation-template.js

@@ -0,0 +1,85 @@
+import {
+  NodeSDK, getNodeAutoInstrumentations, ATTR_SERVICE_NAME, Resource,
+  ParentBasedSampler,
+  TraceIdRatioBasedSampler,
+  AlwaysOnSampler,
+  AlwaysOffSampler,
+} from '@mastra/core/telemetry/otel-vendor';
+import { OTLPStorageExporter } from '@mastra/core/telemetry'
+import { MastraStorageLibSql } from '@mastra/core/storage'
+import { createLogger } from '@mastra/core/logger'
+import { telemetry } from './telemetry-config.mjs'
+
+
+function getSampler(config) {
+  if (!config.sampling) {
+    return new AlwaysOnSampler();
+  }
+
+  if (!config.enabled) {
+    return new AlwaysOffSampler();
+  }
+
+  switch (config.sampling.type) {
+    case 'ratio':
+      return new TraceIdRatioBasedSampler(config.sampling.probability);
+    case 'always_on':
+      return new AlwaysOnSampler();
+    case 'always_off':
+      return new AlwaysOffSampler();
+    case 'parent_based':
+      const rootSampler = new TraceIdRatioBasedSampler(config.sampling.root?.probability || 1.0);
+      return new ParentBasedSampler({ root: rootSampler });
+    default:
+      return new AlwaysOnSampler();
+  }
+
+}
+
+async function getExporter(config) {
+  if (config.export?.type === 'otlp') {
+    return new OTLPHttpExporter({
+      url: config.export.endpoint,
+      headers: config.export.headers,
+    })
+  } else if (config.export?.type === 'custom') {
+    return config.export.exporter
+  } else {
+    const storage = new MastraStorageLibSql({
+      config: {
+        // file lives in ./.mastra/output, and we need to write to ./.mastra/mastra.db
+        url: "file:../mastra.db",
+      },
+    })
+    await storage.init()
+
+    return new OTLPStorageExporter({
+      logger: createLogger({
+        name: 'telemetry',
+        level: 'silent',
+      }),
+      storage,
+    })
+  }
+}
+
+const sampler = getSampler(telemetry);
+const exporter = await getExporter(telemetry);
+
+const sdk = new NodeSDK({
+  resource: new Resource({
+    [ATTR_SERVICE_NAME]: telemetry.serviceName || 'default-service',
+  }),
+  sampler,
+  traceExporter: exporter,
+  instrumentations: [getNodeAutoInstrumentations()],
+});
+
+sdk.start();
+
+// gracefully shut down the SDK on process exit
+process.on('SIGTERM', () => {
+  sdk.shutdown().catch(() => {
+    // do nothing
+  })
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer",
-  "version": "0.1.0-alpha.61",
+  "version": "0.1.0-alpha.62",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,7 @@
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-node-externals": "^8.0.0",
     "zod": "^3.24.1",
-    "@mastra/core": "^0.2.0-alpha.109"
+    "@mastra/core": "^0.2.0-alpha.110"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.7",
@@ -73,7 +73,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "scripts": {
-    "build": "tsup src/index.ts src/build/index.ts src/server/index.ts src/build/bundler.ts src/build/analyze.ts src/bundler/index.ts --format esm --clean --experimental-dts --treeshake",
+    "build": "tsup src/index.ts src/build/index.ts src/server/index.ts src/build/bundler.ts src/build/analyze.ts src/bundler/index.ts --format esm --clean --experimental-dts --treeshake --publicDir",
     "build:watch": "pnpm build --watch",
     "pull:openapispec": "node src/server/openapi.script.js",
     "test": "vitest run"

package/public/templates/instrumentation-template.js

@@ -0,0 +1,85 @@
+import {
+  NodeSDK, getNodeAutoInstrumentations, ATTR_SERVICE_NAME, Resource,
+  ParentBasedSampler,
+  TraceIdRatioBasedSampler,
+  AlwaysOnSampler,
+  AlwaysOffSampler,
+} from '@mastra/core/telemetry/otel-vendor';
+import { OTLPStorageExporter } from '@mastra/core/telemetry'
+import { MastraStorageLibSql } from '@mastra/core/storage'
+import { createLogger } from '@mastra/core/logger'
+import { telemetry } from './telemetry-config.mjs'
+
+
+function getSampler(config) {
+  if (!config.sampling) {
+    return new AlwaysOnSampler();
+  }
+
+  if (!config.enabled) {
+    return new AlwaysOffSampler();
+  }
+
+  switch (config.sampling.type) {
+    case 'ratio':
+      return new TraceIdRatioBasedSampler(config.sampling.probability);
+    case 'always_on':
+      return new AlwaysOnSampler();
+    case 'always_off':
+      return new AlwaysOffSampler();
+    case 'parent_based':
+      const rootSampler = new TraceIdRatioBasedSampler(config.sampling.root?.probability || 1.0);
+      return new ParentBasedSampler({ root: rootSampler });
+    default:
+      return new AlwaysOnSampler();
+  }
+
+}
+
+async function getExporter(config) {
+  if (config.export?.type === 'otlp') {
+    return new OTLPHttpExporter({
+      url: config.export.endpoint,
+      headers: config.export.headers,
+    })
+  } else if (config.export?.type === 'custom') {
+    return config.export.exporter
+  } else {
+    const storage = new MastraStorageLibSql({
+      config: {
+        // file lives in ./.mastra/output, and we need to write to ./.mastra/mastra.db
+        url: "file:../mastra.db",
+      },
+    })
+    await storage.init()
+
+    return new OTLPStorageExporter({
+      logger: createLogger({
+        name: 'telemetry',
+        level: 'silent',
+      }),
+      storage,
+    })
+  }
+}
+
+const sampler = getSampler(telemetry);
+const exporter = await getExporter(telemetry);
+
+const sdk = new NodeSDK({
+  resource: new Resource({
+    [ATTR_SERVICE_NAME]: telemetry.serviceName || 'default-service',
+  }),
+  sampler,
+  traceExporter: exporter,
+  instrumentations: [getNodeAutoInstrumentations()],
+});
+
+sdk.start();
+
+// gracefully shut down the SDK on process exit
+process.on('SIGTERM', () => {
+  sdk.shutdown().catch(() => {
+    // do nothing
+  })
+});

package/src/build/babel/get-telemetry-config.ts

@@ -0,0 +1,62 @@
+import babel from '@babel/core';
+
+export function removeAllExceptTelemetryConfig(result: { hasCustomConfig: boolean }) {
+  let mastraClass: string | null = null;
+
+  const t = babel.types;
+
+  return {
+    name: 'remove-all-except-telemetry-config',
+    visitor: {
+      ExportNamedDeclaration: {
+        // remove all exports
+        exit(path) {
+          path.remove();
+        },
+      },
+      ImportDeclaration(path) {
+        if (
+          (path.node.source.value === '@mastra/core' || path.node.source.value === '@mastra/core/mastra') &&
+          path.node.specifiers
+        ) {
+          mastraClass =
+            path.node.specifiers.find(
+              // @ts-ignore - no need to type
+              p => p.imported?.name === 'Mastra',
+            )?.local?.name ?? null;
+        }
+      },
+      NewExpression(path) {
+        if (mastraClass && (path.node.callee as babel.types.Identifier).name === mastraClass) {
+          // @ts-ignore
+          let telemetry = path.node.arguments[0]?.properties?.find(
+            // @ts-ignore
+            prop => prop.key.name === 'telemetry',
+          );
+
+          const programPath = path.scope.getProgramParent().path;
+          if (!programPath) {
+            return;
+          }
+
+          if (telemetry) {
+            result.hasCustomConfig = true;
+          } else {
+            telemetry = {
+              value: t.objectExpression([]),
+            };
+          }
+
+          // add the deployer export
+          const exportDeclaration = t.exportNamedDeclaration(
+            t.variableDeclaration('const', [t.variableDeclarator(t.identifier('telemetry'), telemetry.value)]),
+            [],
+          );
+
+          // @ts-ignore
+          programPath.node.body.push(exportDeclaration);
+        }
+      },
+    },
+  } as babel.PluginObj;
+}

package/src/build/index.ts

@@ -4,3 +4,4 @@ export { createWatcher, getInputOptions as getWatcherInputOptions } from './watc
 export { analyzeBundle } from './analyze';
 export { FileService } from './fs';
 export { Deps } from './deps';
+export { writeTelemetryConfig } from './telemetry';

package/src/build/telemetry.ts

@@ -0,0 +1,76 @@
+import * as babel from '@babel/core';
+import type { MastraDeployer } from '@mastra/core';
+import { rollup } from 'rollup';
+import esbuild from 'rollup-plugin-esbuild';
+
+import { removeAllExceptTelemetryConfig } from './babel/get-telemetry-config';
+
+export async function writeTelemetryConfig(
+  entryFile: string,
+  outputDir: string,
+): Promise<{
+  hasCustomConfig: boolean;
+}> {
+  const result = {
+    hasCustomConfig: false,
+  };
+
+  const bundle = await rollup({
+    input: {
+      'telemetry-config': entryFile,
+    },
+    treeshake: true,
+    plugins: [
+      // transpile typescript to something we understand
+      esbuild({
+        target: 'node20',
+        platform: 'node',
+        minify: false,
+      }),
+      {
+        name: 'get-telemetry-config',
+        transform(code, id) {
+          if (!this.getModuleInfo(id)?.isEntry) {
+            return;
+          }
+
+          return new Promise((resolve, reject) => {
+            babel.transform(
+              code,
+              {
+                babelrc: false,
+                configFile: false,
+                filename: id,
+                plugins: [removeAllExceptTelemetryConfig(result)],
+              },
+              (err, result) => {
+                if (err) {
+                  return reject(err);
+                }
+
+                resolve({
+                  code: result!.code!,
+                  map: result!.map!,
+                });
+              },
+            );
+          });
+        },
+      },
+      // let esbuild remove all unused imports
+      esbuild({
+        target: 'node20',
+        platform: 'node',
+        minify: false,
+      }),
+    ],
+  });
+
+  await bundle.write({
+    dir: outputDir,
+    format: 'es',
+    entryFileNames: '[name].mjs',
+  });
+
+  return result;
+}

package/src/bundler/index.ts

@@ -1,9 +1,10 @@
 import { MastraBundler } from '@mastra/core/bundler';
 import virtual from '@rollup/plugin-virtual';
-import { ensureDir } from 'fs-extra';
+import { copy, ensureDir } from 'fs-extra';
 import { existsSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import type { InputOptions, OutputOptions } from 'rollup';
 
 import fsExtra from 'fs-extra/esm';
@@ -11,6 +12,7 @@ import fsExtra from 'fs-extra/esm';
 import { analyzeBundle } from '../build/analyze';
 import { createBundler as createBundlerUtil, getInputOptions } from '../build/bundler';
 import { Deps } from '../build/deps';
+import { writeTelemetryConfig } from '../build/telemetry';
 
 export abstract class Bundler extends MastraBundler {
   protected analyzeOutputDir = '.build';
@@ -28,6 +30,13 @@ export abstract class Bundler extends MastraBundler {
     await ensureDir(join(outputDirectory, this.outputDir));
   }
 
+  async writeInstrumentationFile(outputDirectory: string) {
+    const instrumentationFile = join(outputDirectory, 'instrumentation.mjs');
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+
+    await copy(join(__dirname, 'templates', 'instrumentation-template.js'), instrumentationFile);
+  }
+
   async writePackageJson(outputDirectory: string, dependencies: Map<string, string>) {
     this.logger.debug(`Writing project's package.json`);
     await ensureDir(outputDirectory);
@@ -97,13 +106,15 @@ export abstract class Bundler extends MastraBundler {
       this.logger,
     );
 
-    await this.writePackageJson(
-      join(outputDirectory, this.outputDir),
-      Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
-        acc.set(dep, 'latest');
-        return acc;
-      }, new Map<string, string>()),
-    );
+    await writeTelemetryConfig(mastraEntryFile, join(outputDirectory, this.outputDir));
+
+    const dependenciesToInstall = Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
+      acc.set(dep, 'latest');
+      return acc;
+    }, new Map<string, string>());
+
+    await this.writePackageJson(join(outputDirectory, this.outputDir), dependenciesToInstall);
+    await this.writeInstrumentationFile(join(outputDirectory, this.outputDir));
 
     this.logger.info('Bundling Mastra application');
     const inputOptions: InputOptions = await getInputOptions(mastraEntryFile, analyzedBundleInfo, 'node');