Skip to content

Commit

Permalink
release new sdk versions without jaeger dependency (#6838)
Browse files Browse the repository at this point in the history 
## Summary

References new opentelemetry dependencies with
open-telemetry/opentelemetry-js#4049 merged
Explicitly makes `@opentelemetry/exporter-jaeger` a dev dependency so
that consumers
do not reference it in their bundle.

## How did you test this change?

Local e2e app using yalc published SDK.

repro app is working correctly
https://discord.com/channels/1026884757667188757/1138948448507404338

![image](https://github.com/highlight/highlight/assets/1351531/31b87688-d2de-40dc-80cf-c7946b5a1eee)

## Are there any deployment considerations?

Changeset included.

## Does this work require review from our design team?

No
  • Loading branch information
@Vadman97
Vadman97 committed Oct 12, 2023
1 parent 13bbdad commit 6833308
Show file tree
Hide file tree
Showing 7 changed files with 560 additions and 630 deletions.
6 changes: 6 additions & 0 deletions .changeset/spotty-buses-flash.md
View file
@@ -0,0 +1,6 @@
---
'@highlight-run/next': patch
'@highlight-run/node': patch
---

update opentelemetry dependencies to remove jaeger
21 changes: 21 additions & 0 deletions .yarn/patches/@opentelemetry-sdk-node-npm-0.44.0-88c2c5ddfd.patch
View file
@@ -0,0 +1,21 @@
diff --git a/package.json b/package.json
index 4b462f69640f1241ea400e3b491548d80eba01fc..731c1ae5f1b1eec789a524f7fbbda83d61574a73 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
"dependencies": {
"@opentelemetry/api-logs": "0.44.0",
"@opentelemetry/core": "1.17.1",
- "@opentelemetry/exporter-jaeger": "1.17.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.44.0",
"@opentelemetry/exporter-trace-otlp-http": "0.44.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.44.0",
@@ -65,7 +64,7 @@
"devDependencies": {
"@opentelemetry/api": "1.6.0",
"@opentelemetry/context-async-hooks": "1.17.1",
- "@opentelemetry/exporter-jaeger": "1.17.0",
+ "@opentelemetry/exporter-jaeger": "1.17.1",
"@types/mocha": "10.0.2",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
2 changes: 1 addition & 1 deletion e2e/nextjs/package.json
View file
Expand Up @@ -13,7 +13,7 @@
"hoistingLimits": "workspaces"
},
"dependencies": {
"@highlight-run/next": "workspace:^",
"@highlight-run/next": "workspace:*",
"@next/env": "^13.5.4",
"@tanstack/react-query": "^4.35.7",
"@trpc/client": "^10.38.5",
Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Expand Up @@ -93,13 +93,16 @@
},
"packageManager": "yarn@3.5.0",
"resolutions": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/auto-instrumentations-node": "0.38.0",
"@opentelemetry/exporter-trace-otlp-http": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-node": "0.41.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/auto-instrumentations-node": "0.39.2",
"@opentelemetry/core": "1.17.1",
"@opentelemetry/exporter-jaeger": "1.17.1",
"@opentelemetry/exporter-trace-otlp-http": "0.44.0",
"@opentelemetry/instrumentation": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-node": "0.44.0",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1",
"@sideway/formula": "3.0.1",
"@types/dom-webcodecs": "0.1.4",
"ansi-regex": "3.0.1",
Expand Down Expand Up @@ -140,11 +143,8 @@
"undici": "5.19.1",
"webpack": "5.76.0",
"lodash-es@^4.17.21": "patch:lodash-es@npm%3A4.17.21#./.yarn/patches/lodash-es-npm-4.17.21-b45832dfce.patch",
"@opentelemetry/instrumentation@0.43.0": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/instrumentation@^0.43.0": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/instrumentation@0.41.2": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/instrumentation@^0.41.0": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/instrumentation@0.41.0": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/instrumentation@0.44.0": "patch:@opentelemetry/instrumentation@npm%3A0.41.2#./.yarn/patches/@opentelemetry-instrumentation-npm-0.41.2-fffbd54e4e.patch",
"@opentelemetry/sdk-node@0.44.0": "patch:@opentelemetry/sdk-node@npm%3A0.44.0#./.yarn/patches/@opentelemetry-sdk-node-npm-0.44.0-88c2c5ddfd.patch",
"ansi-color@^0.2.1": "patch:ansi-color@npm%3A0.2.1#./.yarn/patches/ansi-color-npm-0.2.1-f7243d10a4.patch",
"protobufjs@^7.2.1": "patch:protobufjs@npm%3A7.2.2#./.yarn/patches/protobufjs-npm-7.2.2-09f46988fc.patch",
"protobufjs@^7.0.0": "patch:protobufjs@npm%3A7.2.2#./.yarn/patches/protobufjs-npm-7.2.2-09f46988fc.patch",
Expand Down
4 changes: 2 additions & 2 deletions sdk/highlight-next/package.json
View file
Expand Up @@ -62,8 +62,8 @@
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230115.0",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/resources": "^1.17.1",
"@trpc/server": "^9.27.4",
"@types/jest": "27.4.1",
"chokidar-cli": "^3.0.0",
Expand Down
17 changes: 9 additions & 8 deletions sdk/highlight-node/package.json
View file
Expand Up @@ -25,17 +25,18 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/auto-instrumentations-node": "0.39.2",
"@opentelemetry/core": "1.17.0",
"@opentelemetry/exporter-trace-otlp-http": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-node": "0.43.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.0",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/auto-instrumentations-node": "^0.39.2",
"@opentelemetry/core": "^1.17.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.44.0",
"@opentelemetry/resources": "^1.17.1",
"@opentelemetry/sdk-node": "^0.44.0",
"@opentelemetry/sdk-trace-base": "^1.17.1",
"@opentelemetry/semantic-conventions": "^1.17.1",
"highlight.run": "workspace:*"
},
"devDependencies": {
"@opentelemetry/exporter-jaeger": "^1.17.1",
"@types/jest": "^29.2.0",
"@types/lru-cache": "^7.10.10",
"@types/node": "17.0.13",
Expand Down

0 comments on commit 6833308

Please sign in to comment.