Skip to content

Commit f71e667

Browse files
authored
Merge pull request #457 from authzed/update-instrumentation
Update instrumentation clients
2 parents 7f5643f + c9413cb commit f71e667

File tree

3 files changed

+33
-94
lines changed

3 files changed

+33
-94
lines changed

app/spicedb/concepts/commands/page.mdx

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ A database that stores and computes permissions
2727

2828
### Children commands
2929

30-
- [spicedb datastore](#reference-spicedb-datastore) - datastore operations
31-
- [spicedb lsp](#reference-spicedb-lsp) - serve language server protocol
32-
- [spicedb man](#reference-spicedb-man) - Generate man page
33-
- [spicedb serve](#reference-spicedb-serve) - serve the permissions database
34-
- [spicedb serve-testing](#reference-spicedb-serve-testing) - test server with an in-memory datastore
35-
- [spicedb version](#reference-spicedb-version) - displays the version of SpiceDB
36-
30+
- [spicedb datastore](#reference-spicedb-datastore) - datastore operations
31+
- [spicedb lsp](#reference-spicedb-lsp) - serve language server protocol
32+
- [spicedb man](#reference-spicedb-man) - Generate man page
33+
- [spicedb serve](#reference-spicedb-serve) - serve the permissions database
34+
- [spicedb serve-testing](#reference-spicedb-serve-testing) - test server with an in-memory datastore
35+
- [spicedb version](#reference-spicedb-version) - displays the version of SpiceDB
3736

3837
## Reference: `spicedb datastore`
3938

@@ -49,11 +48,10 @@ Operations against the configured datastore
4948

5049
### Children commands
5150

52-
- [spicedb datastore gc](#reference-spicedb-datastore-gc) - executes garbage collection
53-
- [spicedb datastore head](#reference-spicedb-datastore-head) - compute the head (latest) database migration revision available
54-
- [spicedb datastore migrate](#reference-spicedb-datastore-migrate) - execute datastore schema migrations
55-
- [spicedb datastore repair](#reference-spicedb-datastore-repair) - executes datastore repair
56-
51+
- [spicedb datastore gc](#reference-spicedb-datastore-gc) - executes garbage collection
52+
- [spicedb datastore head](#reference-spicedb-datastore-head) - compute the head (latest) database migration revision available
53+
- [spicedb datastore migrate](#reference-spicedb-datastore-migrate) - execute datastore schema migrations
54+
- [spicedb datastore repair](#reference-spicedb-datastore-repair) - executes datastore repair
5755

5856
## Reference: `spicedb datastore gc`
5957

@@ -148,8 +146,6 @@ spicedb datastore gc [flags]
148146
--skip-release-check if true, skips checking for new SpiceDB releases
149147
```
150148

151-
152-
153149
## Reference: `spicedb datastore head`
154150

155151
compute the head (latest) database migration revision available
@@ -181,8 +177,6 @@ spicedb datastore head [flags]
181177
--skip-release-check if true, skips checking for new SpiceDB releases
182178
```
183179

184-
185-
186180
## Reference: `spicedb datastore migrate`
187181

188182
Executes datastore schema migrations for the datastore.
@@ -222,8 +216,6 @@ spicedb datastore migrate [revision] [flags]
222216
--skip-release-check if true, skips checking for new SpiceDB releases
223217
```
224218

225-
226-
227219
## Reference: `spicedb datastore repair`
228220

229221
Executes a repair operation for the datastore
@@ -317,8 +309,6 @@ spicedb datastore repair [flags]
317309
--skip-release-check if true, skips checking for new SpiceDB releases
318310
```
319311

320-
321-
322312
## Reference: `spicedb lsp`
323313

324314
serve language server protocol
@@ -342,20 +332,17 @@ spicedb lsp [flags]
342332
--skip-release-check if true, skips checking for new SpiceDB releases
343333
```
344334

345-
346-
347335
## Reference: `spicedb man`
348336

349337
Generate a man page for SpiceDB.
350-
The output can be redirected to a file and installed to the system:
338+
The output can be redirected to a file and installed to the system:
351339

352340
```
353341
spicedb man > spicedb.1
354342
sudo mv spicedb.1 /usr/share/man/man1/
355343
sudo mandb # Update man page database
356344
```
357345

358-
359346
```
360347
spicedb man
361348
```
@@ -368,8 +355,6 @@ spicedb man
368355
--skip-release-check if true, skips checking for new SpiceDB releases
369356
```
370357

371-
372-
373358
## Reference: `spicedb serve`
374359

375360
start a SpiceDB server
@@ -558,8 +543,6 @@ spicedb serve [flags]
558543
--skip-release-check if true, skips checking for new SpiceDB releases
559544
```
560545

561-
562-
563546
## Reference: `spicedb serve-testing`
564547

565548
An in-memory spicedb server which serves completely isolated datastores per client-supplied auth token used.
@@ -621,8 +604,6 @@ spicedb serve-testing [flags]
621604
--skip-release-check if true, skips checking for new SpiceDB releases
622605
```
623606

624-
625-
626607
## Reference: `spicedb version`
627608

628609
displays the version of SpiceDB
@@ -644,6 +625,3 @@ spicedb version [flags]
644625
--log-level string verbosity of logging ("trace", "debug", "info", "warn", "error") (default "info")
645626
--skip-release-check if true, skips checking for new SpiceDB releases
646627
```
647-
648-
649-

components/scripts.tsx

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,6 @@ import { Suspense, useEffect, useState } from "react";
1010
const isProd = process.env.NEXT_PUBLIC_VERCEL_ENV === "production";
1111
const baseDir = process.env.NEXT_PUBLIC_BASE_DIR || "";
1212

13-
function Reo() {
14-
const reoClientId = process.env.NEXT_PUBLIC_REO_CLIENT_ID;
15-
const [loadReo, setLoadReo] = useState(false);
16-
const [afterLoad, setAfterLoad] = useState(false);
17-
18-
useEffect(() => {
19-
if (window) {
20-
setLoadReo(!inEU());
21-
}
22-
}, [loadReo]);
23-
24-
useEffect(() => {
25-
// @ts-ignore
26-
if (afterLoad && window.Reo) {
27-
// @ts-ignore
28-
window.Reo.init({ clientID: reoClientId });
29-
}
30-
}, [afterLoad]);
31-
32-
return (
33-
<div>
34-
{reoClientId && isProd && loadReo && (
35-
<Script
36-
src={`https://static.reo.dev/${reoClientId}/reo.js`}
37-
onLoad={() => setAfterLoad(true)}
38-
defer
39-
></Script>
40-
)}
41-
</div>
42-
);
43-
}
44-
4513
function HubSpot() {
4614
const hsId = process.env.NEXT_PUBLIC_HUBSPOT_ID;
4715
const [loadHs, setLoadHs] = useState(false);
@@ -83,39 +51,10 @@ function HubSpot() {
8351
);
8452
}
8553

86-
function Posthog() {
87-
useEffect(() => {
88-
if (inEU() || !process.env.NEXT_PUBLIC_POSTHOG_KEY) {
89-
return;
90-
}
91-
92-
posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY ?? "", {
93-
api_host: isProd ? "/i" : process.env.NEXT_PUBLIC_POSTHOG_HOST, // See Posthog rewrites in next config
94-
ui_host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
95-
person_profiles: "always",
96-
loaded: (posthog) => {
97-
if (process.env.NODE_ENV === "development") posthog.debug();
98-
},
99-
});
100-
101-
const handleRouteChange = () => posthog?.capture("$pageview");
102-
103-
Router.events.on("routeChangeComplete", handleRouteChange);
104-
105-
return () => {
106-
Router.events.off("routeChangeComplete", handleRouteChange);
107-
};
108-
}, []);
109-
110-
return <></>;
111-
}
112-
11354
export default function Scripts() {
11455
return (
11556
<Suspense fallback={<></>}>
116-
<Reo />
11757
<HubSpot />
118-
<Posthog />
11958
</Suspense>
12059
);
12160
}

instrumentation-client.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import posthog from "posthog-js";
2+
import inEU from "@segment/in-eu";
3+
4+
const isProd = process.env.NEXT_PUBLIC_VERCEL_ENV === "production";
5+
6+
const initPostHog = () => {
7+
if (inEU() || !process.env.NEXT_PUBLIC_POSTHOG_KEY) {
8+
return;
9+
}
10+
11+
posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY ?? "", {
12+
api_host: isProd ? "/i" : process.env.NEXT_PUBLIC_POSTHOG_HOST, // See Posthog rewrites in next config
13+
ui_host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
14+
defaults: "2025-11-30",
15+
person_profiles: "always",
16+
loaded: (posthog) => {
17+
if (process.env.NODE_ENV === "development") posthog.debug();
18+
},
19+
});
20+
};
21+
22+
initPostHog();

0 commit comments

Comments
 (0)