Skip to content

Commit

Permalink
otel-{sdk,api} upgrade to 0.25.0 (#716)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lizthegrey
lizthegrey committed Aug 27, 2021
1 parent 91baae2 commit 39e659b
Show file tree
Hide file tree
Showing 3 changed files with 122 additions and 94 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/core": "^0.24.0",
"@opentelemetry/exporter-collector-grpc": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/core": "^0.25.0",
"@opentelemetry/exporter-collector-grpc": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-express": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/instrumentation-pg": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@sentry/node": "^6.11.0",
"axios": "^0.21.1",
"bluebird": "^3.7.2",
Expand Down
4 changes: 2 additions & 2 deletions src/server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import { getPostgresKnex } from "./db/getPostgresKnex";
// import { DiagConsoleLogger, DiagLogLevel, diag } from "@opentelemetry/api";
// diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);

import { NodeTracerProvider } from "@opentelemetry/node";
import { BatchSpanProcessor } from "@opentelemetry/tracing";
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
import { registerInstrumentations } from "@opentelemetry/instrumentation";
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
Expand Down
200 changes: 114 additions & 86 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,17 +322,17 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"

"@grpc/grpc-js@^1.2.12", "@grpc/grpc-js@^1.3.7":
"@grpc/grpc-js@^1.3.7":
version "1.3.7"
resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz#58b687aff93b743aafde237fd2ee9a3259d7f2d8"
integrity sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==
dependencies:
"@types/node" ">=12.12.47"

"@grpc/proto-loader@^0.6.0":
version "0.6.2"
resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.2.tgz#412575f3ff5ef0a9b79d4ea12c08cba5601041cb"
integrity sha512-q2Qle60Ht2OQBCp9S5hv1JbI4uBBq6/mqSevFNK3ZEgRDBCAkWqZPUhD/K9gXOHrHKluliHiVq2L9sw1mVyAIg==
"@grpc/proto-loader@^0.6.4":
version "0.6.4"
resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.4.tgz#5438c0d771e92274e77e631babdc14456441cbdc"
integrity sha512-7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ==
dependencies:
"@types/long" "^4.0.1"
lodash.camelcase "^4.3.0"
Expand Down Expand Up @@ -578,47 +578,60 @@
resolved "https://registry.yarnpkg.com/@opentelemetry/api-metrics/-/api-metrics-0.24.0.tgz#54e3d6ef20fd9b489446cc3f102b48a212af04d7"
integrity sha512-hdpkMeVlRGTuMshD2ZFaDjA/U0cZTkxUkJFvS/4yOiWfw+kEASmGE+U0/i9lbdQKuCR7X1rXSjbcYumlHcMG+A==

"@opentelemetry/api-metrics@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz#3b996842c8043068da4d11a6e96960e757ad6be9"
integrity sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==

"@opentelemetry/api@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.2.tgz#921e1f2b2484b762d77225a8a25074482d93fccf"
integrity sha512-DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww==

"@opentelemetry/context-async-hooks@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-0.24.0.tgz#d726cda794f8057c63631d111c7375744ed1cc75"
integrity sha512-Db8AgMByBEFKLJGSUBlNq4Un/Tqzj5W0hTxx3hIic8DvBwqbvUvkMGuiQYLKE2Ay21cLYMT01xK4TEKz0OxADw==
"@opentelemetry/context-async-hooks@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-0.25.0.tgz#35e0552a900a1db065dd9d3996729486fe21f78a"
integrity sha512-XNjlBalbN82qCfkgPpof6g3oU/LZoyoGGrluA+cy4AKWjJ9FdEZqKwX2p2WHxEuWm8TrHh5HxqEXH5OH2o/5tw==

"@opentelemetry/core@0.25.0", "@opentelemetry/core@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-0.25.0.tgz#44fae79865483be5dacdf72f99db9f1a603c4bae"
integrity sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==
dependencies:
"@opentelemetry/semantic-conventions" "0.25.0"
semver "^7.3.5"

"@opentelemetry/core@0.24.0", "@opentelemetry/core@^0.24.0":
"@opentelemetry/core@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-0.24.0.tgz#94033ebab10fdf008f8dae19c9547dadef30a2b2"
integrity sha512-KpsfxBbFTZT9zaB4Es/fFLbvSzVl9Io/8UUu/TYl4/HgqkmyVInNlWTgRiKyz9nsHzFpGP1kdZJj+YIut0IFsw==
dependencies:
"@opentelemetry/semantic-conventions" "0.24.0"
semver "^7.1.3"

"@opentelemetry/exporter-collector-grpc@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-collector-grpc/-/exporter-collector-grpc-0.24.0.tgz#46ee41e503dd1d2c00d4c574a771813d948551b1"
integrity sha512-1KSur/+42QuzMyncK4dzKyBgwBheyrTGee0zhd7bBKe9/QjRDyQeCoCc1G+FchpMZKBVNe7zVQTnm+H6BTixDA==
dependencies:
"@grpc/grpc-js" "^1.2.12"
"@grpc/proto-loader" "^0.6.0"
"@opentelemetry/core" "0.24.0"
"@opentelemetry/exporter-collector" "0.24.0"
"@opentelemetry/metrics" "0.24.0"
"@opentelemetry/resources" "0.24.0"
"@opentelemetry/tracing" "0.24.0"

"@opentelemetry/exporter-collector@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-collector/-/exporter-collector-0.24.0.tgz#6937e9d2536bf40d452853944a8068074de89670"
integrity sha512-lI/oW7JkGisUofY4g+YmgGSlHuHgjteqRj539IIugmd3/RlY8j2mmAfRK4bwcODTBrxzA8X8Ty/Yh8Ljg18c8Q==
dependencies:
"@opentelemetry/api-metrics" "0.24.0"
"@opentelemetry/core" "0.24.0"
"@opentelemetry/metrics" "0.24.0"
"@opentelemetry/resources" "0.24.0"
"@opentelemetry/tracing" "0.24.0"
"@opentelemetry/exporter-collector-grpc@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-collector-grpc/-/exporter-collector-grpc-0.25.0.tgz#48ba46d3c07de4b28497f3b88d23a85d4e1d5a9a"
integrity sha512-Mqkdh89pC1NxX5BngxHmDqMQ6WVCFuMr1PvwRZmJBBR2MXaStO5qIxELHuHgkDZEXpIFJbqNC7JAfDklXm8o1w==
dependencies:
"@grpc/grpc-js" "^1.3.7"
"@grpc/proto-loader" "^0.6.4"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/exporter-collector" "0.25.0"
"@opentelemetry/resources" "0.25.0"
"@opentelemetry/sdk-metrics-base" "0.25.0"
"@opentelemetry/sdk-trace-base" "0.25.0"

"@opentelemetry/exporter-collector@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-collector/-/exporter-collector-0.25.0.tgz#5c6a6a95cb2220aba6085f79b561166e150737df"
integrity sha512-xZYstLt4hz1aTloJaepWdjMMf9305MqwqbUWjcU/X9pOxvgFWRlchO6x/HQTw7ow0i/S+ShzC+greKnb+1WvLA==
dependencies:
"@opentelemetry/api-metrics" "0.25.0"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/resources" "0.25.0"
"@opentelemetry/sdk-metrics-base" "0.25.0"
"@opentelemetry/sdk-trace-base" "0.25.0"

"@opentelemetry/instrumentation-express@^0.24.0":
version "0.24.0"
Expand All @@ -630,15 +643,15 @@
"@opentelemetry/semantic-conventions" "^0.24.0"
"@types/express" "4.17.13"

"@opentelemetry/instrumentation-http@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.24.0.tgz#745a77baf16e4775103303691a38a4e7391f7a9d"
integrity sha512-LP0Iw24GFZvsAhUUFgmv8beG4vPEhDsgbHXOcGoSxHntnaDOY+5Df8y5CybSdt/DgqtkKr+3bs+TloeTHNu3Tw==
"@opentelemetry/instrumentation-http@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.25.0.tgz#aade844b6af2d02a1b6d705717af73308a4c2c9e"
integrity sha512-unQsS48RmAD/4za8gm8fvNCjrxq/iVxDJ+qO9PLbijET95ZTnS0FTq8rDS+/p9Q2X1REB1h9PmuCZc+3JehkcA==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/instrumentation" "0.24.0"
"@opentelemetry/semantic-conventions" "0.24.0"
semver "^7.1.3"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/instrumentation" "0.25.0"
"@opentelemetry/semantic-conventions" "0.25.0"
semver "^7.3.5"

"@opentelemetry/instrumentation-pg@^0.24.0":
version "0.24.0"
Expand All @@ -650,7 +663,17 @@
"@types/pg" "8.6.1"
"@types/pg-pool" "2.0.3"

"@opentelemetry/instrumentation@0.24.0", "@opentelemetry/instrumentation@^0.24.0":
"@opentelemetry/instrumentation@0.25.0", "@opentelemetry/instrumentation@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.25.0.tgz#f19583f3d77ac5087581c317505f551b930c73f9"
integrity sha512-G9V2ISxrgUgdckZHZXu+kzeEgC76vRyZXlRdwXOT6VsJKHE+UENnC/502wNtPCFERgWSJ56W/51egkgkcKp6bA==
dependencies:
"@opentelemetry/api-metrics" "0.25.0"
require-in-the-middle "^5.0.3"
semver "^7.3.2"
shimmer "^1.2.1"

"@opentelemetry/instrumentation@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.24.0.tgz#93e78c7f2570bfe1c57e1bb3664b59482cbb0366"
integrity sha512-Kn581LUJrVsuV6j8KjNpNWFecyrLoc3GRiTpXUl48LVtm9CCbdwNZGe3PRmWN1Mb/bmWr/tt3GHcuhyUxAsY0A==
Expand All @@ -660,64 +683,69 @@
semver "^7.3.2"
shimmer "^1.2.1"

"@opentelemetry/metrics@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/metrics/-/metrics-0.24.0.tgz#3298b504049a20316513cd9de726f069b238ec66"
integrity sha512-QqmQCzrSuJE+sCOJ2xXNhctWPp/Am9ILs0Y01MDS08PRJoK20akKHM7eC4oU8ZdXphMg8rYgW2w7tY8rqvYnJg==
"@opentelemetry/propagator-b3@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-b3/-/propagator-b3-0.25.0.tgz#2b45966538ef2643c956152df315c0418b5c2302"
integrity sha512-FMdy4YOZO56w2+pxsXWARWa+2F8N7fHW+ZfSFB937Q/oyOZ/2dhj3Ep12gqIH/qV6+kAblgiqOAMyOcnwBCUog==
dependencies:
"@opentelemetry/api-metrics" "0.24.0"
"@opentelemetry/core" "0.24.0"
"@opentelemetry/resources" "0.24.0"
lodash.merge "^4.6.2"
"@opentelemetry/core" "0.25.0"

"@opentelemetry/node@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/node/-/node-0.24.0.tgz#ef3f3ebc249e71eec2513f1372206f2eae089d85"
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/propagator-jaeger@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-jaeger/-/propagator-jaeger-0.25.0.tgz#964941cf97cd7250b699af35363d4cfe5fb37b15"
integrity sha512-GipAgda8xTQa5YrnCQBzWVcUQO7vMsz2AROFse3QXnmgdKz07bIBQFqQLXvr4SHr38LiOVpZWe7Nvfqtuz/0HA==
dependencies:
"@opentelemetry/core" "0.25.0"

"@opentelemetry/propagator-b3@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-b3/-/propagator-b3-0.24.0.tgz#b5971dee565b76323dd3b3727acee1c452dd0fec"
integrity sha512-iV7KSN0LkEAkeVCbhaIJAgTEb7HCnVkprmpgkL6q79rP3vTW4dylwfBYgIwod7y0GT4Ofgomm0NrwwWiuGLbQA==
"@opentelemetry/resources@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-0.25.0.tgz#a780ab536577359ca9ebe93ccc5d02ba8c3fb2ce"
integrity sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/semantic-conventions" "0.25.0"

"@opentelemetry/propagator-jaeger@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-jaeger/-/propagator-jaeger-0.24.0.tgz#b212df61a28af9e0a49bd0f86436537c4942dcc3"
integrity sha512-QXCxBwuSka+vXbBZdumtF7YKO84gwTyKy3GelZV5BPlgWoge0AbLR3DfsO9Beu13pmD+4PyuwMw3LfYsgG1+3g==
"@opentelemetry/sdk-metrics-base@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics-base/-/sdk-metrics-base-0.25.0.tgz#3ac340ef9f1ff7c649339bb031f6c390a2c8ed70"
integrity sha512-7fwPlAFB5Xw8mnVQfq0wqKNw3RXiAMad9T1bk5Sza9LK/L6hz8RTuHWCsFMsj+1OOSAaiPFuUMYrK1J75+2IAg==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/api-metrics" "0.25.0"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/resources" "0.25.0"
lodash.merge "^4.6.2"

"@opentelemetry/resources@0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-0.24.0.tgz#834e5a4d0a64ed4de085add8308be203959c44b4"
integrity sha512-uEr2m13IRkjQAjX6fsYqJ21aONCspRvuQunaCl8LbH1NS1Gj82TuRUHF6TM82ulBPK8pU+nrrqXKuky2cMcIzw==
"@opentelemetry/sdk-trace-base@0.25.0", "@opentelemetry/sdk-trace-base@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz#4393903a7db8a5ae81a99c4a34121df67e4fdfbe"
integrity sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==
dependencies:
"@opentelemetry/core" "0.24.0"
"@opentelemetry/semantic-conventions" "0.24.0"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/resources" "0.25.0"
"@opentelemetry/semantic-conventions" "0.25.0"
lodash.merge "^4.6.2"

"@opentelemetry/sdk-trace-node@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-0.25.0.tgz#b21cc89d588a861eafe347154ca00778adf78e2e"
integrity sha512-j3bI3uhopgowdrJWIWkee/W5j0zeNk5Wydi7YGLayci+g/Ue3QYJaKlqaK2V7Rda1N8GY5d+k1CGQ3vE0DCOoQ==
dependencies:
"@opentelemetry/context-async-hooks" "0.25.0"
"@opentelemetry/core" "0.25.0"
"@opentelemetry/propagator-b3" "0.25.0"
"@opentelemetry/propagator-jaeger" "0.25.0"
"@opentelemetry/sdk-trace-base" "0.25.0"
semver "^7.3.5"

"@opentelemetry/semantic-conventions@0.24.0", "@opentelemetry/semantic-conventions@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz#1028ef0e0923b24916158d80d2ddfd67ea8b6740"
integrity sha512-a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA==

"@opentelemetry/tracing@0.24.0", "@opentelemetry/tracing@^0.24.0":
version "0.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/tracing/-/tracing-0.24.0.tgz#63077fe77b2f450442cb36710ea355db76f60faa"
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"
"@opentelemetry/semantic-conventions@0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz#c100d146957949608c6b9614267ae044cdcb5315"
integrity sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==

"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
version "1.1.2"
Expand Down

0 comments on commit 39e659b

Please sign in to comment.