Merge branch 'master' into feat/auto-init-inject-emulator-envs

Author: mathu97

CHANGELOG.md

@@ -1,2 +0,0 @@
-- Fixed an issue where `clearData` with no tables would cause the Data Connect emulator to crash.
-- Fixed an issue where the Data Connect emulator would crash with `Error: Unreachable`.

firebase-vscode/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## NEXT
 
+## 0.12.0
+
+- Updated internal firebase-tools dependency to 13.29.1
+- [Fixed] Fixed firebase binary detection for analytics
+
 ## 0.11.1
 
 - [Fixed] Fixed IDX analytics issue

firebase-vscode/package-lock.json

@@ -4,7 +4,7 @@
   "publisher": "GoogleCloudTools",
   "icon": "./resources/firebase_dataconnect_logo.png",
   "description": "Firebase Data Connect for VSCode",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "engines": {
     "vscode": "^1.69.0"
   },

firebase-vscode/package.json

@@ -2,6 +2,7 @@ import vscode, { env, TelemetryLogger, TelemetrySender } from "vscode";
 import { pluginLogger } from "./logger-wrapper";
 import { AnalyticsParams, trackVSCode } from "../../src/track";
 import { env as monospaceEnv } from "../src/core/env";
+import { getSettings } from "./utils/settings";
 
 export const IDX_METRIC_NOTICE = `
 When you use the Firebase Data Connect Extension, Google collects telemetry data such as usage statistics, error metrics, and crash reports. Telemetry helps us better understand how the Firebase Extension is performing, where improvements need to be made, and how features are being used. Firebase uses this data, consistent with our [Google Privacy Policy](https://policies.google.com/privacy?hl=en-US), to provide, improve, and develop Firebase products and services.
@@ -183,6 +184,7 @@ class GA4TelemetrySender implements TelemetrySender {
       }
     }
     data = { ...data };
+    data = addFirebaseBinaryMetadata(data);
     if (!this.hasSentData) {
       trackVSCode(
         DATA_CONNECT_EVENT_NAME.EXTENSION_USED,
@@ -198,3 +200,8 @@ class GA4TelemetrySender implements TelemetrySender {
     // TODO: Sanatize error messages for user data
   }
 }
+
+function addFirebaseBinaryMetadata(data?: Record<string, any> | undefined) {
+  const settings = getSettings();
+  return { ...data, binary_kind: settings.firebaseBinaryKind };
+}

firebase-vscode/src/analytics.ts

@@ -42,16 +42,12 @@ export function registerFdcDeploy(
   );
 
   const deployAllCmd = vscode.commands.registerCommand("fdc.deploy-all", () => {
-    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.DEPLOY_ALL, {
-      firebase_binary_kind: settings.firebaseBinaryKind,
-    });
+    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.DEPLOY_ALL);
     deploySpy.call(`${settings.firebasePath} deploy --only dataconnect`);
   });
 
   const deployCmd = vscode.commands.registerCommand("fdc.deploy", async () => {
-    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.DEPLOY_INDIVIDUAL, {
-      firebase_binary_kind: settings.firebaseBinaryKind,
-    });
+    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.DEPLOY_INDIVIDUAL);
     const configs = await firstWhereDefined(dataConnectConfigs).then(
       (c) => c.requireValue,
     );

firebase-vscode/src/data-connect/deploy.ts

@@ -38,9 +38,7 @@ export function registerFdcSdkGeneration(
   const initSdkCmd = vscode.commands.registerCommand(
     "fdc.init-sdk",
     (args: { appFolder: string }) => {
-      analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.INIT_SDK_CLI, {
-        firebase_binary_kind: settings.firebaseBinaryKind,
-      });
+      analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.INIT_SDK_CLI);
       // Lets do it from the right directory
       setTerminalEnvVars(FDC_APP_FOLDER, args.appFolder);
       runCommand(`${settings.firebasePath} init dataconnect:sdk`);

firebase-vscode/src/data-connect/sdk-generation.ts

@@ -74,9 +74,7 @@ export function registerTerminalTasks(
   const settings = getSettings();
 
   const loginTaskBroker = broker.on("executeLogin", () => {
-    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.IDX_LOGIN, {
-      firebase_binary_kind: settings.firebaseBinaryKind,
-    });
+    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.IDX_LOGIN);
     runTerminalTask(
       "firebase login",
       `${settings.firebasePath} login --no-localhost`,
@@ -86,9 +84,7 @@ export function registerTerminalTasks(
   });
 
   const startEmulatorsTaskBroker = broker.on("runStartEmulators", () => {
-    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.START_EMULATORS, {
-      firebase_binary_kind: settings.firebaseBinaryKind,
-    });
+    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.START_EMULATORS);
     // TODO: optional debug mode
     runTerminalTask(
       "firebase emulators",

firebase-vscode/src/data-connect/terminal.ts

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.29.0",
+  "version": "13.29.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {