Skip to content

Commit a32d95f

Browse files
ericallamericallam
committed
Upgrade and unify @opentelemetry/* packages (and remove storybook from the webapp)
1 parent 0839156 commit a32d95f

File tree

14 files changed

+3154
-10601
lines changed

14 files changed

+3154
-10601
lines changed

‎apps/webapp/.storybook/main.ts

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎apps/webapp/.storybook/preview.tsx

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎apps/webapp/app/entry.server.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { H } from "@highlight-run/node";
21
import {
32
createReadableStreamFromReadable,
43
type DataFunctionArgs,
@@ -165,10 +164,6 @@ function handleBrowserRequest(
165164
});
166165
}
167166

168-
if (env.HIGHLIGHT_PROJECT_ID) {
169-
H.init({ projectID: env.HIGHLIGHT_PROJECT_ID });
170-
}
171-
172167
export function handleError(error: unknown, { request, params, context }: DataFunctionArgs) {
173168
logError(error, request);
174169
}
@@ -178,18 +173,6 @@ Worker.init().catch((error) => {
178173
});
179174

180175
function logError(error: unknown, request?: Request) {
181-
if (env.HIGHLIGHT_PROJECT_ID) {
182-
const parsed = request ? H.parseHeaders(Object.fromEntries(request.headers)) : undefined;
183-
if (error instanceof Error) {
184-
H.consumeError(error, parsed?.secureSessionId, parsed?.requestId);
185-
} else {
186-
H.consumeError(
187-
new Error(`Unknown error: ${JSON.stringify(error)}`),
188-
parsed?.secureSessionId,
189-
parsed?.requestId
190-
);
191-
}
192-
}
193176
console.error(error);
194177
}
195178

‎apps/webapp/app/root.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { ErrorBoundary as HighlightErrorBoundary } from "@highlight-run/react";
21
import type { LinksFunction, LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
32
import type { ShouldRevalidateFunction } from "@remix-run/react";
43
import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration } from "@remix-run/react";
@@ -111,9 +110,7 @@ function App() {
111110
<Links />
112111
</head>
113112
<body className="bg-darkBackground h-full overflow-hidden">
114-
<HighlightErrorBoundary>
115-
<Outlet />
116-
</HighlightErrorBoundary>
113+
<Outlet />
117114
<Toast />
118115
<ScrollRestoration />
119116
<ExternalScripts />

‎apps/webapp/package.json

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
"generate:sourcemaps": "remix build --sourcemap",
2020
"clean:sourcemaps": "run-s clean:sourcemaps:*",
2121
"clean:sourcemaps:public": "rimraf ./build/**/*.map",
22-
"clean:sourcemaps:build": "rimraf ./public/build/**/*.map",
23-
"storybook": "storybook dev -p 6006 --no-open",
24-
"build-storybook": "storybook build"
22+
"clean:sourcemaps:build": "rimraf ./public/build/**/*.map"
2523
},
2624
"eslintIgnore": [
2725
"/node_modules",
@@ -44,24 +42,22 @@
4442
"@depot/sdk-node": "^0.5.0",
4543
"@headlessui/react": "^1.7.8",
4644
"@heroicons/react": "^2.0.12",
47-
"@highlight-run/node": "^3.1.0",
48-
"@highlight-run/react": "^3.2.0",
4945
"@internationalized/date": "^3.5.1",
5046
"@lezer/highlight": "^1.1.6",
51-
"@opentelemetry/api": "^1.7.0",
52-
"@opentelemetry/core": "^1.21.0",
53-
"@opentelemetry/exporter-logs-otlp-http": "^0.48.0",
54-
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
55-
"@opentelemetry/instrumentation": "^0.48.0",
56-
"@opentelemetry/instrumentation-express": "^0.35.0",
57-
"@opentelemetry/instrumentation-http": "^0.48.0",
58-
"@opentelemetry/resources": "^1.21.0",
59-
"@opentelemetry/sdk-logs": "^0.48.0",
60-
"@opentelemetry/sdk-node": "^0.48.0",
61-
"@opentelemetry/sdk-trace-base": "^1.21.0",
62-
"@opentelemetry/sdk-trace-node": "^1.21.0",
63-
"@opentelemetry/semantic-conventions": "^1.21.0",
64-
"@prisma/instrumentation": "^5.9.1",
47+
"@opentelemetry/api": "^1.8.0",
48+
"@opentelemetry/core": "^1.22.0",
49+
"@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
50+
"@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
51+
"@opentelemetry/instrumentation": "^0.49.1",
52+
"@opentelemetry/instrumentation-express": "^0.36.1",
53+
"@opentelemetry/instrumentation-http": "^0.49.1",
54+
"@opentelemetry/resources": "^1.22.0",
55+
"@opentelemetry/sdk-logs": "^0.49.1",
56+
"@opentelemetry/sdk-node": "^0.49.1",
57+
"@opentelemetry/sdk-trace-base": "^1.22.0",
58+
"@opentelemetry/sdk-trace-node": "^1.22.0",
59+
"@opentelemetry/semantic-conventions": "^1.22.0",
60+
"@prisma/instrumentation": "^5.11.0",
6561
"@radix-ui/react-alert-dialog": "^1.0.4",
6662
"@radix-ui/react-dialog": "^1.0.3",
6763
"@radix-ui/react-label": "^2.0.1",
@@ -164,17 +160,6 @@
164160
"@remix-run/dev": "2.1.0",
165161
"@remix-run/eslint-config": "2.1.0",
166162
"@remix-run/testing": "^2.1.0",
167-
"@storybook/addon-backgrounds": "^7.0.7",
168-
"@storybook/addon-docs": "^7.0.12",
169-
"@storybook/addon-essentials": "^7.0.7",
170-
"@storybook/addon-interactions": "^7.0.7",
171-
"@storybook/addon-links": "^7.0.7",
172-
"@storybook/addon-styling": "^1.0.5",
173-
"@storybook/addon-viewport": "^7.0.7",
174-
"@storybook/blocks": "^7.0.7",
175-
"@storybook/react": "^7.0.7",
176-
"@storybook/react-webpack5": "^7.0.7",
177-
"@storybook/testing-library": "^0.0.14-next.2",
178163
"@swc/core": "^1.3.4",
179164
"@swc/helpers": "^0.4.11",
180165
"@tailwindcss/forms": "^0.5.3",
@@ -219,9 +204,6 @@
219204
"prettier-plugin-tailwindcss": "^0.3.0",
220205
"prop-types": "^15.8.1",
221206
"rimraf": "^3.0.2",
222-
"storybook": "^7.0.7",
223-
"storybook-addon-designs": "7.0.0-beta.2",
224-
"storybook-addon-variants": "^0.2.0",
225207
"style-loader": "^3.3.4",
226208
"tailwind-scrollbar": "^3.0.1",
227209
"tailwindcss": "3.4.1",
@@ -232,4 +214,4 @@
232214
"engines": {
233215
"node": ">=16.0.0"
234216
}
235-
}
217+
}

