Skip to content

Commit 5c904ce

Browse files
pichlermarcpichlermarc
authored
Merge branch 'main' into feat/core-getenv-replace
2 parents 466cebc + 9feaee3 commit 5c904ce

File tree

40 files changed

+8740
-1113
lines changed

40 files changed

+8740
-1113
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
117117
* chore(selenium-tests): remove internal selenium-tests/ package, it wasn't being used @trentm
118118
* chore: update typescript `module` compiler option to `node16`. [#5347](https://github.com/open-telemetry/opentelemetry-js/pull/5347) @david-luna
119119
* feat(opentelemetry-instrumentation): replace `semver` package with internal semantic versioning check implementation to get rid of `semver` package initialization overhead especially in the AWS Lambda environment during coldstart [#5305](https://github.com/open-telemetry/opentelemetry-js/pull/5305) @serkan-ozal
120+
* chore: unpin `@opentelemetry/semantic-conventions` dep to allow better de-duplication in installs [#5439](https://github.com/open-telemetry/opentelemetry-js/pull/5439) @trentm
120121

121122
## 1.30.0
122123

‎README.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,25 @@ Members of this team have triager permissions for opentelemetry-js.git and opent
266266
#### Contrib Triagers ([@open-telemetry/javascript-contrib-triagers](https://github.com/orgs/open-telemetry/teams/javascript-contrib-triagers))
267267

268268
Members of this team have triager permissions for opentelemetry-js-contrib.git.
269+
Typically, members of this are [component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml) of one or more packages in the contrib repo.
269270

270-
- [Jonathan Munz](https://github.com/jpmunz), Embrace
271+
- [Aaron Abbott](https://github.com/aabmass), Google
272+
- [Abhinav Mathur](https://github.com/abhee11), AppDynamics
273+
- [Bartlomiej Obecny](https://github.com/obecny)
274+
- [Daniel Li](https://github.com/d4nyll)
271275
- [Florencia Acosta](https://github.com/facostaembrace), Embrace
276+
- [Jackson Weber](https://github.com/JacksonWeber), Microsoft
277+
- [Jaryk](https://github.com/Ugzuzg), Volvo Cars
278+
- [Jonathan Lee](https://github.com/jj22ee)
279+
- [Jonathan Munz](https://github.com/jpmunz), Embrace
280+
- [kirrg001](https://github.com/kirrg001), Instana
281+
- [MartenH](https://github.com/mhennoch), Splunk
282+
- [Mike Goldsmith](https://github.com/MikeGoldsmith), Honeycomb
283+
- [Motti](https://github.com/mottibec)
284+
- [Punya Biswal](https://github.com/punya), Google
285+
- [Siim Kallas](https://github.com/seemk), Splunk
286+
- [Trivikram Kamat](https://github.com/trivikr), AWS
287+
- [t2t2](https://github.com/t2t2), Splunk
272288

273289
*Find more about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).*
274290

‎examples/esm-http-ts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
"@opentelemetry/resources": "1.30.0",
3939
"@opentelemetry/sdk-trace-base": "1.30.0",
4040
"@opentelemetry/sdk-trace-node": "1.30.0",
41-
"@opentelemetry/semantic-conventions": "1.29.0"
41+
"@opentelemetry/semantic-conventions": "^1.29.0"
4242
}
4343
}

‎examples/http/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@opentelemetry/resources": "1.30.0",
3838
"@opentelemetry/sdk-trace-base": "1.30.0",
3939
"@opentelemetry/sdk-trace-node": "1.30.0",
40-
"@opentelemetry/semantic-conventions": "1.29.0"
40+
"@opentelemetry/semantic-conventions": "^1.29.0"
4141
},
4242
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
4343
"devDependencies": {

‎examples/https/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@opentelemetry/resources": "1.30.0",
4242
"@opentelemetry/sdk-trace-base": "1.30.0",
4343
"@opentelemetry/sdk-trace-node": "1.30.0",
44-
"@opentelemetry/semantic-conventions": "1.29.0"
44+
"@opentelemetry/semantic-conventions": "^1.29.0"
4545
},
4646
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
4747
"devDependencies": {

‎examples/opentelemetry-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@opentelemetry/sdk-metrics": "1.30.0",
5959
"@opentelemetry/sdk-trace-base": "1.30.0",
6060
"@opentelemetry/sdk-trace-web": "1.30.0",
61-
"@opentelemetry/semantic-conventions": "1.29.0"
61+
"@opentelemetry/semantic-conventions": "^1.29.0"
6262
},
6363
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
6464
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@opentelemetry/resources": "1.30.0",
4141
"@opentelemetry/sdk-metrics": "1.30.0",
4242
"@opentelemetry/sdk-trace-base": "1.30.0",
43-
"@opentelemetry/semantic-conventions": "1.29.0"
43+
"@opentelemetry/semantic-conventions": "^1.29.0"
4444
},
4545
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
4646
}

‎experimental/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ All notable changes to experimental packages in this project will be documented
3737
* refactor(otlp-exporter-base): remove unnecessary isNaN() checks [#5374](https://github.com/open-telemetry/opentelemetry-js/pull/5374) @cjihrig
3838
* refactor(exporter-prometheus): remove unnecessary isNaN() check [#5377](https://github.com/open-telemetry/opentelemetry-js/pull/5377) @cjihrig
3939
* refactor(sdk-node): move code to auto-instantiate propagators into utils [#5355](https://github.com/open-telemetry/opentelemetry-js/pull/5355) @pichlermarc
40+
* chore: unpin `@opentelemetry/semantic-conventions` dep to allow better de-duplication in installs [#5439](https://github.com/open-telemetry/opentelemetry-js/pull/5439) @trentm
4041

4142
## 0.57.0
4243

‎experimental/examples/opencensus-shim/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@opentelemetry/resources": "1.30.0",
3838
"@opentelemetry/sdk-metrics": "1.30.0",
3939
"@opentelemetry/sdk-trace-node": "1.30.0",
40-
"@opentelemetry/semantic-conventions": "1.29.0",
40+
"@opentelemetry/semantic-conventions": "^1.29.0",
4141
"@opentelemetry/shim-opencensus": "0.57.0"
4242
},
4343
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"

‎experimental/packages/opentelemetry-exporter-prometheus/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"devDependencies": {
4646
"@opentelemetry/api": "1.9.0",
47-
"@opentelemetry/semantic-conventions": "1.29.0",
47+
"@opentelemetry/semantic-conventions": "^1.29.0",
4848
"@types/mocha": "10.0.10",
4949
"@types/node": "18.6.5",
5050
"@types/sinon": "17.0.3",

‎experimental/packages/opentelemetry-instrumentation-fetch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@opentelemetry/core": "1.30.0",
9191
"@opentelemetry/instrumentation": "0.57.0",
9292
"@opentelemetry/sdk-trace-web": "1.30.0",
93-
"@opentelemetry/semantic-conventions": "1.29.0"
93+
"@opentelemetry/semantic-conventions": "^1.29.0"
9494
},
9595
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch",
9696
"sideEffects": false,

‎experimental/packages/opentelemetry-instrumentation-grpc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
},
7373
"dependencies": {
7474
"@opentelemetry/instrumentation": "0.57.0",
75-
"@opentelemetry/semantic-conventions": "1.29.0"
75+
"@opentelemetry/semantic-conventions": "^1.29.0"
7676
},
7777
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc",
7878
"sideEffects": false

‎experimental/packages/opentelemetry-instrumentation-http/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"dependencies": {
7575
"@opentelemetry/core": "1.30.0",
7676
"@opentelemetry/instrumentation": "0.57.0",
77-
"@opentelemetry/semantic-conventions": "1.29.0",
77+
"@opentelemetry/semantic-conventions": "^1.29.0",
7878
"forwarded-parse": "2.1.2"
7979
},
8080
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http",

‎experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@opentelemetry/core": "1.30.0",
9090
"@opentelemetry/instrumentation": "0.57.0",
9191
"@opentelemetry/sdk-trace-web": "1.30.0",
92-
"@opentelemetry/semantic-conventions": "1.29.0"
92+
"@opentelemetry/semantic-conventions": "^1.29.0"
9393
},
9494
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request",
9595
"sideEffects": false

‎experimental/packages/opentelemetry-sdk-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@opentelemetry/sdk-metrics": "1.30.0",
6666
"@opentelemetry/sdk-trace-base": "1.30.0",
6767
"@opentelemetry/sdk-trace-node": "1.30.0",
68-
"@opentelemetry/semantic-conventions": "1.29.0"
68+
"@opentelemetry/semantic-conventions": "^1.29.0"
6969
},
7070
"peerDependencies": {
7171
"@opentelemetry/api": ">=1.3.0 <1.10.0"

‎experimental/packages/web-common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"dependencies": {
6969
"@opentelemetry/sdk-logs": "0.57.0",
7070
"@opentelemetry/sdk-trace-base": "1.30.0",
71-
"@opentelemetry/semantic-conventions": "1.29.0"
71+
"@opentelemetry/semantic-conventions": "^1.29.0"
7272
},
7373
"devDependencies": {
7474
"@babel/core": "7.26.7",

‎experimental/packages/web-common/src/SessionLogRecordProcessor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { Context } from '@opentelemetry/api';
1818
import { LogRecord, LogRecordProcessor } from '@opentelemetry/sdk-logs';
19-
import { ATTR_SESSION_ID } from '@opentelemetry/semantic-conventions/incubating';
19+
import { ATTR_SESSION_ID } from './semconv';
2020
import { SessionProvider } from './types/SessionProvider';
2121

2222
/**

‎experimental/packages/web-common/src/SessionSpanProcessor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
Span,
2121
ReadableSpan,
2222
} from '@opentelemetry/sdk-trace-base';
23-
import { ATTR_SESSION_ID } from '@opentelemetry/semantic-conventions/incubating';
23+
import { ATTR_SESSION_ID } from './semconv';
2424
import { SessionProvider } from './types/SessionProvider';
2525

2626
/**

‎experimental/packages/web-common/src/semconv.ts

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* A unique id to identify a session.
19+
*
20+
* @example "00112233-4455-6677-8899-aabbccddeeff"
21+
*/
22+
export const ATTR_SESSION_ID = 'session.id' as const;

0 commit comments

Comments
 (0)