Skip to content

Commit af62ea2

Browse files
dyladandyladan
authored
Merge 3a58689 into a31b38a 
2 parents a31b38a + 3a58689 commit af62ea2

File tree

47 files changed

+252
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+252
-240
lines changed

‎CHANGELOG.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1111

1212
### :rocket: (Enhancement)
1313

14+
### :bug: (Bug Fix)
15+
16+
### :books: (Refine Doc)
17+
18+
### :house: (Internal)
19+
20+
## 1.12.0
21+
22+
### :rocket: (Enhancement)
23+
1424
* feat(tracing): log span name and IDs when span end is called multiple times [#3716](https://github.com/open-telemetry/opentelemetry-js/pull/3716)
1525
* feat(core): add logs environment variables; add timeout utils method. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
1626

@@ -19,10 +29,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1929
* fix(instrumentation-http): fixed description for http.server.duration metric [#3710](https://github.com/open-telemetry/opentelemetry-js/pull/3710)
2030
* fix(opentelemetry-sdk-trace-web): don't crash in runtimes where location isn't defined [#3715](https://github.com/open-telemetry/opentelemetry-js/pull/3715)
2131

22-
### :books: (Refine Doc)
23-
24-
### :house: (Internal)
25-
2632
## 1.11.0
2733

2834
### :rocket: (Enhancement)

‎examples/http/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "http-example",
33
"private": true,
4-
"version": "0.36.0",
4+
"version": "0.37.0",
55
"description": "Example of HTTP integration with OpenTelemetry",
66
"main": "index.js",
77
"scripts": {

‎examples/https/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "https-example",
33
"private": true,
4-
"version": "0.37.0",
4+
"version": "0.38.0",
55
"description": "Example of HTTPs integration with OpenTelemetry",
66
"main": "build/src/index.js",
77
"types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
3333
},
3434
"dependencies": {
3535
"@opentelemetry/api": "^1.0.0",
36-
"@opentelemetry/exporter-jaeger": "1.11.0",
37-
"@opentelemetry/exporter-zipkin": "1.11.0",
38-
"@opentelemetry/instrumentation": "0.37.0",
39-
"@opentelemetry/instrumentation-http": "0.37.0",
40-
"@opentelemetry/resources": "1.11.0",
41-
"@opentelemetry/sdk-trace-base": "1.11.0",
42-
"@opentelemetry/sdk-trace-node": "1.11.0",
43-
"@opentelemetry/semantic-conventions": "1.11.0"
36+
"@opentelemetry/exporter-jaeger": "1.12.0",
37+
"@opentelemetry/exporter-zipkin": "1.12.0",
38+
"@opentelemetry/instrumentation": "0.38.0",
39+
"@opentelemetry/instrumentation-http": "0.38.0",
40+
"@opentelemetry/resources": "1.12.0",
41+
"@opentelemetry/sdk-trace-base": "1.12.0",
42+
"@opentelemetry/sdk-trace-node": "1.12.0",
43+
"@opentelemetry/semantic-conventions": "1.12.0"
4444
},
4545
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
4646
"devDependencies": {

‎examples/opentelemetry-web/package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "web-opentelemetry-example",
33
"private": true,
4-
"version": "0.37.0",
4+
"version": "0.38.0",
55
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
66
"main": "index.js",
77
"scripts": {
@@ -43,20 +43,20 @@
4343
},
4444
"dependencies": {
4545
"@opentelemetry/api": "^1.3.0",
46-
"@opentelemetry/context-zone": "1.11.0",
47-
"@opentelemetry/core": "1.11.0",
48-
"@opentelemetry/exporter-metrics-otlp-http": "0.37.0",
49-
"@opentelemetry/exporter-trace-otlp-http": "0.37.0",
50-
"@opentelemetry/exporter-trace-otlp-proto": "0.37.0",
51-
"@opentelemetry/exporter-zipkin": "1.11.0",
52-
"@opentelemetry/instrumentation": "0.37.0",
53-
"@opentelemetry/instrumentation-fetch": "0.37.0",
54-
"@opentelemetry/instrumentation-xml-http-request": "0.37.0",
55-
"@opentelemetry/propagator-b3": "1.11.0",
56-
"@opentelemetry/sdk-metrics": "1.11.0",
57-
"@opentelemetry/sdk-trace-base": "1.11.0",
58-
"@opentelemetry/sdk-trace-web": "1.11.0",
59-
"@opentelemetry/semantic-conventions": "1.11.0"
46+
"@opentelemetry/context-zone": "1.12.0",
47+
"@opentelemetry/core": "1.12.0",
48+
"@opentelemetry/exporter-metrics-otlp-http": "0.38.0",
49+
"@opentelemetry/exporter-trace-otlp-http": "0.38.0",
50+
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
51+
"@opentelemetry/exporter-zipkin": "1.12.0",
52+
"@opentelemetry/instrumentation": "0.38.0",
53+
"@opentelemetry/instrumentation-fetch": "0.38.0",
54+
"@opentelemetry/instrumentation-xml-http-request": "0.38.0",
55+
"@opentelemetry/propagator-b3": "1.12.0",
56+
"@opentelemetry/sdk-metrics": "1.12.0",
57+
"@opentelemetry/sdk-trace-base": "1.12.0",
58+
"@opentelemetry/sdk-trace-web": "1.12.0",
59+
"@opentelemetry/semantic-conventions": "1.12.0"
6060
},
6161
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
6262
}

‎examples/otlp-exporter-node/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "example-otlp-exporter-node",
33
"private": true,
4-
"version": "0.37.0",
4+
"version": "0.38.0",
55
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
66
"main": "index.js",
77
"scripts": {
@@ -29,17 +29,17 @@
2929
},
3030
"dependencies": {
3131
"@opentelemetry/api": "^1.3.0",
32-
"@opentelemetry/core": "1.11.0",
33-
"@opentelemetry/exporter-metrics-otlp-grpc": "0.37.0",
34-
"@opentelemetry/exporter-metrics-otlp-http": "0.37.0",
35-
"@opentelemetry/exporter-metrics-otlp-proto": "0.37.0",
36-
"@opentelemetry/exporter-trace-otlp-grpc": "0.37.0",
37-
"@opentelemetry/exporter-trace-otlp-http": "0.37.0",
38-
"@opentelemetry/exporter-trace-otlp-proto": "0.37.0",
39-
"@opentelemetry/resources": "1.11.0",
40-
"@opentelemetry/sdk-metrics": "1.11.0",
41-
"@opentelemetry/sdk-trace-base": "1.11.0",
42-
"@opentelemetry/semantic-conventions": "1.11.0"
32+
"@opentelemetry/core": "1.12.0",
33+
"@opentelemetry/exporter-metrics-otlp-grpc": "0.38.0",
34+
"@opentelemetry/exporter-metrics-otlp-http": "0.38.0",
35+
"@opentelemetry/exporter-metrics-otlp-proto": "0.38.0",
36+
"@opentelemetry/exporter-trace-otlp-grpc": "0.38.0",
37+
"@opentelemetry/exporter-trace-otlp-http": "0.38.0",
38+
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
39+
"@opentelemetry/resources": "1.12.0",
40+
"@opentelemetry/sdk-metrics": "1.12.0",
41+
"@opentelemetry/sdk-trace-base": "1.12.0",
42+
"@opentelemetry/semantic-conventions": "1.12.0"
4343
},
4444
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
4545
}

‎experimental/CHANGELOG.md

+14-8
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,26 @@ All notable changes to experimental packages in this project will be documented
66

77
### :boom: Breaking Change
88

9-
* fix(sdk-node)!: remove unused defaultAttributes option [#3724](https://github.com/open-telemetry/opentelemetry-js/pull/3724) @pichlermarc
10-
* Please use `NodeSDKConfiguration.resource` instead
11-
129
### :rocket: (Enhancement)
1310

14-
* feat(api-logs): 1.`LogRecord` fields update: `traceFlags`/`traceId`/`spanId` -> `context`; 2.`Logger` supports configuring `includeTraceContext`; 3.The `onEmit` method of `LogRecordProcessor` supports the `context` field. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
15-
* feat(sdk-logs): logs sdk implementation. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
16-
1711
### :bug: (Bug Fix)
1812

19-
* fix(sdk-node): only set DiagConsoleLogger when OTEL_LOG_LEVEL is set [#3693](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @pichlermarc
20-
2113
### :books: (Refine Doc)
2214

2315
### :house: (Internal)
2416

17+
## 0.38.0
18+
19+
### :boom: Breaking Change
20+
21+
* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request [#3672](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @jufab
22+
* fix(sdk-node)!: remove unused defaultAttributes option [#3724](https://github.com/open-telemetry/opentelemetry-js/pull/3724) @pichlermarc
23+
* Please use `NodeSDKConfiguration.resource` instead
24+
25+
### :bug: (Bug Fix)
26+
27+
* fix(sdk-node): only set DiagConsoleLogger when OTEL_LOG_LEVEL is set [#3693](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @pichlermarc
28+
2529
## 0.37.0
2630

2731
### :boom: Breaking Change
@@ -43,6 +47,8 @@ All notable changes to experimental packages in this project will be documented
4347
* feat(otlp-exporter-base): add retries [#3207](https://github.com/open-telemetry/opentelemetry-js/pull/3207) @svetlanabrennan
4448
* feat(sdk-node): override IdGenerator when using NodeSDK [#3645](https://github.com/open-telemetry/opentelemetry-js/pull/3645) @haddasbronfman
4549
* feat(otlp-transformer): expose dropped attributes, events and links counts on the transformed otlp span [#3576](https://github.com/open-telemetry/opentelemetry-js/pull/3576) @mohitk05
50+
* feat(api-logs): 1.`LogRecord` fields update: `traceFlags`/`traceId`/`spanId` -> `context`; 2.`Logger` supports configuring `includeTraceContext`; 3.The `onEmit` method of `LogRecordProcessor` supports the `context` field. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
51+
* feat(sdk-logs): logs sdk implementation. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
4652

4753
### :bug: (Bug Fix)
4854

‎experimental/backwards-compatability/node14/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node14",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"private": true,
55
"description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
@@ -9,8 +9,8 @@
99
"peer-api-check": "node ../../../scripts/peer-api-check.js"
1010
},
1111
"dependencies": {
12-
"@opentelemetry/sdk-node": "0.37.0",
13-
"@opentelemetry/sdk-trace-base": "1.11.0"
12+
"@opentelemetry/sdk-node": "0.38.0",
13+
"@opentelemetry/sdk-trace-base": "1.12.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "14.18.25",

‎experimental/backwards-compatability/node16/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node16",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"private": true,
55
"description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
@@ -9,8 +9,8 @@
99
"peer-api-check": "node ../../../scripts/peer-api-check.js"
1010
},
1111
"dependencies": {
12-
"@opentelemetry/sdk-node": "0.37.0",
13-
"@opentelemetry/sdk-trace-base": "1.11.0"
12+
"@opentelemetry/sdk-node": "0.38.0",
13+
"@opentelemetry/sdk-trace-base": "1.12.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "16.11.52",

‎experimental/examples/prometheus/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prometheus-example",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"private": true,
55
"description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
66
"main": "index.js",
@@ -11,7 +11,7 @@
1111
"license": "Apache-2.0",
1212
"dependencies": {
1313
"@opentelemetry/api": "^1.3.0",
14-
"@opentelemetry/exporter-prometheus": "0.37.0",
15-
"@opentelemetry/sdk-metrics": "1.11.0"
14+
"@opentelemetry/exporter-prometheus": "0.38.0",
15+
"@opentelemetry/sdk-metrics": "1.12.0"
1616
}
1717
}

‎experimental/packages/api-events/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/api-events",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "Public events API for OpenTelemetry",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",

‎experimental/packages/api-logs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/api-logs",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "Public logs API for OpenTelemetry",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",

‎experimental/packages/exporter-trace-otlp-grpc/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-grpc",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -50,7 +50,7 @@
5050
"@babel/core": "7.16.0",
5151
"@grpc/proto-loader": "^0.7.3",
5252
"@opentelemetry/api": "1.4.1",
53-
"@opentelemetry/otlp-exporter-base": "0.37.0",
53+
"@opentelemetry/otlp-exporter-base": "0.38.0",
5454
"@types/mocha": "10.0.0",
5555
"@types/node": "18.6.5",
5656
"@types/sinon": "10.0.13",
@@ -69,11 +69,11 @@
6969
},
7070
"dependencies": {
7171
"@grpc/grpc-js": "^1.7.1",
72-
"@opentelemetry/core": "1.11.0",
73-
"@opentelemetry/otlp-grpc-exporter-base": "0.37.0",
74-
"@opentelemetry/otlp-transformer": "0.37.0",
75-
"@opentelemetry/resources": "1.11.0",
76-
"@opentelemetry/sdk-trace-base": "1.11.0"
72+
"@opentelemetry/core": "1.12.0",
73+
"@opentelemetry/otlp-grpc-exporter-base": "0.38.0",
74+
"@opentelemetry/otlp-transformer": "0.38.0",
75+
"@opentelemetry/resources": "1.12.0",
76+
"@opentelemetry/sdk-trace-base": "1.12.0"
7777
},
7878
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc",
7979
"sideEffects": false

‎experimental/packages/exporter-trace-otlp-http/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-http",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -94,11 +94,11 @@
9494
"@opentelemetry/api": "^1.0.0"
9595
},
9696
"dependencies": {
97-
"@opentelemetry/core": "1.11.0",
98-
"@opentelemetry/otlp-exporter-base": "0.37.0",
99-
"@opentelemetry/otlp-transformer": "0.37.0",
100-
"@opentelemetry/resources": "1.11.0",
101-
"@opentelemetry/sdk-trace-base": "1.11.0"
97+
"@opentelemetry/core": "1.12.0",
98+
"@opentelemetry/otlp-exporter-base": "0.38.0",
99+
"@opentelemetry/otlp-transformer": "0.38.0",
100+
"@opentelemetry/resources": "1.12.0",
101+
"@opentelemetry/sdk-trace-base": "1.12.0"
102102
},
103103
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http",
104104
"sideEffects": false

‎experimental/packages/exporter-trace-otlp-proto/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-proto",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -81,12 +81,12 @@
8181
"@opentelemetry/api": "^1.0.0"
8282
},
8383
"dependencies": {
84-
"@opentelemetry/core": "1.11.0",
85-
"@opentelemetry/otlp-exporter-base": "0.37.0",
86-
"@opentelemetry/otlp-proto-exporter-base": "0.37.0",
87-
"@opentelemetry/otlp-transformer": "0.37.0",
88-
"@opentelemetry/resources": "1.11.0",
89-
"@opentelemetry/sdk-trace-base": "1.11.0"
84+
"@opentelemetry/core": "1.12.0",
85+
"@opentelemetry/otlp-exporter-base": "0.38.0",
86+
"@opentelemetry/otlp-proto-exporter-base": "0.38.0",
87+
"@opentelemetry/otlp-transformer": "0.38.0",
88+
"@opentelemetry/resources": "1.12.0",
89+
"@opentelemetry/sdk-trace-base": "1.12.0"
9090
},
9191
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto",
9292
"sideEffects": false

‎experimental/packages/opentelemetry-browser-detector/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/opentelemetry-browser-detector",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "OpenTelemetry Resource Detector for Browser",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -70,8 +70,8 @@
7070
"@opentelemetry/api": "^1.0.0"
7171
},
7272
"dependencies": {
73-
"@opentelemetry/resources": "1.11.0",
74-
"@opentelemetry/semantic-conventions": "1.11.0"
73+
"@opentelemetry/resources": "1.12.0",
74+
"@opentelemetry/semantic-conventions": "1.12.0"
7575
},
7676
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector"
7777
}

‎experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-metrics-otlp-grpc",
3-
"version": "0.37.0",
3+
"version": "0.38.0",
44
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -68,12 +68,12 @@
6868
},
6969
"dependencies": {
7070
"@grpc/grpc-js": "^1.7.1",
71-
"@opentelemetry/core": "1.11.0",
72-
"@opentelemetry/exporter-metrics-otlp-http": "0.37.0",
73-
"@opentelemetry/otlp-grpc-exporter-base": "0.37.0",
74-
"@opentelemetry/otlp-transformer": "0.37.0",
75-
"@opentelemetry/resources": "1.11.0",
76-
"@opentelemetry/sdk-metrics": "1.11.0"
71+
"@opentelemetry/core": "1.12.0",
72+
"@opentelemetry/exporter-metrics-otlp-http": "0.38.0",
73+
"@opentelemetry/otlp-grpc-exporter-base": "0.38.0",
74+
"@opentelemetry/otlp-transformer": "0.38.0",
75+
"@opentelemetry/resources": "1.12.0",
76+
"@opentelemetry/sdk-metrics": "1.12.0"
7777
},
7878
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
7979
"sideEffects": false

0 commit comments

Comments
 (0)