Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/console/.env.example
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
VITE_API_URL=http://localhost:8080
VITE_API_URL=http://localhost:8080

# Grafana Faro configuration (optional)
# VITE_FARO_URL=https://your-grafana-faro-collector-url
# VITE_FARO_APP_NAME=@probo/console
# VITE_APP_VERSION=0.0.0
2 changes: 2 additions & 0 deletions apps/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"preview": "vite preview"
},
"dependencies": {
"@grafana/faro-react": "^1.19.0",
"@grafana/faro-web-sdk": "^1.19.0",
"@hookform/resolvers": "^5.0.1",
"@probo/helpers": "1.0.0",
"@probo/hooks": "1.0.0",
Expand Down
38 changes: 38 additions & 0 deletions apps/console/src/faro.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import {
initializeFaro,
ReactIntegration,
getWebInstrumentations,
createReactRouterV6DataOptions,
} from "@grafana/faro-react";
import { matchRoutes } from "react-router";

export function initFaro() {
const url = import.meta.env.VITE_FARO_URL;

if (!url) {
console.warn("Faro URL not configured. Skipping Faro initialization.");
return;
}

const appName = import.meta.env.VITE_FARO_APP_NAME || "@probo/console";

initializeFaro({
url,
app: {
name: appName,
version: import.meta.env.VITE_APP_VERSION || "0.0.0",
environment: import.meta.env.MODE,
},
instrumentations: [
...getWebInstrumentations({
captureConsole: true,
captureConsoleDisabledLevels: [],
}),
new ReactIntegration({
router: createReactRouterV6DataOptions({
matchRoutes,
}),
}),
],
});
}
20 changes: 13 additions & 7 deletions apps/console/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import { FaroErrorBoundary } from "@grafana/faro-react";
import "./index.css";
import { App } from "./App";
import { RelayProvider } from "./providers/RelayProviders";
import { TranslatorProvider } from "./providers/TranslatorProvider";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { initFaro } from "./faro";

initFaro();

const queryClient = new QueryClient({
defaultOptions: {
Expand All @@ -16,12 +20,14 @@ const queryClient = new QueryClient({

createRoot(document.getElementById("root")!).render(
<StrictMode>
<QueryClientProvider client={queryClient}>
<RelayProvider>
<TranslatorProvider>
<App />
</TranslatorProvider>
</RelayProvider>
</QueryClientProvider>
<FaroErrorBoundary>
<QueryClientProvider client={queryClient}>
<RelayProvider>
<TranslatorProvider>
<App />
</TranslatorProvider>
</RelayProvider>
</QueryClientProvider>
</FaroErrorBoundary>
</StrictMode>
);
5 changes: 4 additions & 1 deletion apps/console/src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
useRouteError,
type RouteObject,
} from "react-router";
import { withFaroRouterInstrumentation } from "@grafana/faro-react";
import { MainLayout } from "./layouts/MainLayout";
import { AuthLayout, CenteredLayout, CenteredLayoutSkeleton } from "@probo/ui";
import { Fragment, Suspense } from "react";
Expand Down Expand Up @@ -211,4 +212,6 @@ function routeTransformer({
} as RouteObject;
}

export const router = createBrowserRouter(routes.map(routeTransformer));
export const router = withFaroRouterInstrumentation(
createBrowserRouter(routes.map(routeTransformer))
);
5 changes: 5 additions & 0 deletions apps/trust/.env.example
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
VITE_API_URL=http://localhost:8080

# Grafana Faro configuration (optional)
# VITE_FARO_URL=https://your-grafana-faro-collector-url
# VITE_FARO_APP_NAME=@probo/trust
# VITE_APP_VERSION=0.0.0
2 changes: 2 additions & 0 deletions apps/trust/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"preview": "vite preview"
},
"dependencies": {
"@grafana/faro-react": "^1.19.0",
"@grafana/faro-web-sdk": "^1.19.0",
"@hookform/resolvers": "^5.0.1",
"@probo/helpers": "1.0.0",
"@probo/hooks": "1.0.0",
Expand Down
38 changes: 38 additions & 0 deletions apps/trust/src/faro.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import {
initializeFaro,
ReactIntegration,
getWebInstrumentations,
createReactRouterV6DataOptions,
} from "@grafana/faro-react";
import { matchRoutes } from "react-router";

export function initFaro() {
const url = import.meta.env.VITE_FARO_URL;

if (!url) {
console.warn("Faro URL not configured. Skipping Faro initialization.");
return;
}

const appName = import.meta.env.VITE_FARO_APP_NAME || "@probo/trust";

initializeFaro({
url,
app: {
name: appName,
version: import.meta.env.VITE_APP_VERSION || "0.0.0",
environment: import.meta.env.MODE,
},
instrumentations: [
...getWebInstrumentations({
captureConsole: true,
captureConsoleDisabledLevels: [],
}),
new ReactIntegration({
router: createReactRouterV6DataOptions({
matchRoutes,
}),
}),
],
});
}
20 changes: 13 additions & 7 deletions apps/trust/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import { FaroErrorBoundary } from "@grafana/faro-react";
import "./index.css";
import { App } from "./App";
import { RelayProvider } from "./providers/RelayProviders";
import { TranslatorProvider } from "./providers/TranslatorProvider";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { initFaro } from "./faro";

initFaro();

const queryClient = new QueryClient({
defaultOptions: {
Expand All @@ -16,12 +20,14 @@ const queryClient = new QueryClient({

createRoot(document.getElementById("root")!).render(
<StrictMode>
<QueryClientProvider client={queryClient}>
<RelayProvider>
<TranslatorProvider>
<App />
</TranslatorProvider>
</RelayProvider>
</QueryClientProvider>
<FaroErrorBoundary>
<QueryClientProvider client={queryClient}>
<RelayProvider>
<TranslatorProvider>
<App />
</TranslatorProvider>
</RelayProvider>
</QueryClientProvider>
</FaroErrorBoundary>
</StrictMode>
);
9 changes: 6 additions & 3 deletions apps/trust/src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
useLoaderData,
useRouteError,
} from "react-router";
import { withFaroRouterInstrumentation } from "@grafana/faro-react";
import { type ComponentType, Fragment, Suspense } from "react";
import {
relayEnvironment,
Expand Down Expand Up @@ -174,6 +175,8 @@ function getBasename(): string {
return trustMatch ? trustMatch[0] : "/";
}

export const router = createBrowserRouter(routes.map(routeTransformer), {
basename: getBasename(),
});
export const router = withFaroRouterInstrumentation(
createBrowserRouter(routes.map(routeTransformer), {
basename: getBasename(),
})
);
Loading