remove sentry from SDK, only use in CLI

Author: christianalfoni

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codesandbox/sdk",
-  "version": "2.0.0-rc.10",
+  "version": "2.0.0-rc.11",
   "description": "The CodeSandbox SDK",
   "author": "CodeSandbox",
   "license": "MIT",

src/bin/commands/build.ts

@@ -4,7 +4,7 @@ import * as readline from "readline";
 import { type Client } from "@hey-api/client-fetch";
 import ora from "ora";
 import type * as yargs from "yargs";
-
+import { instrumentedFetch } from "../utils/sentry";
 import { VMTier, CodeSandbox, Sandbox, SandboxClient } from "@codesandbox/sdk";
 
 import {
@@ -100,7 +100,7 @@ export const buildCommand: yargs.CommandModule<
 
   handler: async (argv) => {
     const apiKey = getInferredApiKey();
-    const apiClient: Client = createApiClient("CLI", apiKey);
+    const apiClient: Client = createApiClient(apiKey, {}, instrumentedFetch);
     const sdk = new CodeSandbox(apiKey);
     const sandboxTier = argv.vmTier
       ? VMTier.fromName(argv.vmTier)

src/utils/sentry.ts src/bin/utils/sentry.tssrc/utils/sentry.ts renamed to src/bin/utils/sentry.ts

@@ -8,10 +8,7 @@ if (!Sentry.isInitialized()) {
   });
 }
 
-export async function instrumentedFetch(
-  request: Request,
-  client: "SDK" | "CLI"
-) {
+export async function instrumentedFetch(request: Request) {
   // We are cloning the request to be able to read its body on errors
   const res = await fetch(request.clone());
 
@@ -24,7 +21,7 @@ export async function instrumentedFetch(
           ? await new Response(request.body).text()
           : undefined,
         body: await res.clone().text(),
-        client,
+        client: "SDK-CLI",
         method: request.method,
         url: request.url,
         status: res.status,

src/index.ts

@@ -25,7 +25,7 @@ export class CodeSandbox {
 
   constructor(apiToken?: string, opts: ClientOpts = {}) {
     const apiKey = apiToken || getInferredApiKey();
-    const apiClient = createApiClient("SDK", apiKey, opts);
+    const apiClient = createApiClient(apiKey, opts);
 
     this.sandboxes = new Sandboxes(apiClient);
     this.hosts = new HostTokens(apiClient);

src/utils/api.ts

@@ -9,9 +9,11 @@ import {
   createConfig,
 } from "@hey-api/client-fetch";
 import { getInferredBaseUrl } from "./constants";
-import { instrumentedFetch } from "./sentry";
 
-async function enhanceFetch(request: Request, client: "SDK" | "CLI") {
+async function enhanceFetch(
+  request: Request,
+  instrumentation?: (request: Request) => Promise<Response>
+) {
   // Clone the request to modify headers
   const headers = new Headers(request.headers);
   const existingUserAgent = headers.get("User-Agent") || "";
@@ -25,24 +27,29 @@ async function enhanceFetch(request: Request, client: "SDK" | "CLI") {
     }`.trim()
   );
 
-  // Create new request with updated headers
-  return instrumentedFetch(
-    new Request(request, {
-      headers,
-    }),
-    client
-  );
+  // Create new request with updated headers and optionally add instrumentation
+  return instrumentation
+    ? instrumentation(
+        new Request(request, {
+          headers,
+        })
+      )
+    : fetch(
+        new Request(request, {
+          headers,
+        })
+      );
 }
 
 export function createApiClient(
-  client: "SDK" | "CLI",
   apiKey: string,
-  config: Config = {}
+  config: Config = {},
+  instrumentation?: (request: Request) => Promise<Response>
 ) {
   return createClient(
     createConfig({
       baseUrl: config.baseUrl || getInferredBaseUrl(apiKey),
-      fetch: (request) => enhanceFetch(request, client),
+      fetch: (request) => enhanceFetch(request, instrumentation),
       ...config,
       headers: {
         Authorization: `Bearer ${apiKey}`,