Use public facing gateway for telemetry

nanoapi-io · Oct 27, 2024 · feae744 · feae744
1 parent 6aa8d74
commit feae744
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -74,6 +74,7 @@
     "vitest": "^2.1.1"
   },
   "dependencies": {
+    "axios": "^1.7.7",
     "dependency-tree": "^11.0.1",
     "express": "^4.21.1",
     "http-proxy-middleware": "^3.0.3",

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -18,11 +18,9 @@ if (process.env.NODE_ENV !== "development") {
   process.removeAllListeners("warning");
 }
 
-if (process.env.NAPI_DISABLE_TELEMETRY !== "true") {
-  trackEvent(TelemetryEvents.APP_START, {
-    message: "Napi started with Telemetry enabled",
-  });
-}
+trackEvent(TelemetryEvents.APP_START, {
+  message: "Napi started with Telemetry enabled",
+});
 
 yargs(hideBin(process.argv))
   .options({

diff --git a/packages/cli/src/telemetry.ts b/packages/cli/src/telemetry.ts
@@ -1,9 +1,7 @@
-// telemetry.ts
+import axios from "axios";
 import { EventEmitter } from "events";
 import { existsSync, readFileSync, writeFileSync } from "fs";
-import { request } from "http";
 import { join } from "path";
-import { URL } from "url";
 import { v4 as uuidv4 } from "uuid";
 
 export enum TelemetryEvents {
@@ -27,9 +25,9 @@ export interface TelemetryEvent {
 }
 
 const telemetry = new EventEmitter();
-// TODO: @erbesharat: Deploy mongoose script to GCF and update the endpoint
 const TELEMETRY_ENDPOINT =
-  process.env.TELEMETRY_ENDPOINT || "http://localhost:3000/telemetry";
+  process.env.TELEMETRY_ENDPOINT ||
+  "https://napi-watchdog-api-gateway-33ge7a49.nw.gateway.dev/telemetryHandler";
 const SESSION_FILE_PATH = join("/tmp", "napi_session_id");
 
 // getSessionId generates a new session ID and cache it in SESSION_FILE_PATH
@@ -56,40 +54,17 @@ telemetry.on("event", (data) => {
   sendTelemetryData(data);
 });
 
-const sendTelemetryData = (data: TelemetryEvent) => {
+const sendTelemetryData = async (data: TelemetryEvent) => {
   try {
-    const url = new URL(TELEMETRY_ENDPOINT);
-    const options = {
-      hostname: url.hostname,
-      port: url.port || (url.protocol === "https:" ? 443 : 80),
-      path: url.pathname,
-      method: "POST",
+    await axios.post(TELEMETRY_ENDPOINT, data, {
       headers: {
         "Content-Type": "application/json",
-        "Content-Length": Buffer.byteLength(JSON.stringify(data)),
         "User-Agent": "napi",
       },
-    };
-
-    const req = request(options, (res) => {
-      let responseData = "";
-      res.on("data", (chunk) => {
-        responseData += chunk;
-      });
-
-      res.on("end", () => {
-        console.info(`Telemetry response: ${res.statusCode} - ${responseData}`);
-      });
+      timeout: 5000,
     });
-
-    req.on("error", (error) => {
-      console.error(`Failed to send telemetry data: ${error}`);
-    });
-
-    req.write(JSON.stringify(data));
-    req.end();
   } catch (error) {
-    console.error(`Error in telemetry setup: ${error}`);
+    console.error(`Failed to send telemetry data: ${error}`);
   }
 };