@superblocksteam/sdk 2.0.83 → 2.0.84-next.0

package/src/dev-utils/dev-server.mts

@@ -536,145 +536,167 @@ async function startVite({
   dispose: () => void;
   routeIndex: number;
 }> {
-  const logger = getLogger(loggerOverride);
-  logger.info("Creating dev server...");
-  const viteLogger = createLogger();
-  viteLogger.info = (msg: string) => logger.info(msg);
-  viteLogger.warn = (msg: string) => {
-    logger.warn(msg);
-  };
-  viteLogger.warnOnce = (msg: string) => {
-    logger.warn(msg);
-  };
-  viteLogger.error = (msg: string) => {
-    logger.error(msg);
-  };
-
-  viteLogger.clearScreen = () => {};
+  return tracer.startActiveSpan("startVite", async (startViteSpan) => {
+    try {
+      const logger = getLogger(loggerOverride);
+      logger.info("Creating dev server...");
+      const viteLogger = createLogger();
+      viteLogger.info = (msg: string) => logger.info(msg);
+      viteLogger.warn = (msg: string) => {
+        logger.warn(msg);
+      };
+      viteLogger.warnOnce = (msg: string) => {
+        logger.warn(msg);
+      };
+      viteLogger.error = (msg: string) => {
+        logger.error(msg);
+      };
 
-  const isCustomBuildEnabled = await isCustomComponentsEnabled();
-  logger.debug(
-    `Custom components ${isCustomBuildEnabled ? "enabled" : "disabled"}`,
-  );
-  const customFolder = path.join(root, "custom");
-  const draftsFolder = path.join(root, ".superblocks");
+      viteLogger.clearScreen = () => {};
 
-  const env = loadEnv(mode, root, "");
+      const isCustomBuildEnabled = await isCustomComponentsEnabled();
+      logger.debug(
+        `Custom components ${isCustomBuildEnabled ? "enabled" : "disabled"}`,
+      );
+      const customFolder = path.join(root, "custom");
+      const draftsFolder = path.join(root, ".superblocks");
 
-  const hmrPort = await getFreePort();
-  logger.debug(`Allocated HMR port: ${hmrPort}`);
+      const env = loadEnv(mode, root, "");
 
-  const hmrOptions: HmrOptions = {
-    port: hmrPort,
-    clientPort: port,
-    server: httpServer,
-    overlay: false,
-  };
+      const hmrPort = await getFreePort();
+      logger.debug(`Allocated HMR port: ${hmrPort}`);
 
-  // https://codesandbox.io/docs/learn/environment/preview-urls#using-environment-variables
-  if (process.env.CSB_BASE_PREVIEW_HOST) {
-    const hmrHost = `${os.hostname()}-${port}.${process.env.CSB_BASE_PREVIEW_HOST}`;
-    hmrOptions.host = hmrHost;
-    hmrOptions.clientPort = 443; // tells client to use default ssl port
-    logger.debug(
-      `CSB environment detected, HMR configured for host: ${hmrHost}`,
-    );
-  }
+      const hmrOptions: HmrOptions = {
+        port: hmrPort,
+        clientPort: port,
+        server: httpServer,
+        overlay: false,
+      };
 
-  if (process.env.SABS_LIVE_EDIT_HOSTNAME) {
-    hmrOptions.host = process.env.SABS_LIVE_EDIT_HOSTNAME;
-    hmrOptions.clientPort = 443; // tells client to use default ssl port
-    logger.debug(
-      `SABS environment detected, HMR configured for host: ${hmrOptions.host}`,
-    );
-  }
+      // https://codesandbox.io/docs/learn/environment/preview-urls#using-environment-variables
+      if (process.env.CSB_BASE_PREVIEW_HOST) {
+        const hmrHost = `${os.hostname()}-${port}.${process.env.CSB_BASE_PREVIEW_HOST}`;
+        hmrOptions.host = hmrHost;
+        hmrOptions.clientPort = 443; // tells client to use default ssl port
+        logger.debug(
+          `CSB environment detected, HMR configured for host: ${hmrHost}`,
+        );
+      }
 
-  const fileSyncPluginCreator = fileSyncVitePlugin(
-    {
-      fsOperationQueue,
-      syncService,
-      lockService,
-      aiService,
-      httpServer,
-      checkAuthorization,
-      tracer,
-      logger,
-      features,
-    },
-    { isCustomBuildEnabled },
-  );
+      if (process.env.SABS_LIVE_EDIT_HOSTNAME) {
+        hmrOptions.host = process.env.SABS_LIVE_EDIT_HOSTNAME;
+        hmrOptions.clientPort = 443; // tells client to use default ssl port
+        logger.debug(
+          `SABS environment detected, HMR configured for host: ${hmrOptions.host}`,
+        );
+      }
 
-  logger.debug("Configuring dev server with plugins and options");
-  const viteServer = await createServer({
-    root,
-    mode,
-    clearScreen: process.env.SUPERBLOCKS_CLI_ENV !== "local",
-    customLogger: viteLogger,
-    server: {
-      middlewareMode: true,
-      watch: {
-        ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
-      },
-      hmr: hmrOptions,
-      cors: {
-        origin: true,
-        credentials: true,
-      },
-    },
-    build: {
-      rollupOptions: {
-        external: [`${customFolder}/**/*`],
-      },
-    },
-    define: {
-      // this replaces a string in @superblocksteam/shared
-      "process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL": process.env
-        .SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL
-        ? JSON.stringify(process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL)
-        : "undefined",
-    },
-    plugins: [
-      tsconfigPaths(),
-      customComponentsPlugin(),
-      fileSyncPluginCreator.plugin,
-      // Add a virtual "stub" module for the build manifest
-      buildManifestStubPlugin(),
-      react({
-        babel: {
-          plugins: [
-            // We will bring this back later
-            // "babel-plugin-react-compiler",
-            [
-              import.meta.resolve("@babel/plugin-proposal-decorators"),
-              {
-                version: "2023-11",
+      const fileSyncPluginCreator = fileSyncVitePlugin(
+        {
+          fsOperationQueue,
+          syncService,
+          lockService,
+          aiService,
+          httpServer,
+          checkAuthorization,
+          tracer,
+          logger,
+          features,
+        },
+        { isCustomBuildEnabled },
+      );
+
+      logger.debug("Configuring dev server with plugins and options");
+      const viteServer = await tracer.startActiveSpan(
+        "viteCreateServer",
+        async (viteCreateSpan) => {
+          try {
+            const server = await createServer({
+              root,
+              mode,
+              clearScreen: process.env.SUPERBLOCKS_CLI_ENV !== "local",
+              customLogger: viteLogger,
+              server: {
+                middlewareMode: true,
+                watch: {
+                  ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
+                },
+                hmr: hmrOptions,
+                cors: {
+                  origin: true,
+                  credentials: true,
+                },
+              },
+              build: {
+                rollupOptions: {
+                  external: [`${customFolder}/**/*`],
+                },
               },
-            ],
-          ],
+              define: {
+                // this replaces a string in @superblocksteam/shared
+                "process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL": process
+                  .env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL
+                  ? JSON.stringify(
+                      process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL,
+                    )
+                  : "undefined",
+              },
+              plugins: [
+                tsconfigPaths(),
+                customComponentsPlugin(),
+                fileSyncPluginCreator.plugin,
+                // Add a virtual "stub" module for the build manifest
+                buildManifestStubPlugin(),
+                react({
+                  babel: {
+                    plugins: [
+                      // We will bring this back later
+                      // "babel-plugin-react-compiler",
+                      [
+                        import.meta
+                          .resolve("@babel/plugin-proposal-decorators"),
+                        {
+                          version: "2023-11",
+                        },
+                      ],
+                    ],
+                  },
+                }),
+                createLucideReactImportOptimizer(),
+                ddRumPlugin({
+                  clientToken: env.SUPERBLOCKS_LIBRARY_DD_CLIENT_TOKEN ?? "",
+                  applicationId:
+                    env.SUPERBLOCKS_LIBRARY_DD_APPLICATION_ID ?? "",
+                  env: env.SUPERBLOCKS_LIBRARY_ENV ?? "prod",
+                  // TODO: This version refers to the LIBRARY version for Datadog RUM, not the CLI version.
+                  // CLI auto-upgrade still works - the caching changes in this PR only affect detection speed.
+                  // Replace with dynamic library version injection once available.
+                  version: "1.0.0",
+                }),
+              ],
+            });
+            return server;
+          } finally {
+            viteCreateSpan.end();
+          }
         },
-      }),
-      createLucideReactImportOptimizer(),
-      ddRumPlugin({
-        clientToken: env.SUPERBLOCKS_LIBRARY_DD_CLIENT_TOKEN ?? "",
-        applicationId: env.SUPERBLOCKS_LIBRARY_DD_APPLICATION_ID ?? "",
-        env: env.SUPERBLOCKS_LIBRARY_ENV ?? "prod",
-        // TODO: Version should be injected from the library. Replace once we have the autoupgrade feature.
-        version: "1.0.0",
-      }),
-    ],
-  });
+      );
 
-  const routeIndex = (app._router as IRouter).stack.length;
-  app.use(viteServer.middlewares);
-  logger.info("Dev server created and middleware attached successfully");
+      const routeIndex = (app._router as IRouter).stack.length;
+      app.use(viteServer.middlewares);
+      logger.info("Dev server created and middleware attached successfully");
 
-  return {
-    viteServer,
-    routeIndex,
-    dispose: () => {
-      fileSyncPluginCreator.dispose();
-    },
-  };
+      return {
+        viteServer,
+        routeIndex,
+        dispose: () => {
+          fileSyncPluginCreator.dispose();
+        },
+      };
+    } finally {
+      startViteSpan.end();
+    }
+  });
 }
 
 const DEFAULT_HMR_PORT = 24678;

package/src/telemetry/index.test.ts

@@ -0,0 +1,130 @@
+import {
+  describe,
+  it,
+  expect,
+  vi,
+  beforeAll,
+  afterAll,
+  beforeEach,
+} from "vitest";
+
+// Set environment variables before any imports
+process.env.OTEL_SDK_DISABLED = "true";
+process.env.SUPERBLOCKS_DEPLOYMENT_TYPE = "";
+
+// Mock dd-trace before importing the module under test
+vi.mock("dd-trace", () => ({
+  default: {
+    init: vi.fn(),
+    llmobs: { enabled: false },
+  },
+}));
+
+// Mock getConfiguration to avoid needing real credentials
+vi.mock("./util.js", () => ({
+  SERVICE_NAME: "sdk-dev-server",
+  getConfiguration: vi.fn().mockResolvedValue({
+    superblocksBaseUrl: new URL("https://app.superblocks.com"),
+    otlpBaseUrl: "https://app.superblocks.com/api",
+    superblocksHostname: "app.superblocks.com",
+    serviceName: "sdk-dev-server",
+    token: "test1234",
+  }),
+}));
+
+// Mock the logging module
+vi.mock("./logging.js", () => ({
+  getLogger: vi.fn().mockReturnValue({
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  }),
+}));
+
+// Import type for module shape
+import type * as TelemetryModule from "./index.js";
+
+describe("CLI SDK Telemetry Integration", () => {
+  let telemetryModule: typeof TelemetryModule;
+
+  beforeAll(async () => {
+    // Dynamic import after mocks are set up
+    telemetryModule = await import("./index.js");
+  });
+
+  afterAll(async () => {
+    // Clean up telemetry
+    const { resetTelemetry, isTelemetryInitialized, getTelemetryInstance } =
+      await import("@superblocksteam/telemetry");
+    if (isTelemetryInitialized()) {
+      await getTelemetryInstance().shutdown();
+      resetTelemetry();
+    }
+  });
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("configureTelemetry", () => {
+    it("successfully initializes telemetry", async () => {
+      const { isTelemetryInitialized } =
+        await import("@superblocksteam/telemetry");
+
+      await telemetryModule.configureTelemetry();
+
+      expect(isTelemetryInitialized()).toBe(true);
+    });
+
+    it("initializes dd-trace for LLMObs", async () => {
+      const ddTrace = await import("dd-trace");
+
+      await telemetryModule.configureTelemetry();
+
+      expect(ddTrace.default.init).toHaveBeenCalled();
+    });
+  });
+
+  describe("getTracer", () => {
+    it("returns working tracer after initialization", async () => {
+      await telemetryModule.configureTelemetry();
+
+      const tracer = telemetryModule.getTracer();
+
+      expect(tracer).toBeDefined();
+      expect(typeof tracer.startSpan).toBe("function");
+    });
+
+    it("can create spans", async () => {
+      await telemetryModule.configureTelemetry();
+      const tracer = telemetryModule.getTracer();
+
+      const span = tracer.startSpan("test-span");
+
+      expect(span).toBeDefined();
+      span.end();
+    });
+  });
+
+  describe("getLogger", () => {
+    it("returns working logger after initialization", async () => {
+      await telemetryModule.configureTelemetry();
+
+      const logger = telemetryModule.getLogger();
+
+      expect(logger).toBeDefined();
+      expect(typeof logger.emit).toBe("function");
+    });
+  });
+
+  describe("deploymentType", () => {
+    it("exports deploymentType constant", () => {
+      expect(telemetryModule.deploymentType).toBeDefined();
+    });
+
+    it("exports isCloudPrem constant", () => {
+      expect(typeof telemetryModule.isCloudPrem).toBe("boolean");
+    });
+  });
+});