Skip to content

Commit 1ca1786

Browse files
authored
Merge branch 'main' into dropped-attributes-count
2 parents 55d5cad + b3a539d commit 1ca1786

File tree

56 files changed

+568
-2045
lines changed

Some content is hidden

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

56 files changed

+568
-2045
lines changed

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
2+
lockfile-version=2

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
2020

2121
### :bug: (Bug Fix)
2222

23+
* fix(sdk-trace-web): only access location if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
24+
* fix(sdk-trace-base): processor onStart called with a span having empty attributes
25+
2326
## 1.18.1
2427

2528
### :bug: (Bug Fix)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
210210
- [Neville Wylie](https://github.com/MSNev), Microsoft
211211
- [Purvi Kanal](https://github.com/pkanal), Honeycomb
212212
- [Svetlana Brennan](https://github.com/svetlanabrennan), New Relic
213+
- [Trent Mick](https://github.com/trentm), Elastic
213214

214215
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
215216

api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
"access": "public"
6767
},
6868
"devDependencies": {
69-
"@types/mocha": "10.0.3",
69+
"@types/mocha": "10.0.4",
7070
"@types/node": "18.6.5",
7171
"@types/sinon": "10.0.20",
72-
"@types/webpack": "4.41.35",
72+
"@types/webpack": "4.41.36",
7373
"@types/webpack-env": "1.16.3",
7474
"babel-plugin-istanbul": "6.1.1",
7575
"codecov": "3.8.3",

experimental/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ All notable changes to experimental packages in this project will be documented
1313
### :bug: (Bug Fix)
1414

1515
* fix(sdk-logs): avoid map attribute set when count limit exceeded
16+
* fix(instrumentation-fetch): only access navigator if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
17+
* allows for experimental usage of this instrumentation with non-browser runtimes
1618

1719
### :books: (Refine Doc)
1820

experimental/packages/api-events/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@opentelemetry/api": "^1.0.0"
6565
},
6666
"devDependencies": {
67-
"@types/mocha": "10.0.3",
67+
"@types/mocha": "10.0.4",
6868
"@types/node": "18.6.5",
6969
"@types/webpack-env": "1.16.3",
7070
"babel-plugin-istanbul": "6.1.1",

experimental/packages/api-logs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@opentelemetry/api": "^1.0.0"
6565
},
6666
"devDependencies": {
67-
"@types/mocha": "10.0.3",
67+
"@types/mocha": "10.0.4",
6868
"@types/node": "18.6.5",
6969
"@types/webpack-env": "1.16.3",
7070
"babel-plugin-istanbul": "6.1.1",

experimental/packages/exporter-logs-otlp-grpc/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
"access": "public"
4949
},
5050
"devDependencies": {
51-
"@babel/core": "7.22.20",
51+
"@babel/core": "7.23.3",
5252
"@grpc/proto-loader": "^0.7.10",
5353
"@opentelemetry/api": "1.7.0",
5454
"@opentelemetry/api-logs": "0.45.1",
5555
"@opentelemetry/otlp-exporter-base": "0.45.1",
5656
"@opentelemetry/resources": "1.18.1",
57-
"@types/mocha": "10.0.3",
57+
"@types/mocha": "10.0.4",
5858
"@types/node": "18.6.5",
5959
"@types/sinon": "10.0.20",
6060
"codecov": "3.8.3",

experimental/packages/exporter-logs-otlp-http/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@
7171
],
7272
"sideEffects": false,
7373
"devDependencies": {
74-
"@babel/core": "7.22.20",
74+
"@babel/core": "7.23.3",
7575
"@opentelemetry/api": "1.7.0",
7676
"@opentelemetry/resources": "1.18.1",
77-
"@types/mocha": "10.0.3",
77+
"@types/mocha": "10.0.4",
7878
"@types/node": "18.6.5",
7979
"@types/sinon": "10.0.20",
8080
"@types/webpack-env": "1.16.3",

experimental/packages/exporter-logs-otlp-proto/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
"access": "public"
6464
},
6565
"devDependencies": {
66-
"@babel/core": "7.22.20",
66+
"@babel/core": "7.23.3",
6767
"@opentelemetry/api": "1.7.0",
68-
"@types/mocha": "10.0.3",
68+
"@types/mocha": "10.0.4",
6969
"@types/node": "18.6.5",
7070
"@types/sinon": "10.0.20",
7171
"babel-plugin-istanbul": "6.1.1",

0 commit comments

Comments
 (0)