Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

add new events and fix bug in telemetry

Matheus Nogueira81979209b27d
diff --git a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts
index dd625d326c..cbffb90e40 100644
--- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts
+++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts
@@ -37,7 +37,7 @@ const SecretScanningDataSourceOptionsSchema = z.discriminatedUnion("type", [
export const registerSecretScanningV2Router = async (server: FastifyZodProvider) => {
// Only an open finding being closed out counts; reopening one, or moving it between closed statuses, does not.
- const sendFindingResolvedTelemetry = (
+ const sendFindingClosedTelemetry = (
req: FastifyRequest,
{
finding,
@@ -55,7 +55,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
void server.services.telemetry
.sendPostHogEvents({
- event: PostHogEventTypes.SecretScanningFindingResolved,
+ event: PostHogEventTypes.SecretScanningFindingClosed,
distinctId: getTelemetryDistinctId(req),
organizationId: req.permission.orgId,
properties: {
@@ -311,7 +311,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
}
});
- sendFindingResolvedTelemetry(req, { finding, previousStatus });
+ sendFindingClosedTelemetry(req, { finding, previousStatus });
return { finding };
}
@@ -357,7 +357,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
}
});
- sendFindingResolvedTelemetry(req, { finding, previousStatus });
+ sendFindingClosedTelemetry(req, { finding, previousStatus });
return finding;
});
diff --git a/backend/src/services/telemetry/telemetry-service.ts b/backend/src/services/telemetry/telemetry-service.ts
index 7f3268a324..f15131e560 100644
--- a/backend/src/services/telemetry/telemetry-service.ts
+++ b/backend/src/services/telemetry/telemetry-service.ts
@@ -289,6 +289,7 @@ To opt into telemetry, you can set "TELEMETRY_ENABLED=true" within the environme
]);
properties.plan = plan.slug ?? "free";
properties.seat_count = seatUsage.membersUsed;
+ properties.has_secret_scanning = Boolean(plan.secretScanning);
} catch (error) {
logger.error(error, "Failed to fetch org plan for PostHog group properties");
}
diff --git a/backend/src/services/telemetry/telemetry-types.ts b/backend/src/services/telemetry/telemetry-types.ts
index 4c02e4ddcb..d0bb76a6ea 100644
--- a/backend/src/services/telemetry/telemetry-types.ts
+++ b/backend/src/services/telemetry/telemetry-types.ts
@@ -238,7 +238,7 @@ export enum PostHogEventTypes {
SecretScanningDataSourceCreated = "Secret Scanning Data Source Created",
SecretScanningResourcesAdded = "Secret Scanning Resources Added",
SecretScanningScanCompleted = "Secret Scanning Scan Completed",
- SecretScanningFindingResolved = "Secret Scanning Finding Resolved",
+ SecretScanningFindingClosed = "Secret Scanning Finding Closed",
// Groups
GroupCreated = "Group Created",
@@ -1981,8 +1981,8 @@ export type TSecretScanningScanCompletedEvent = {
};
};
-export type TSecretScanningFindingResolvedEvent = {
- event: PostHogEventTypes.SecretScanningFindingResolved;
+export type TSecretScanningFindingClosedEvent = {
+ event: PostHogEventTypes.SecretScanningFindingClosed;
properties: {
// how it was closed out: resolved, false-positive or ignore
status: SecretScanningFindingStatus;
@@ -2832,7 +2832,7 @@ export type TPostHogEvent = {
| TSecretScanningDataSourceCreatedEvent
| TSecretScanningResourcesAddedEvent
| TSecretScanningScanCompletedEvent
- | TSecretScanningFindingResolvedEvent
+ | TSecretScanningFindingClosedEvent
| TGroupCreatedEvent
| TGroupUpdatedEvent
| TGroupDeletedEvent
diff --git a/frontend/src/components/license/UpgradeGate/CapabilityUpgradeGate.tsx b/frontend/src/components/license/UpgradeGate/CapabilityUpgradeGate.tsx
index 58d9d374e4..b6bd8e3c28 100644
--- a/frontend/src/components/license/UpgradeGate/CapabilityUpgradeGate.tsx
+++ b/frontend/src/components/license/UpgradeGate/CapabilityUpgradeGate.tsx
@@ -54,6 +54,7 @@ const CapabilityUpgradeDialog = ({
productPlans?: ProductPlanSummary[];
}) => {
const { currentOrg, isSubOrganization } = useOrganization();
+ const { subscription } = useSubscription();
const route = useRouterState({ select: (state) => state.matches.at(-1)?.routeId ?? "unknown" });
const { pathname } = useLocation();
const isAgentVault =
@@ -65,6 +66,7 @@ const CapabilityUpgradeDialog = ({
paywallText: string;
route: string;
isEnterpriseFeature: boolean;
+ plan: string;
} | null>(null);
useEffect(() => {
@@ -77,7 +79,8 @@ const CapabilityUpgradeDialog = ({
paywallKey,
paywallText: intent.description,
route,
- isEnterpriseFeature: intent.isEnterpriseFeature
+ isEnterpriseFeature: intent.isEnterpriseFeature,
+ plan: subscription.slug ?? "free"
};
eventPropertiesRef.current = eventProperties;
analytics.captureForOrganization(AnalyticsEvent.PaywallViewed, currentOrg.id, eventProperties);
diff --git a/frontend/src/components/license/UpgradeGate/UpgradeGate.tsx b/frontend/src/components/license/UpgradeGate/UpgradeGate.tsx
index 4704c40bc1..c9b645a9da 100644
--- a/frontend/src/components/license/UpgradeGate/UpgradeGate.tsx
+++ b/frontend/src/components/license/UpgradeGate/UpgradeGate.tsx
@@ -370,14 +370,17 @@ const ProductUpgradeGate = ({ intent, paywallKey, isOpen, onOpenChange }: Props)
select: (state) => state.matches.at(-1)?.routeId ?? "unknown"
});
+ const orgPlan = subscription.slug ?? "free";
+
const trackPaywallView = useCallback(() => {
analytics.captureForOrganization(AnalyticsEvent.PaywallViewed, currentOrg.id, {
paywallKey,
paywallText: intent.description,
route,
- isEnterpriseFeature: (requiredTier ?? intent.planKey) === BillingPlan.Enterprise
+ isEnterpriseFeature: (requiredTier ?? intent.planKey) === BillingPlan.Enterprise,
+ plan: orgPlan
});
- }, [currentOrg.id, paywallKey, intent.description, intent.planKey, route, requiredTier]);
+ }, [currentOrg.id, paywallKey, intent.description, intent.planKey, route, requiredTier, orgPlan]);
useEffect(() => {
if (!isOpen) {
@@ -406,7 +409,8 @@ const ProductUpgradeGate = ({ intent, paywallKey, isOpen, onOpenChange }: Props)
paywallKey,
paywallText: intent.description,
route,
- isEnterpriseFeature: (requiredTier ?? intent.planKey) === BillingPlan.Enterprise
+ isEnterpriseFeature: (requiredTier ?? intent.planKey) === BillingPlan.Enterprise,
+ plan: orgPlan
});
};
diff --git a/frontend/src/lib/analytics/events.ts b/frontend/src/lib/analytics/events.ts
index 04f78de089..2f7e4245a2 100644
--- a/frontend/src/lib/analytics/events.ts
+++ b/frontend/src/lib/analytics/events.ts
@@ -128,6 +128,8 @@ type PaywallProperties = {
paywallText: string;
route: string;
isEnterpriseFeature: boolean;
+ // the org's plan when the paywall was shown; the org group's plan is overwritten on every change
+ plan: string;
};
export type FolderAccessSheetSource = "breadcrumb" | "folder_row";
diff --git a/frontend/src/pages/middlewares/authenticate.tsx b/frontend/src/pages/middlewares/authenticate.tsx
index 06972c8cda..98a57a8d59 100644
--- a/frontend/src/pages/middlewares/authenticate.tsx
+++ b/frontend/src/pages/middlewares/authenticate.tsx
@@ -3,12 +3,15 @@ import { AxiosError } from "axios";
import { addSeconds, formatISO } from "date-fns";
import { createNotification } from "@app/components/notifications";
+import Telemetry from "@app/components/utilities/telemetry/Telemetry";
import { SessionStorageKeys } from "@app/const";
import { ROUTE_PATHS } from "@app/const/routes";
import { userKeys } from "@app/hooks/api";
import { authKeys, fetchAuthToken } from "@app/hooks/api/auth/queries";
import { clearSession, fetchUserDetails, logoutUser } from "@app/hooks/api/users/queries";
+let identifiedUsername: string | undefined;
+
export const Route = createFileRoute("/_authenticate")({
beforeLoad: async ({ context, location }) => {
if (!context.serverConfig.initialized) {
@@ -78,6 +81,13 @@ export const Route = createFileRoute("/_authenticate")({
});
});
+ // A session that never passes through login or org selection would otherwise stay anonymous,
+ // and PostHog drops the organization group from anonymous events.
+ if (identifiedUsername !== user.username) {
+ identifiedUsername = user.username;
+ new Telemetry().getInstance().identify(user.username, user.email ?? user.username);
+ }
+
const isOnAdminSetup = location.pathname === "/admin/setup";
if (user.superAdmin && context.serverConfig.onboardingCompleted === false && !isOnAdminSetup) {