‎packages/cli-v3/package.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,20 @@
7575
"test": "vitest"
7676
},
7777
"dependencies": {
78-
"@baselime/node-opentelemetry": "^0.4.6",
7978
"@clack/prompts": "^0.7.0",
8079
"@depot/cli": "0.0.1-cli.2.55.0",
81-
"@opentelemetry/api": "^1.7.0",
82-
"@opentelemetry/api-logs": "^0.48.0",
83-
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
84-
"@opentelemetry/exporter-collector": "^0.25.0",
85-
"@opentelemetry/exporter-logs-otlp-http": "^0.48.0",
86-
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
87-
"@opentelemetry/instrumentation": "^0.48.0",
88-
"@opentelemetry/instrumentation-fetch": "^0.48.0",
89-
"@opentelemetry/instrumentation-http": "^0.48.0",
90-
"@opentelemetry/resources": "^1.21.0",
91-
"@opentelemetry/sdk-logs": "^0.48.0",
92-
"@opentelemetry/sdk-node": "^0.48.0",
93-
"@opentelemetry/sdk-trace-base": "^1.21.0",
94-
"@opentelemetry/sdk-trace-node": "^1.21.0",
95-
"@opentelemetry/semantic-conventions": "^1.21.0",
80+
"@opentelemetry/api": "^1.8.0",
81+
"@opentelemetry/api-logs": "^0.49.1",
82+
"@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
83+
"@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
84+
"@opentelemetry/instrumentation": "^0.49.1",
85+
"@opentelemetry/instrumentation-fetch": "^0.49.1",
86+
"@opentelemetry/resources": "^1.22.0",
87+
"@opentelemetry/sdk-logs": "^0.49.1",
88+
"@opentelemetry/sdk-node": "^0.49.1",
89+
"@opentelemetry/sdk-trace-base": "^1.22.0",
90+
"@opentelemetry/sdk-trace-node": "^1.22.0",
91+
"@opentelemetry/semantic-conventions": "^1.22.0",
9692
"@trigger.dev/core": "workspace:^2.3.18",
9793
"@types/degit": "^2.8.3",
9894
"chalk": "^5.2.0",

‎packages/cli-v3/src/telemetry/tracing.ts

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,59 @@
1-
import { BaselimeSDK } from "@baselime/node-opentelemetry";
2-
import { trace } from "@opentelemetry/api";
1+
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
2+
import { registerInstrumentations } from "@opentelemetry/instrumentation";
3+
import { Resource, detectResourcesSync, processDetectorSync } from "@opentelemetry/resources";
4+
import { NodeTracerProvider, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-node";
35
import { FetchInstrumentation } from "@opentelemetry/instrumentation-fetch";
4-
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
6+
import { DiagConsoleLogger, DiagLogLevel, diag, trace } from "@opentelemetry/api";
57
import * as packageJson from "../../package.json";
68

7-
const sdk = new BaselimeSDK({
8-
baselimeKey: "e9f963244f8b092850d42e34a5339b2d5e68070b".split("").reverse().join(""), // this is a joke
9-
instrumentations: [new FetchInstrumentation()],
10-
service: "cli-v3",
11-
serverless: true,
12-
});
13-
149
function initializeTracing(): NodeTracerProvider | undefined {
15-
if (!process.argv.includes("--skip-telemetry")) {
16-
return sdk.start();
10+
if (process.argv.includes("--skip-telemetry") || process.env.TRIGGER_DEV_SKIP_TELEMETRY) {
11+
return;
12+
}
13+
14+
if (process.env.OTEL_INTERNAL_DIAG_DEBUG) {
15+
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
1716
}
17+
18+
const resource = detectResourcesSync({
19+
detectors: [processDetectorSync],
20+
}).merge(
21+
new Resource({
22+
service: "trigger.dev cli v3",
23+
})
24+
);
25+
26+
const traceProvider = new NodeTracerProvider({
27+
forceFlushTimeoutMillis: 500,
28+
resource,
29+
spanLimits: {
30+
attributeCountLimit: 1000,
31+
attributeValueLengthLimit: 1000,
32+
eventCountLimit: 100,
33+
attributePerEventCountLimit: 100,
34+
linkCountLimit: 10,
35+
attributePerLinkCountLimit: 100,
36+
},
37+
});
38+
39+
const spanExporter = new OTLPTraceExporter({
40+
url: "https://otel.baselime.io/v1",
41+
timeoutMillis: 500,
42+
headers: {
43+
"x-api-key": "e9f963244f8b092850d42e34a5339b2d5e68070b".split("").reverse().join(""), // this is a joke
44+
},
45+
});
46+
47+
const spanProcessor = new SimpleSpanProcessor(spanExporter);
48+
49+
traceProvider.addSpanProcessor(spanProcessor);
50+
traceProvider.register();
51+
52+
registerInstrumentations({
53+
instrumentations: [new FetchInstrumentation()],
54+
});
55+
56+
return traceProvider;
1857
}
1958

2059
export const provider = initializeTracing();

‎packages/core-backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
"node": ">=18.0.0"
4747
},
4848
"dependencies": {
49-
"@opentelemetry/api": "^1.7.0"
49+
"@opentelemetry/api": "^1.8.0"
5050
}
5151
}

‎packages/core/package.json

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,17 @@
5959
},
6060
"dependencies": {
6161
"@google-cloud/precise-date": "^4.0.0",
62-
"@opentelemetry/api": "^1.7.0",
62+
"@opentelemetry/api": "^1.8.0",
6363
"@opentelemetry/api-logs": "^0.48.0",
64-
"@opentelemetry/auto-instrumentations-node": "^0.40.3",
65-
"@opentelemetry/exporter-collector": "^0.25.0",
66-
"@opentelemetry/exporter-logs-otlp-http": "^0.48.0",
67-
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
68-
"@opentelemetry/instrumentation": "^0.48.0",
69-
"@opentelemetry/instrumentation-fetch": "^0.48.0",
70-
"@opentelemetry/instrumentation-http": "^0.48.0",
71-
"@opentelemetry/resources": "^1.21.0",
72-
"@opentelemetry/sdk-logs": "^0.48.0",
73-
"@opentelemetry/sdk-node": "^0.48.0",
74-
"@opentelemetry/sdk-trace-base": "^1.21.0",
75-
"@opentelemetry/sdk-trace-node": "^1.21.0",
76-
"@opentelemetry/semantic-conventions": "^1.21.0",
64+
"@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
65+
"@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
66+
"@opentelemetry/instrumentation": "^0.49.1",
67+
"@opentelemetry/resources": "^1.22.0",
68+
"@opentelemetry/sdk-logs": "^0.49.1",
69+
"@opentelemetry/sdk-node": "^0.49.1",
70+
"@opentelemetry/sdk-trace-base": "^1.22.0",
71+
"@opentelemetry/sdk-trace-node": "^1.22.0",
72+
"@opentelemetry/semantic-conventions": "^1.22.0",
7773
"humanize-duration": "^3.27.3",
7874
"socket.io": "^4.7.4",
7975
"socket.io-client": "^4.7.4",

‎packages/core/src/v3/otel/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Span, SpanStatusCode } from "@opentelemetry/api";
22

33
export { TracingSDK, type TracingSDKConfig, type TracingDiagnosticLogLevel } from "./tracingSDK";
4-
export { HttpInstrumentation, FetchInstrumentation } from "./instrumentations";
54

65
export function recordSpanException(span: Span, error: unknown) {
76
if (error instanceof Error) {

‎packages/core/src/v3/otel/instrumentations.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)