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.

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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Next

## 1.2.9

- Deps: upgrade OTEL dependencies. (#391).
- Fix: send otel timings, like timeUnixNano, as string instead in LongBits format (391).
- Feat: session based sampling (#385).

## 1.2.8
Expand Down
30 changes: 13 additions & 17 deletions demo/package.json
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
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
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
29 changes: 13 additions & 16 deletions packages/web-tracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,19 @@
},
"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"
},
"resolutions": {
"@opentelemetry/api-metrics": "^0.29.1"
"@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
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, useLongBits: false });

this.config.api.pushTraces(traceEvent);

Expand Down
Loading