Error telemetry in cloud

admin/server/server.go

@@ -28,7 +28,6 @@ import (
 	runtimeauth "github.com/rilldata/rill/runtime/server/auth"
 	"github.com/rs/cors"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
-	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -300,15 +299,6 @@ func (s *Server) Ping(ctx context.Context, req *adminv1.PingRequest) (*adminv1.P
 	return resp, nil
 }
 
-func (s *Server) Telemetry(ctx context.Context, req *adminv1.TelemetryRequest) (*adminv1.TelemetryResponse, error) {
-	dims := make([]attribute.KeyValue, 0)
-	for k, v := range req.Event {
-		dims = append(dims, attribute.String(k, v))
-	}
-	s.uiActivity.Emit(ctx, "cloud-ui-telemetry", 1, dims...)
-	return &adminv1.TelemetryResponse{}, nil
-}
-
 func timeoutSelector(fullMethodName string) time.Duration {
 	return time.Minute
 }

admin/server/telemetry.go

@@ -0,0 +1,37 @@
+package server
+
+import (
+	"context"
+
+	adminv1 "github.com/rilldata/rill/proto/gen/rill/admin/v1"
+	"go.opentelemetry.io/otel/attribute"
+)
+
+func (s *Server) Telemetry(ctx context.Context, req *adminv1.TelemetryRequest) (*adminv1.TelemetryResponse, error) {
+	dims := make([]attribute.KeyValue, 0)
+	for k, v := range req.Event.AsMap() {
+		a, ok := toKeyValue(k, v)
+		if ok {
+			dims = append(dims, a)
+		}
+	}
+	s.uiActivity.Emit(ctx, req.Name, float64(req.Value), dims...)
+	return &adminv1.TelemetryResponse{}, nil
+}
+
+func toKeyValue(k string, v interface{}) (attribute.KeyValue, bool) {
+	switch vt := v.(type) {
+	case string:
+		return attribute.String(k, vt), true
+	case bool:
+		return attribute.Bool(k, vt), true
+	case int:
+		return attribute.Int(k, vt), true
+	case int64:
+		return attribute.Int64(k, vt), true
+	case float64:
+		return attribute.Float64(k, vt), true
+	}
+
+	return attribute.KeyValue{}, false
+}

proto/gen/rill/admin/v1/admin.swagger.yaml

@@ -2482,10 +2482,16 @@ definitions:
   v1TelemetryRequest:
     type: object
     properties:
+      name:
+        type: string
+        title: Name passed to activity module's name arg
+      value:
+        type: number
+        format: float
+        title: Value passed to activity module's value arg
       event:
         type: object
-        additionalProperties:
-          type: string
+        title: Free form struct of the actual event
   v1TelemetryResponse:
     type: object
   v1TriggerReconcileResponse:

proto/rill/admin/v1/api.proto

@@ -1076,7 +1076,12 @@ message GenerateReportYAMLResponse {
 }
 
 message TelemetryRequest {
-  map<string, string> event = 1;
+  // Name passed to activity module's name arg
+  string name = 1;
+  // Value passed to activity module's value arg
+  float value = 2;
+  // Free form struct of the actual event
+  google.protobuf.Struct event = 3;
 }
 
 message TelemetryResponse {}

web-admin/src/client/gen/index.schemas.ts

@@ -271,9 +271,11 @@ export interface V1TelemetryResponse {
   [key: string]: any;
 }
 
-export type V1TelemetryRequestEvent = { [key: string]: string };
+export type V1TelemetryRequestEvent = { [key: string]: any };
 
 export interface V1TelemetryRequest {
+  name?: string;
+  value?: number;
   event?: V1TelemetryRequestEvent;
 }
 

web-admin/src/features/errors/error-utils.ts

@@ -1,5 +1,8 @@
 import { goto } from "$app/navigation";
 import { page } from "$app/stores";
+import { getScreenNameFromPage } from "@rilldata/web-admin/features/navigation/nav-utils";
+import { errorEvent } from "@rilldata/web-common/metrics/initMetrics";
+import type { Query } from "@tanstack/query-core";
 import type { QueryClient } from "@tanstack/svelte-query";
 import type { AxiosError } from "axios";
 import { get } from "svelte/store";
@@ -9,12 +12,29 @@ import { ADMIN_URL } from "../../client/http-client";
 import { ErrorStoreState, errorStore } from "./error-store";
 
 export function createGlobalErrorCallback(queryClient: QueryClient) {
-  return (error: AxiosError) => {
+  return (error: AxiosError, query: Query) => {
     const isProjectPage = get(page).route.id === "/[organization]/[project]";
     const isDashboardPage =
       get(page).route.id === "/[organization]/[project]/[dashboard]";
 
-    if (!error.response) return;
+    console.log("createGlobalErrorCallback");
+    const screenName = getScreenNameFromPage(get(page));
+    if (!error.response) {
+      errorEvent?.fireErrorBoundaryEvent(
+        query.queryKey[0] as string,
+        "",
+        "unknown error",
+        screenName
+      );
+      return;
+    } else {
+      errorEvent?.fireErrorBoundaryEvent(
+        query.queryKey[0] as string,
+        error.response?.status + "" ?? error.status,
+        (error.response?.data as RpcStatus)?.message ?? error.message,
+        screenName
+      );
+    }
 
     // Special handling for some errors on the Project page
     if (isProjectPage && error.response?.status === 400) {
@@ -130,3 +150,39 @@ export function createErrorPagePropsFromRoutingError(
     body: "Try refreshing the page, and reach out to us if that doesn't fix the error.",
   };
 }
+
+export function addJavascriptErrorListeners() {
+  const errorHandler = (errorEvt: ErrorEvent) => {
+    console.log("error", errorEvt);
+    errorEvent?.fireErrorBoundaryEvent(
+      "",
+      "",
+      errorEvt.error?.stack ?? errorEvt.message,
+      getScreenNameFromPage(get(page))
+    );
+  };
+  const unhandledRejectionHandler = (rejectionEvent: PromiseRejectionEvent) => {
+    console.log("rejection", rejectionEvent);
+    let reason = "";
+    if (typeof rejectionEvent.reason === "string") {
+      reason = rejectionEvent.reason;
+    } else if (rejectionEvent.reason instanceof Error) {
+      reason = rejectionEvent.reason.stack;
+    } else {
+      reason = String.toString.apply(rejectionEvent.reason);
+    }
+    errorEvent?.fireErrorBoundaryEvent(
+      "",
+      "",
+      reason,
+      getScreenNameFromPage(get(page))
+    );
+  };
+
+  window.addEventListener("error", errorHandler);
+  window.addEventListener("unhandledrejection", unhandledRejectionHandler);
+  return () => {
+    window.removeEventListener("error", errorHandler);
+    window.removeEventListener("unhandledrejection", unhandledRejectionHandler);
+  };
+}

web-admin/src/features/navigation/nav-utils.ts

@@ -1,3 +1,4 @@
+import { MetricsEventScreenName } from "@rilldata/web-common/metrics/service/MetricsTypes";
 import type { Page } from "@sveltejs/kit";
 
 export function isOrganizationPage(page: Page): boolean {
@@ -18,3 +19,26 @@ export function isDashboardPage(page: Page): boolean {
 export function isReportPage(page: Page): boolean {
   return page.route.id === "/[organization]/[project]/-/reports/[report]";
 }
+
+export function isReportExportPage(page: Page): boolean {
+  return (
+    page.route.id ===
+    "/[organization]/[project]/[dashboard]/-/reports/[report]/export"
+  );
+}
+
+export function getScreenNameFromPage(page: Page): MetricsEventScreenName {
+  switch (true) {
+    case isOrganizationPage(page):
+      return MetricsEventScreenName.Organization;
+    case isProjectPage(page):
+      return MetricsEventScreenName.Project;
+    case isDashboardPage(page):
+      return MetricsEventScreenName.Dashboard;
+    case isReportPage(page):
+      return MetricsEventScreenName.Report;
+    case isReportExportPage(page):
+      return MetricsEventScreenName.ReportExport;
+  }
+  return MetricsEventScreenName.Home;
+}

web-admin/src/features/telemetry/RillAdminTelemetryClient.ts

@@ -0,0 +1,23 @@
+import { ADMIN_URL } from "@rilldata/web-admin/client/http-client";
+import type { MetricsEvent } from "@rilldata/web-common/metrics/service/MetricsTypes";
+import type { TelemetryClient } from "@rilldata/web-common/metrics/service/RillIntakeClient";
+
+export class RillAdminTelemetryClient implements TelemetryClient {
+  public async fireEvent(event: MetricsEvent) {
+    try {
+      const resp = await fetch(`${ADMIN_URL}/v1/telemetry`, {
+        method: "POST",
+        body: JSON.stringify({
+          name: event.app_name + "-ui-telemetry",
+          value: 1,
+          event,
+        }),
+        credentials: "include",
+      });
+      if (!resp.ok)
+        console.error(`Failed to send ${event.event_type}. ${resp.statusText}`);
+    } catch (err) {
+      console.error(`Failed to send ${event.event_type}. ${err.message}`);
+    }
+  }
+}

web-admin/src/features/telemetry/initCloudMetrics.ts

@@ -0,0 +1,26 @@
+import { RillAdminTelemetryClient } from "@rilldata/web-admin/features/telemetry/RillAdminTelemetryClient";
+import { collectCommonUserFields } from "@rilldata/web-common/metrics/collectCommonUserFields";
+import { ErrorEventHandler } from "@rilldata/web-common/metrics/ErrorEventHandler";
+import {
+  metricsService,
+  setErrorEvent,
+  setMetricsService,
+} from "@rilldata/web-common/metrics/initMetrics";
+import { BehaviourEventFactory } from "@rilldata/web-common/metrics/service/BehaviourEventFactory";
+import { ErrorEventFactory } from "@rilldata/web-common/metrics/service/ErrorEventFactory";
+import { MetricsService } from "@rilldata/web-common/metrics/service/MetricsService";
+import { ProductHealthEventFactory } from "@rilldata/web-common/metrics/service/ProductHealthEventFactory";
+
+export async function initCloudMetrics() {
+  setMetricsService(
+    new MetricsService(new RillAdminTelemetryClient(), [
+      new ProductHealthEventFactory(),
+      new BehaviourEventFactory(),
+      new ErrorEventFactory(),
+    ])
+  );
+
+  const commonUserMetrics = await collectCommonUserFields();
+  setErrorEvent(new ErrorEventHandler(metricsService, commonUserMetrics));
+  // TODO: add other handlers and callers
+}

web-admin/src/routes/+layout.svelte

@@ -1,13 +1,18 @@
 <script lang="ts">
   import { beforeNavigate } from "$app/navigation";
+  import { initCloudMetrics } from "@rilldata/web-admin/features/telemetry/initCloudMetrics";
   import NotificationCenter from "@rilldata/web-common/components/notifications/NotificationCenter.svelte";
   import {
     featureFlags,
     retainFeaturesFlags,
   } from "@rilldata/web-common/features/feature-flags";
   import RillTheme from "@rilldata/web-common/layout/RillTheme.svelte";
   import { QueryClient, QueryClientProvider } from "@tanstack/svelte-query";
-  import { createGlobalErrorCallback } from "../features/errors/error-utils";
+  import { onMount } from "svelte";
+  import {
+    addJavascriptErrorListeners,
+    createGlobalErrorCallback,
+  } from "../features/errors/error-utils";
   import ErrorBoundary from "../features/errors/ErrorBoundary.svelte";
   import TopNavigationBar from "../features/navigation/TopNavigationBar.svelte";
   import { clearViewedAsUserAfterNavigate } from "../features/view-as-user/clearViewedAsUser";
@@ -37,6 +42,9 @@
 
   beforeNavigate(retainFeaturesFlags);
   clearViewedAsUserAfterNavigate(queryClient);
+  initCloudMetrics();
+
+  onMount(() => addJavascriptErrorListeners());
 </script>
 
 <svelte:head>

web-admin/src/routes/[organization]/[project]/+layout.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
   import { page } from "$app/stores";
+  import { createAdminServiceGetCurrentUser } from "@rilldata/web-admin/client";
   import ProjectDashboardsListener from "@rilldata/web-admin/features/projects/ProjectDashboardsListener.svelte";
+  import { metricsService } from "@rilldata/web-common/metrics/initMetrics";
   import RuntimeProvider from "@rilldata/web-common/runtime-client/RuntimeProvider.svelte";
   import { isProjectPage } from "../../../features/navigation/nav-utils";
   import ProjectTabs from "../../../features/projects/ProjectTabs.svelte";
@@ -12,6 +14,7 @@
     $page.params.organization,
     $page.params.project
   );
+  const user = createAdminServiceGetCurrentUser();
 
   $: isRuntimeHibernating = $projRuntime.isSuccess && !$projRuntime.data;
 
@@ -21,6 +24,14 @@
   }
 
   $: onProjectPage = isProjectPage($page);
+
+  $: if ($page.params.project && $user.data?.user?.id) {
+    metricsService.loadCloudFields({
+      isDev: window.location.host.startsWith("localhost"),
+      projectId: $page.params.project,
+      userId: $user.data?.user?.id,
+    });
+  }
 </script>
 
 {#if $viewAsUserStore}