@superblocksteam/sdk 2.0.83-next.1 → 2.0.83

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

@@ -536,167 +536,145 @@ async function startVite({
   dispose: () => void;
   routeIndex: number;
 }> {
-  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 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 = () => {};
+  viteLogger.clearScreen = () => {};
 
-      const isCustomBuildEnabled = await isCustomComponentsEnabled();
-      logger.debug(
-        `Custom components ${isCustomBuildEnabled ? "enabled" : "disabled"}`,
-      );
-      const customFolder = path.join(root, "custom");
-      const draftsFolder = path.join(root, ".superblocks");
+  const isCustomBuildEnabled = await isCustomComponentsEnabled();
+  logger.debug(
+    `Custom components ${isCustomBuildEnabled ? "enabled" : "disabled"}`,
+  );
+  const customFolder = path.join(root, "custom");
+  const draftsFolder = path.join(root, ".superblocks");
 
-      const env = loadEnv(mode, root, "");
+  const env = loadEnv(mode, root, "");
 
-      const hmrPort = await getFreePort();
-      logger.debug(`Allocated HMR port: ${hmrPort}`);
+  const hmrPort = await getFreePort();
+  logger.debug(`Allocated HMR port: ${hmrPort}`);
 
-      const hmrOptions: HmrOptions = {
-        port: hmrPort,
-        clientPort: port,
-        server: httpServer,
-        overlay: false,
-      };
+  const hmrOptions: HmrOptions = {
+    port: hmrPort,
+    clientPort: port,
+    server: httpServer,
+    overlay: false,
+  };
 
-      // 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}`,
-        );
-      }
+  // 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}`,
+    );
+  }
 
-      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}`,
-        );
-      }
+  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}`,
+    );
+  }
 
-      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",
+  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 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",
               },
-              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();
-        },
-      };
-    } finally {
-      startViteSpan.end();
-    }
-  });
+  return {
+    viteServer,
+    routeIndex,
+    dispose: () => {
+      fileSyncPluginCreator.dispose();
+    },
+  };
 }
 
 const DEFAULT_HMR_PORT = 24678;

package/src/telemetry/index.ts

@@ -1,8 +1,16 @@
 import os from "node:os";
-import { trace, type Tracer } from "@opentelemetry/api";
-import { logs, type Logger } from "@opentelemetry/api-logs";
+import { logs as logsAPI } from "@opentelemetry/api-logs";
+import { AsyncLocalStorageContextManager } from "@opentelemetry/context-async-hooks";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
 import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { Resource } from "@opentelemetry/resources";
