Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade otel deps #391

Merged
merged 15 commits into from
Nov 28, 2023
Merged

chore: upgrade otel deps #391

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b5a511e
chore: upgrade otel deps
codecapitano Nov 23, 2023
1d86a91
declare otel packages as peer deps
codecapitano Nov 24, 2023
a8a0d82
update changelog
codecapitano Nov 24, 2023
d326728
add missing dependency
codecapitano Nov 24, 2023
1ad6a6f
fix changelog
codecapitano Nov 24, 2023
665a55b
fix some unrelated typos
codecapitano Nov 24, 2023
9e274f7
update 2
codecapitano Nov 24, 2023
5ae0e02
Update options object
codecapitano Nov 24, 2023
21af02b
wip
codecapitano Nov 24, 2023
b897cd0
cleanup and re-install packages
codecapitano Nov 27, 2023
0bb678d
fix: send strings instead of LonBits
codecapitano Nov 27, 2023
f3c7b94
deduplicate packages
codecapitano Nov 27, 2023
4b76a9b
cleanup resolutions and add make otel deps peerDependencies
codecapitano Nov 27, 2023
68f5116
update changelog
codecapitano Nov 27, 2023
be39fa3
remove peer deps
codecapitano Nov 27, 2023
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Next

## 1.2.9

- Chore: upgrade OTEL dependencies in the Web-Tracing package and declare them as peer dependencies
for more stability if different otel.js versions are used (#391).
- Feat: session based sampling (#385).

## 1.2.8
Expand Down
30 changes: 13 additions & 17 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
"@grafana/faro-web-sdk": "^1.2.8",
"@grafana/faro-web-tracing": "^1.2.8",
"@grpc/grpc-js": "^1.9.0",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/core": "^1.15.2",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.44.0",
"@opentelemetry/instrumentation": "^0.44.0",
"@opentelemetry/instrumentation-express": "^0.33.1",
"@opentelemetry/instrumentation-http": "^0.41.2",
"@opentelemetry/instrumentation-pg": "^0.36.1",
"@opentelemetry/instrumentation-winston": "^0.32.1",
"@opentelemetry/resources": "^1.15.2",
"@opentelemetry/sdk-node": "^0.44.0",
"@opentelemetry/sdk-trace-base": "^1.15.2",
"@opentelemetry/sdk-trace-node": "^1.15.2",
"@opentelemetry/semantic-conventions": "^1.15.2",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/core": "^1.18.1",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.45.1",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-express": "^0.33.3",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-pg": "^0.37.1",
"@opentelemetry/instrumentation-winston": "^0.33.0",
"@opentelemetry/resources": "^1.18.1",
"@opentelemetry/sdk-node": "^0.45.1",
"@opentelemetry/sdk-trace-base": "^1.18.1",
"@opentelemetry/sdk-trace-node": "^1.18.1",
"@opentelemetry/semantic-conventions": "^1.18.1",
"@reduxjs/toolkit": "^1.9.1",
"bcrypt": "^5.1.0",
"body-parser": "^1.20.1",
Expand Down Expand Up @@ -99,9 +99,5 @@
"nodemon": "^3.0.1",
"touch": "^3.1.0",
"vite": "^4.3.9"
},
"resolutions": {
"@grpc/grpc-js": "^1.9.0",
"protobufjs": "^7.2.4"
}
}
2 changes: 1 addition & 1 deletion demo/src/client/faro/initialize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function initializeFaro(): Faro {
},
batching: {
// Batching is enabled by default and there is normally no reason to disable it.
// We did iy i the demo so users can inspect each single requests sent due to certain interactions.
// We did it in the demo so users can inspect each single requests sent due to certain interactions.
enabled: false,
},
app: {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"quality:circular-deps": "madge --circular ."
},
"dependencies": {
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-metrics": "^0.33.0",
"@opentelemetry/otlp-transformer": "^0.41.2",
"@opentelemetry/otlp-transformer": "^0.45.1",
"murmurhash-js": "^1.0.0"
},
"devDependencies": {
Expand Down
42 changes: 27 additions & 15 deletions packages/web-tracing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,34 @@
},
"dependencies": {
"@grafana/faro-web-sdk": "^1.2.8",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/context-zone": "^1.15.2",
"@opentelemetry/core": "^1.15.2",
"@opentelemetry/exporter-trace-otlp-http": "^0.41.2",
"@opentelemetry/instrumentation": "^0.44.0",
"@opentelemetry/instrumentation-document-load": "^0.33.0",
"@opentelemetry/instrumentation-fetch": "^0.41.2",
"@opentelemetry/instrumentation-xml-http-request": "^0.44.0",
"@opentelemetry/otlp-transformer": "^0.41.2",
"@opentelemetry/resources": "^1.15.2",
"@opentelemetry/sdk-trace-base": "^1.15.2",
"@opentelemetry/sdk-trace-web": "^1.15.2",
"@opentelemetry/semantic-conventions": "^1.15.2"
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/context-zone": "^1.18.1",
"@opentelemetry/core": "^1.18.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.45.1",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-document-load": "^0.34.0",
"@opentelemetry/instrumentation-fetch": "^0.45.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.45.1",
"@opentelemetry/otlp-transformer": "^0.45.1",
"@opentelemetry/resources": "^1.18.1",
"@opentelemetry/sdk-trace-base": "^1.18.1",
"@opentelemetry/sdk-trace-web": "^1.18.1",
"@opentelemetry/semantic-conventions": "^1.18.1"
},
"resolutions": {
"@opentelemetry/api-metrics": "^0.29.1"
"peerDependencies": {
codecapitano marked this conversation as resolved.
Show resolved Hide resolved
codecapitano marked this conversation as resolved.
Show resolved Hide resolved
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/context-zone": "^1.18.1",
"@opentelemetry/core": "^1.18.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.45.1",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-document-load": "^0.34.0",
"@opentelemetry/instrumentation-fetch": "^0.45.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.45.1",
"@opentelemetry/otlp-transformer": "^0.45.1",
"@opentelemetry/resources": "^1.18.1",
"@opentelemetry/sdk-trace-base": "^1.18.1",
"@opentelemetry/sdk-trace-web": "^1.18.1",
"@opentelemetry/semantic-conventions": "^1.18.1"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/web-tracing/src/faroTraceExporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class FaroTraceExporter implements SpanExporter {
constructor(private config: FaroTraceExporterConfig) {}

export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
const traceEvent = createExportTraceServiceRequest(spans, true);
const traceEvent = createExportTraceServiceRequest(spans, { useHex: true });

this.config.api.pushTraces(traceEvent);

Expand Down
Loading