Skip to content

Commit

Permalink
Downgrade @opentelemetry/api to match auto-instrumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Starefossen
Starefossen committed Aug 15, 2024
1 parent d11bd29 commit 1f0f8a7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 78 deletions.
7 changes: 3 additions & 4 deletions flaky-frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
"lint": "next lint"
},
"dependencies": {
"@grafana/faro-web-sdk": "^1.9.0",
"@grafana/faro-web-tracing": "^1.9.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/node": "^0.24.0",
"@grafana/faro-web-sdk": "1.8.2",
"@grafana/faro-web-tracing": "1.8.2",
"@opentelemetry/api": "1.8.0",
"next": "14.2.5",
"pino": "^9.3.2",
"react": "^18",
Expand Down
4 changes: 2 additions & 2 deletions flaky-frontend/src/app/api/flaky/route.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import getConfig from 'next/config';
import type { NextRequest } from 'next/server';
import pino from 'pino';
import api from '@opentelemetry/api'
import { trace, context } from '@opentelemetry/api'

const { serverRuntimeConfig: c } = getConfig();

export async function GET(request: NextRequest) {
let current_span = api.trace.getSpan(api.context.active());
let current_span = trace.getSpan(context.active());
let trace_id = current_span?.spanContext().traceId;
let span_id = current_span?.spanContext().spanId;

Expand Down
97 changes: 25 additions & 72 deletions flaky-frontend/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,38 @@
resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz"
integrity sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==

"@grafana/faro-core@^1.9.0":
"@grafana/faro-core@^1.8.2", "@grafana/faro-core@^1.9.0":
version "1.9.0"
resolved "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-1.9.0.tgz"
integrity sha512-mxBeAOmL5aIsYU5hC4Zc0D4TA5UzsbpzD81JPHEaCLmi4PHjFZNC66xYNH2MOJQlsTUGPV/e/bXJS8+F5pfFhg==
dependencies:
"@opentelemetry/api" "^1.9.0"
"@opentelemetry/otlp-transformer" "^0.52.0"

"@grafana/faro-web-sdk@^1.9.0":
"@grafana/faro-web-sdk@1.8.2":
version "1.8.2"
resolved "https://registry.yarnpkg.com/@grafana/faro-web-sdk/-/faro-web-sdk-1.8.2.tgz#becda21cb8a6366b824ac9c1ea33de77ac74a1ad"
integrity sha512-626pJ+UI/xWGyMbkNzOQ+NiEZkGxIa7AomakqrMXyBJpN6t2bKv8FP1ztSTZyRVzETyIdfCgfDPnZm9S+Nk+UQ==
dependencies:
"@grafana/faro-core" "^1.8.2"
ua-parser-js "^1.0.32"
web-vitals "^4.0.1"

"@grafana/faro-web-sdk@^1.8.2":
version "1.9.0"
resolved "https://registry.npmjs.org/@grafana/faro-web-sdk/-/faro-web-sdk-1.9.0.tgz"
resolved "https://registry.yarnpkg.com/@grafana/faro-web-sdk/-/faro-web-sdk-1.9.0.tgz#8a5e472e2846b972c83304692cb602a2860cb4c2"
integrity sha512-BRtOpT/Du5pL25AAH0GNM9j7VrJZrDFEumTHG1ku3l+INMZ3j6SqBWiOT5R2Zeh95Tpz848OZoYL8AnN9NocfQ==
dependencies:
"@grafana/faro-core" "^1.9.0"
ua-parser-js "^1.0.32"
web-vitals "^4.0.1"

"@grafana/faro-web-tracing@^1.9.0":
version "1.9.0"
resolved "https://registry.npmjs.org/@grafana/faro-web-tracing/-/faro-web-tracing-1.9.0.tgz"
integrity sha512-deXyv0B2gcpJHbyr4lsB3HrGBJavdOCF5+nWWzoidzjaxdUiLUgfiI38ft5IELHqGZ9ULIor1lkBHxGg+AcIFQ==
"@grafana/faro-web-tracing@1.8.2":
version "1.8.2"
resolved "https://registry.yarnpkg.com/@grafana/faro-web-tracing/-/faro-web-tracing-1.8.2.tgz#37d8ab9c4da320565b091e393781c1e6e1a54556"
integrity sha512-yxMotX08rHmrkDrMDKNDtTil+K1+PMwbHuZHSPnevYPlL66tflC3ng/L1LfaAg+6aiR32EOYYL4R/Vr0Bx602g==
dependencies:
"@grafana/faro-web-sdk" "^1.9.0"
"@grafana/faro-web-sdk" "^1.8.2"
"@opentelemetry/api" "^1.9.0"
"@opentelemetry/context-zone" "1.21.0"
"@opentelemetry/core" "^1.25.0"
Expand Down Expand Up @@ -273,16 +282,16 @@
dependencies:
"@opentelemetry/api" "^1.0.0"

"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.9.0":
"@opentelemetry/api@1.8.0", "@opentelemetry/api@^1.0.0":
version "1.8.0"
resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz"
integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==

"@opentelemetry/api@^1.9.0":
version "1.9.0"
resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz"
integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==

"@opentelemetry/context-async-hooks@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-0.24.0.tgz"
integrity sha512-Db8AgMByBEFKLJGSUBlNq4Un/Tqzj5W0hTxx3hIic8DvBwqbvUvkMGuiQYLKE2Ay21cLYMT01xK4TEKz0OxADw==

"@opentelemetry/context-zone-peer-dep@1.21.0":
version "1.21.0"
resolved "https://registry.npmjs.org/@opentelemetry/context-zone-peer-dep/-/context-zone-peer-dep-1.21.0.tgz"
Expand All @@ -296,14 +305,6 @@
"@opentelemetry/context-zone-peer-dep" "1.21.0"
zone.js "^0.11.0"

"@opentelemetry/core@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/core/-/core-0.24.0.tgz"
integrity sha512-KpsfxBbFTZT9zaB4Es/fFLbvSzVl9Io/8UUu/TYl4/HgqkmyVInNlWTgRiKyz9nsHzFpGP1kdZJj+YIut0IFsw==
dependencies:
"@opentelemetry/semantic-conventions" "0.24.0"
semver "^7.1.3"

"@opentelemetry/core@1.25.1", "@opentelemetry/core@^1.25.0":
version "1.25.1"
resolved "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz"
Expand Down Expand Up @@ -354,18 +355,6 @@
semver "^7.5.2"
shimmer "^1.2.1"

"@opentelemetry/node@^0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/node/-/node-0.24.0.tgz"
integrity sha512-Sy8QooZFOeVUcJIKetw5xsq15/1ivZovWg0RnKWtzURMQrcOxmQ3bGrXPORklOJxOtf5snDHgT37Y7dBgr+c+g==
dependencies:
"@opentelemetry/context-async-hooks" "0.24.0"
"@opentelemetry/core" "0.24.0"
"@opentelemetry/propagator-b3" "0.24.0"
"@opentelemetry/propagator-jaeger" "0.24.0"
"@opentelemetry/tracing" "0.24.0"
semver "^7.1.3"

"@opentelemetry/otlp-exporter-base@0.52.1":
version "0.52.1"
resolved "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.52.1.tgz"
Expand All @@ -387,28 +376,6 @@
"@opentelemetry/sdk-trace-base" "1.25.1"
protobufjs "^7.3.0"

"@opentelemetry/propagator-b3@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-0.24.0.tgz"
integrity sha512-iV7KSN0LkEAkeVCbhaIJAgTEb7HCnVkprmpgkL6q79rP3vTW4dylwfBYgIwod7y0GT4Ofgomm0NrwwWiuGLbQA==
dependencies:
"@opentelemetry/core" "0.24.0"

"@opentelemetry/propagator-jaeger@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/propagator-jaeger/-/propagator-jaeger-0.24.0.tgz"
integrity sha512-QXCxBwuSka+vXbBZdumtF7YKO84gwTyKy3GelZV5BPlgWoge0AbLR3DfsO9Beu13pmD+4PyuwMw3LfYsgG1+3g==
dependencies:
"@opentelemetry/core" "0.24.0"

"@opentelemetry/resources@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.24.0.tgz"
integrity sha512-uEr2m13IRkjQAjX6fsYqJ21aONCspRvuQunaCl8LbH1NS1Gj82TuRUHF6TM82ulBPK8pU+nrrqXKuky2cMcIzw==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/semantic-conventions" "0.24.0"

"@opentelemetry/resources@1.25.1", "@opentelemetry/resources@^1.25.0":
version "1.25.1"
resolved "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz"
Expand Down Expand Up @@ -453,26 +420,11 @@
"@opentelemetry/sdk-trace-base" "1.25.1"
"@opentelemetry/semantic-conventions" "1.25.1"

"@opentelemetry/semantic-conventions@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"
integrity sha512-a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA==

"@opentelemetry/semantic-conventions@1.25.1", "@opentelemetry/semantic-conventions@^1.25.0":
version "1.25.1"
resolved "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz"
integrity sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==

"@opentelemetry/tracing@0.24.0":
version "0.24.0"
resolved "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.24.0.tgz"
integrity sha512-sTLEs1SIon3xV8vLe53PzfbU0FahoxL9NPY/CYvA1mwGbMu4zHkHAjqy1Tc8JmqRrfa+XrHkmzeSM4hrvloBaA==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/resources" "0.24.0"
"@opentelemetry/semantic-conventions" "0.24.0"
lodash.merge "^4.6.2"

"@pkgjs/parseargs@^0.11.0":
version "0.11.0"
resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
Expand Down Expand Up @@ -2864,7 +2816,7 @@ semver@^6.3.1:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

semver@^7.1.3, semver@^7.5.2, semver@^7.5.4:
semver@^7.5.2, semver@^7.5.4:
version "7.6.3"
resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
Expand Down Expand Up @@ -2958,6 +2910,7 @@ streamsearch@^1.1.0:
integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==

"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
name string-width-cjs
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down

0 comments on commit 1f0f8a7

Please sign in to comment.