Skip to content

Commit f8e21fb

Browse files
ardatangithub-actions[bot]EmrysMyrddin
authored andcommitted
Update OpenTelemetry to v2 (#875)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Valentin Cocaud <[email protected]>
1 parent 1dfc4af commit f8e21fb

12 files changed

+420
-563
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
'@graphql-mesh/plugin-opentelemetry': patch
3+
---
4+
5+
dependencies updates:
6+
7+
- Updated dependency [`@opentelemetry/context-async-hooks@^2.0.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/context-async-hooks/v/2.0.0) (from `^1.30.0`, in `dependencies`)
8+
- Updated dependency [`@opentelemetry/exporter-trace-otlp-grpc@^0.200.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/exporter-trace-otlp-grpc/v/0.200.0) (from `^0.57.0`, in `dependencies`)
9+
- Updated dependency [`@opentelemetry/exporter-trace-otlp-http@^0.200.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/exporter-trace-otlp-http/v/0.200.0) (from `^0.57.0`, in `dependencies`)
10+
- Updated dependency [`@opentelemetry/exporter-zipkin@^2.0.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/exporter-zipkin/v/2.0.0) (from `^1.29.0`, in `dependencies`)
11+
- Updated dependency [`@opentelemetry/instrumentation@^0.200.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/instrumentation/v/0.200.0) (from `^0.57.0`, in `dependencies`)
12+
- Updated dependency [`@opentelemetry/resources@^2.0.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/resources/v/2.0.0) (from `^1.29.0`, in `dependencies`)
13+
- Updated dependency [`@opentelemetry/sdk-trace-base@^2.0.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/sdk-trace-base/v/2.0.0) (from `^1.29.0`, in `dependencies`)
14+
- Updated dependency [`@opentelemetry/sdk-trace-web@^2.0.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/sdk-trace-web/v/2.0.0) (from `^1.29.0`, in `dependencies`)

.yarn/patches/@opentelemetry-exporter-trace-otlp-http-npm-0.56.0-dddd282e41.patch renamed to .yarn/patches/@opentelemetry-exporter-trace-otlp-http-npm-0.200.0-80a44c64cd.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/package.json b/package.json
2-
index 8494583b1604d739d2120da81dee9c6f5e053eeb..d1edafb9303aa18a5e617321ae81e237c3a6118e 100644
2+
index d90fb5e21da07efdc8c645cae1327495235910d2..869ab86b744a36da0192da14b638208451d7c147 100644
33
--- a/package.json
44
+++ b/package.json
55
@@ -3,13 +3,13 @@
6-
"version": "0.56.0",
6+
"version": "0.200.0",
77
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
88
"main": "build/src/index.js",
99
- "module": "build/esm/index.js",
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
diff --git a/build/esnext/transport/http-exporter-transport.js b/build/esnext/transport/http-exporter-transport.js
2+
index 7977489487a2236fbd0e4c2273ef53fd3c7b93a8..edec72e84b575cb07ea3e4710f9bcb61f3915805 100644
3+
--- a/build/esnext/transport/http-exporter-transport.js
4+
+++ b/build/esnext/transport/http-exporter-transport.js
5+
@@ -20,7 +20,7 @@ class HttpExporterTransport {
6+
this._parameters = _parameters;
7+
}
8+
async send(data, timeoutMillis) {
9+
- const { agent, send } = this._loadUtils();
10+
+ const { agent, send } = await this._loadUtils();
11+
return new Promise(resolve => {
12+
send(this._parameters, agent, data, result => {
13+
resolve(result);
14+
@@ -30,13 +30,11 @@ class HttpExporterTransport {
15+
shutdown() {
16+
// intentionally left empty, nothing to do.
17+
}
18+
- _loadUtils() {
19+
+ async _loadUtils() {
20+
let utils = this._utils;
21+
if (utils === null) {
22+
// Lazy require to ensure that http/https is not required before instrumentations can wrap it.
23+
- const { sendWithHttp, createHttpAgent,
24+
- // eslint-disable-next-line @typescript-eslint/no-var-requires
25+
- } = require('./http-transport-utils');
26+
+ const { sendWithHttp, createHttpAgent } = await import('./http-transport-utils');
27+
utils = this._utils = {
28+
agent: createHttpAgent(this._parameters.url, this._parameters.agentOptions),
29+
send: sendWithHttp,
30+
diff --git a/package.json b/package.json
31+
index d00689f7f0eb517923fe6f6f9e8b6b624d5936ca..c60c871496c8823ee1c3d0ba62a11553eb35822b 100644
32+
--- a/package.json
33+
+++ b/package.json
34+
@@ -3,24 +3,24 @@
35+
"version": "0.200.0",
36+
"description": "OpenTelemetry OTLP Exporter base (for internal use only)",
37+
"main": "build/src/index.js",
38+
- "module": "build/esm/index.js",
39+
+ "module": "build/esnext/index.js",
40+
"esnext": "build/esnext/index.js",
41+
"types": "build/src/index.d.ts",
42+
"exports": {
43+
".": {
44+
- "module": "./build/esm/index.js",
45+
+ "module": "./build/esnext/index.js",
46+
"esnext": "./build/esnext/index.js",
47+
"types": "./build/src/index.d.ts",
48+
"default": "./build/src/index.js"
49+
},
50+
"./node-http": {
51+
- "module": "./build/esm/index-node-http.js",
52+
+ "module": "./build/esnext/index-node-http.js",
53+
"esnext": "./build/esnext/index-node-http.js",
54+
"types": "./build/src/index-node-http.d.ts",
55+
"default": "./build/src/index-node-http.js"
56+
},
57+
"./browser-http": {
58+
- "module": "./build/esm/index-browser-http.js",
59+
+ "module": "./build/esnext/index-browser-http.js",
60+
"esnext": "./build/esnext/index-browser-http.js",
61+
"types": "./build/src/index-browser-http.d.ts",
62+
"default": "./build/src/index-browser-http.js"

.yarn/patches/@opentelemetry-otlp-exporter-base-npm-0.56.0-ba3dc5f5c5.patch

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)