+import { NodeSDK, logs, api } from "@opentelemetry/sdk-node";
+import {
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
+} from "@opentelemetry/semantic-conventions";
 import {
   DeploymentTypeEnum,
   OBS_TAG_APPLICATION_ID,
@@ -10,18 +18,10 @@ import {
   OBS_TAG_ORG_ID,
   OBS_TAG_USER_EMAIL,
 } from "@superblocksteam/shared";
-import {
-  initNodeTelemetry,
-  getTelemetryInstance,
-  isTelemetryInitialized,
-  parseDeploymentType,
-  resetTelemetry,
-  getDefaultPolicy,
-} from "@superblocksteam/telemetry";
-// Note: dd-trace kept for LLMObs until Epic 07 completes
 import ddTrace from "dd-trace";
 import packageJson from "../../package.json" with { type: "json" };
 import {
+  ATTR_DEPLOYMENT_ENVIRONMENT,
   ATTR_SUPERBLOCKS_BASE_URL,
   ATTR_SUPERBLOCKS_CLI_TOKEN,
   ATTR_SUPERBLOCKS_CSB_ID,
@@ -29,34 +29,44 @@ import {
   ATTR_SUPERBLOCKS_USER_ID,
   getEnvironmentFromHostname,
 } from "./attributes.js";
-import { applyLocalObsEnvVars, isLocalObsEnabled } from "./local-obs.js";
 import { getLogger as getStandardLogger } from "./logging.js";
 import { getConfiguration, SERVICE_NAME } from "./util.js";
 import type { ApplicationConfigWithTokenConfigAndUserInfo } from "../types/index.js";
+import type { Tracer } from "@opentelemetry/api";
+import type { Logger } from "@opentelemetry/api-logs";
 
-// Apply local observability env vars early, before dd-trace auto-init
-applyLocalObsEnvVars();
-
-// Configuration state
-let config: Awaited<ReturnType<typeof getConfiguration>> | undefined =
-  undefined;
+let config = undefined;
 let configured = false;
+let sdkInstance: NodeSDK | undefined = undefined;
 
 /**
- * Current deployment type based on SUPERBLOCKS_DEPLOYMENT_TYPE env var.
- * Defaults to CLOUD if not specified or invalid.
+ * Validate and return a valid DeploymentTypeEnum value.
+ * Returns CLOUD if not specified or if an invalid value is provided.
  */
-export const deploymentType = (() => {
-  try {
-    return parseDeploymentType(process.env.SUPERBLOCKS_DEPLOYMENT_TYPE);
-  } catch (error) {
+function getValidDeploymentType(value: string | undefined): DeploymentTypeEnum {
+  if (!value || value === "") {
+    return DeploymentTypeEnum.CLOUD;
+  }
+  if (
+    !Object.values(DeploymentTypeEnum).includes(value as DeploymentTypeEnum)
+  ) {
     console.warn(
-      "[Telemetry] Invalid SUPERBLOCKS_DEPLOYMENT_TYPE, defaulting to CLOUD:",
-      error,
+      `Invalid SUPERBLOCKS_DEPLOYMENT_TYPE: "${value}". ` +
+        `Valid values are: ${Object.values(DeploymentTypeEnum).join(", ")}. ` +
+        `Defaulting to "${DeploymentTypeEnum.CLOUD}".`,
     );
     return DeploymentTypeEnum.CLOUD;
   }
-})();
+  return value as DeploymentTypeEnum;
+}
+
+/**
+ * Current deployment type based on SUPERBLOCKS_DEPLOYMENT_TYPE env var.
+ * Defaults to CLOUD if not specified. Throws if an invalid value is provided.
+ */
+export const deploymentType = getValidDeploymentType(
+  process.env.SUPERBLOCKS_DEPLOYMENT_TYPE,
+);
 
 /**
  * Whether the current deployment is CLOUD_PREM.
@@ -67,21 +77,16 @@ export const deploymentType = (() => {
 export const isCloudPrem = deploymentType === DeploymentTypeEnum.CLOUD_PREM;
 
 async function shutdownTelemetry(): Promise<void> {
-  if (isTelemetryInitialized()) {
-    try {
-      await getTelemetryInstance().shutdown();
-    } catch (error) {
-      console.error("Error during telemetry shutdown:", error);
-    } finally {
-      resetTelemetry();
-      configured = false;
-    }
+  if (sdkInstance) {
+    await sdkInstance.shutdown();
+    sdkInstance = undefined;
+    configured = false;
   }
 }
 
 export async function configureTelemetry(
   applicationConfig?: ApplicationConfigWithTokenConfigAndUserInfo,
-): Promise<boolean> {
+) {
   const logger = getStandardLogger();
   if (configured) {
     await shutdownTelemetry();
@@ -94,28 +99,21 @@ export async function configureTelemetry(
   } catch (error) {
     console.error(error);
     configured = false;
-    return false;
+    return;
   }
 
   logger.info(
     `[INIT] Initializing telemetry for service ${config.serviceName} at Superblocks instance ${config.superblocksHostname}`,
   );
 
-  // Check for local observability mode (SUPERBLOCKS_LOCAL_OBS=true)
-  const isLocalObs = isLocalObsEnabled();
-
-  // Allow env var override for local development testing (AGENT-1048)
-  // Local obs mode always enables LLMObs
   const llmobsEnabled =
-    isLocalObs ||
-    process.env.SUPERBLOCKS_LLMOBS_ENABLED === "true" ||
-    (applicationConfig?.featureFlags.devServerLlmobsEnabled() ?? false);
+    applicationConfig?.featureFlags.devServerLlmobsEnabled() ?? false;
 
   logger.debug(
-    `[INIT] superblocks.dev-server.llmobs.enabled=${llmobsEnabled} (localObs=${isLocalObs}) for service ${config.serviceName}`,
+    `[INIT] superblocks.dev-server.llmobs.enabled=${llmobsEnabled} for service ${config.serviceName}`,
   );
 
-  // Configure dd-trace for LLMObs (migrated to OTEL in Epic 07)
+  // Configure dd-trace for APM and LLM tracing
   process.env.DD_SITE = "datadoghq.com";
   // stop ddTrace from trying to get remote configuration
   process.env.DD_REMOTE_CONFIGURATION_ENABLED = "false";
@@ -151,68 +149,48 @@ export async function configureTelemetry(
     } for service ${config.serviceName}`,
   );
 
-  // Configure OpenTelemetry for APM traces and logs via shared telemetry package
-  const policy = getDefaultPolicy(deploymentType);
-
-  try {
-    initNodeTelemetry(
-      {
-        serviceName: config.serviceName,
-        serviceVersion: packageJson.version,
-        environment: getEnvironmentFromHostname(config.superblocksHostname),
-        otlpUrl: config.otlpBaseUrl,
-        resourceAttributes: {
-          [ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
-          [ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
-          [ATTR_SUPERBLOCKS_IS_CSB]: String(!!process.env.SUPERBLOCKS_IS_CSB),
-          ...(process.env.SUPERBLOCKS_IS_CSB && {
-            [ATTR_SUPERBLOCKS_CSB_ID]: os.hostname(),
-          }),
-          ...(applicationConfig?.id && {
-            [OBS_TAG_APPLICATION_ID]: applicationConfig.id,
-          }),
-          ...(applicationConfig?.branchName && {
-            [OBS_TAG_BRANCH]: applicationConfig.branchName,
-          }),
-          ...(applicationConfig?.userEmail && {
-            [OBS_TAG_USER_EMAIL]: applicationConfig.userEmail,
-          }),
-          ...(applicationConfig?.userId && {
-            [ATTR_SUPERBLOCKS_USER_ID]: applicationConfig.userId,
-          }),
-          ...(applicationConfig?.organizationId && {
-            [OBS_TAG_ORG_ID]: applicationConfig.organizationId,
-          }),
-        },
-        instrumentations: [
-          new HttpInstrumentation(),
-          new ExpressInstrumentation(),
-        ],
-        logsEnabled: true,
-      },
-      policy,
-    );
-  } catch (error) {
-    console.error("[Telemetry] Failed to initialize OpenTelemetry:", error);
-    configured = false;
-    return false;
-  }
+  // Configure OpenTelemetry for APM traces and logs
+  sdkInstance = new NodeSDK({
+    resource: Resource.default().merge(
+      new Resource({
+        [ATTR_SERVICE_NAME]: config.serviceName,
+        [ATTR_SERVICE_VERSION]: packageJson.version,
+        [ATTR_DEPLOYMENT_ENVIRONMENT]: getEnvironmentFromHostname(
+          config.superblocksHostname,
+        ),
+        [ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
+        [ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
+        [ATTR_SUPERBLOCKS_IS_CSB]: !!process.env.SUPERBLOCKS_IS_CSB,
+        [ATTR_SUPERBLOCKS_CSB_ID]: process.env.SUPERBLOCKS_IS_CSB
+          ? os.hostname()
+          : undefined,
+        [OBS_TAG_APPLICATION_ID]: applicationConfig?.id,
+        [OBS_TAG_BRANCH]: applicationConfig?.branchName,
+        [OBS_TAG_USER_EMAIL]: applicationConfig?.userEmail,
+        [ATTR_SUPERBLOCKS_USER_ID]: applicationConfig?.userId,
+        [OBS_TAG_ORG_ID]: applicationConfig?.organizationId,
+      }),
+    ),
+    // APM traces exported via OTEL
+    traceExporter: new OTLPTraceExporter({
+      url: config.superblocksTracesUrl,
+    }),
+    logRecordProcessors: [
+      new logs.SimpleLogRecordProcessor(
+        new OTLPLogExporter({ url: config.superblocksLogsUrl }),
+      ),
+    ],
+    contextManager: new AsyncLocalStorageContextManager(),
+    instrumentations: [new HttpInstrumentation(), new ExpressInstrumentation()],
+  });
 
-  return true;
+  sdkInstance.start();
 }
 
 export function getLogger(): Logger {
-  if (isTelemetryInitialized()) {
-    return getTelemetryInstance().getLogger(SERVICE_NAME);
-  }
-  // Fallback to global API if telemetry not initialized
-  return logs.getLogger(SERVICE_NAME, packageJson.version);
+  return logsAPI.getLogger(SERVICE_NAME, packageJson.version);
 }
 
 export function getTracer(): Tracer {
-  if (isTelemetryInitialized()) {
-    return getTelemetryInstance().getTracer(SERVICE_NAME);
-  }
-  // Fallback to global API if telemetry not initialized
-  return trace.getTracer(SERVICE_NAME, packageJson.version);
+  return api.trace.getTracer(SERVICE_NAME, packageJson.version);
 }

package/src/telemetry/util.ts

@@ -2,36 +2,12 @@ import { getLocalTokenWithUrl } from "@superblocksteam/util";
 
 export const SERVICE_NAME = "sdk-dev-server";
 
-/**
- * Get the OTLP base URL for telemetry export.
- *
- * Priority:
- * 1. SUPERBLOCKS_OTEL_COLLECTOR_URL env var (for local obs mode)
- * 2. Superblocks API endpoint derived from base URL
- *
- * When SUPERBLOCKS_OTEL_COLLECTOR_URL is set (e.g., http://localhost:24318),
- * telemetry is sent directly to the local OTEL collector.
- *
- * Note: This returns the BASE URL. The telemetry library appends /v1/traces,
- * /v1/metrics, /v1/logs to this URL.
- */
-function getOtlpBaseUrl(superblocksBaseUrl: URL): string {
-  const localOtelUrl = process.env.SUPERBLOCKS_OTEL_COLLECTOR_URL;
-  if (localOtelUrl) {
-    // Remove trailing /v1/traces etc. if present (just use base URL)
-    return localOtelUrl.replace(/\/v1\/(traces|metrics|logs)$/, "");
-  }
-  // Default: Superblocks API proxies OTLP requests
-  // The server expects /api/v1/traces but the telemetry lib adds /v1/traces,
-  // so we return /api and let telemetry lib append /v1/traces
-  return superblocksBaseUrl.origin + "/api";
-}
-
 export async function getConfiguration() {
   try {
     const tokenWithUrl = await getLocalTokenWithUrl();
     const superblocksBaseUrl = new URL(tokenWithUrl.superblocksBaseUrl);
-    const otlpBaseUrl = getOtlpBaseUrl(superblocksBaseUrl);
+    const superblocksTracesUrl = superblocksBaseUrl.origin + "/api/v1/traces";
+    const superblocksLogsUrl = superblocksBaseUrl.origin + "/api/v1/logs";
     const superblocksHostname = superblocksBaseUrl.hostname;
     let token = "";
     if ("token" in tokenWithUrl) {
@@ -39,7 +15,8 @@ export async function getConfiguration() {
     }
     return {
       superblocksBaseUrl,
-      otlpBaseUrl,
+      superblocksTracesUrl,
+      superblocksLogsUrl,
       superblocksHostname,
       serviceName: SERVICE_NAME,
       token,