Skip to content

Commit 9e528dc

Browse files
committed
Merge branch 'main' into esbuild-plugin
2 parents c40e316 + 840c4d3 commit 9e528dc

File tree

191 files changed

+8874
-20845
lines changed

Some content is hidden

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

191 files changed

+8874
-20845
lines changed

.github/component_owners.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ components:
1717
detectors/node/opentelemetry-resource-detector-instana:
1818
- basti1302
1919
- kirrg001
20+
incubator/opentelemetry-sampler-aws-xray:
21+
- carolabadeer
2022
metapackages/auto-instrumentations-node:
2123
- dyladan
2224
- pichlermarc
@@ -36,8 +38,6 @@ components:
3638
- legendecas
3739
packages/opentelemetry-id-generator-aws-xray:
3840
- carolabadeer
39-
packages/opentelemetry-sampler-aws-xray:
40-
- carolabadeer
4141
packages/opentelemetry-propagation-utils:
4242
- dyladan
4343
- pichlermarc
@@ -60,6 +60,8 @@ components:
6060
- henrinormak
6161
plugins/node/instrumentation-fs:
6262
- rauno56
63+
plugins/node/instrumentation-kafkajs:
64+
- seemk
6365
plugins/node/instrumentation-lru-memoizer:
6466
- blumamir
6567
plugins/node/instrumentation-mongoose:
@@ -113,7 +115,7 @@ components:
113115
- rauno56
114116
plugins/node/opentelemetry-instrumentation-net:
115117
- seemk
116-
plugins/node/opentelemetry-instrumentation-runtime-node:
118+
plugins/node/instrumentation-runtime-node:
117119
- d4nyll
118120
plugins/node/opentelemetry-instrumentation-pg:
119121
- maryliag
@@ -128,7 +130,7 @@ components:
128130
- rauno56
129131
plugins/node/opentelemetry-instrumentation-router:
130132
- rauno56
131-
plugins/node/opentelemetry-instrumentation-undici:
133+
plugins/node/instrumentation-undici:
132134
- david-luna
133135
- trentm
134136
plugins/node/opentelemetry-instrumentation-winston:
@@ -143,8 +145,6 @@ components:
143145
- obecny
144146
plugins/web/opentelemetry-plugin-react-load:
145147
- martinkuba
146-
propagators/opentelemetry-propagator-grpc-census-binary: []
147-
# Unmaintained?
148148
propagators/opentelemetry-propagator-instana:
149149
- basti1302
150150
- kirrg001

.github/markdown-lint.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# MD004 - Unordered list style
2+
# This rule is triggered when the symbols used in the document for unordered list items do not match the configured unordered list style
3+
# * Item 1 // Error: Unordered list style [Expected: dash; Actual: asterisk]
4+
MD004:
5+
style: dash

.github/workflows/lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- name: Lint markdown files
2020
uses: avto-dev/markdown-lint@v1
2121
with:
22+
config: '.github/markdown-lint.yml'
2223
ignore: "./**/CHANGELOG.md"
2324
args: "./**/*.md"
2425

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
npm ci
2626
27-
- uses: google-github-actions/release-please-action@v4
27+
- uses: googleapis/release-please-action@f3969c04a4ec81d7a9aa4010d84ae6a7602f86a7 # v4.1.1
2828
id: release
2929
with:
3030
token: ${{secrets.RELEASE_PR_TOKEN}}

.github/workflows/test-all-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
node: ["14", "16", "18.18.2"]
21+
node: ["14", "16", "18", "20"]
2222
runs-on: ubuntu-latest
2323
services:
2424
mongo:

.github/workflows/unit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
node: ["14", "16", "18.18.2"]
12+
node: ["14", "16", "18", "20"]
1313
include:
14-
- node: 18.18.2
14+
- node: 18
1515
code-coverage: true
1616
runs-on: ubuntu-latest
1717
services:

.release-please-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.9",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.4.2",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.5.0",
44
"detectors/node/opentelemetry-resource-detector-azure": "0.2.7",
55
"detectors/node/opentelemetry-resource-detector-container": "0.3.9",
66
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.9",
77
"detectors/node/opentelemetry-resource-detector-github": "0.28.2",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.9.0",
9-
"metapackages/auto-instrumentations-node": "0.46.0",
9+
"metapackages/auto-instrumentations-node": "0.46.1",
1010
"metapackages/auto-instrumentations-web": "0.39.0",
11-
"packages/baggage-span-processor": "0.1.0",
11+
"packages/baggage-span-processor": "0.2.0",
1212
"packages/esbuild-plugin-node": "0.1.0",
1313
"packages/opentelemetry-host-metrics": "0.35.1",
1414
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
@@ -21,19 +21,20 @@
2121
"plugins/node/instrumentation-cucumber": "0.6.0",
2222
"plugins/node/instrumentation-dataloader": "0.9.0",
2323
"plugins/node/instrumentation-fs": "0.12.0",
24+
"plugins/node/instrumentation-kafkajs": "0.0.1",
2425
"plugins/node/instrumentation-lru-memoizer": "0.37.0",
2526
"plugins/node/instrumentation-mongoose": "0.38.1",
2627
"plugins/node/instrumentation-runtime-node": "0.4.0",
2728
"plugins/node/instrumentation-socket.io": "0.39.0",
2829
"plugins/node/instrumentation-tedious": "0.10.1",
2930
"plugins/node/instrumentation-undici": "0.2.0",
30-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.41.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.41.1",
3132
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.41.0",
3233
"plugins/node/opentelemetry-instrumentation-bunyan": "0.38.0",
3334
"plugins/node/opentelemetry-instrumentation-cassandra": "0.38.0",
34-
"plugins/node/opentelemetry-instrumentation-connect": "0.36.0",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.36.1",
3536
"plugins/node/opentelemetry-instrumentation-dns": "0.36.1",
36-
"plugins/node/opentelemetry-instrumentation-express": "0.38.0",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.39.0",
3738
"plugins/node/opentelemetry-instrumentation-fastify": "0.36.1",
3839
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.36.0",
3940
"plugins/node/opentelemetry-instrumentation-graphql": "0.40.0",
@@ -58,7 +59,6 @@
5859
"plugins/web/opentelemetry-instrumentation-long-task": "0.38.0",
5960
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.38.0",
6061
"plugins/web/opentelemetry-plugin-react-load": "0.30.1",
61-
"propagators/opentelemetry-propagator-grpc-census-binary": "0.27.2",
6262
"propagators/opentelemetry-propagator-instana": "0.3.2",
6363
"propagators/opentelemetry-propagator-ot-trace": "0.27.2"
6464
}

GUIDELINES.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,27 @@ Instrumentation may add additional patch/unpatch messages for specific functions
197197
- In situations where the patch logic is not trivial and it helps to specify patch events in the right context and nuances. `aws-lambda` logs additional properties extracted from the lambda framework and exposes them for troubleshooting.
198198
199199
The cases above are not covered by the base class and offer additional context to the user troubleshooting an issue with the instrumentation.
200+
201+
## package.json
202+
203+
### Description
204+
205+
Instrumentation should include a `description` field in the `package.json` file. The description targets human readers and is an opportunity to communicate the use case for the instrumented package and its semconv namespace. It should help users know whether the package fits their application, which is especially helpful if the package has a shortened or obscure name.
206+
207+
The description should be written with this format when applicable:
208+
209+
```text
210+
"OpenTelemetry instrumentation for `<instrumented-package-name>` <package short description>"
211+
```
212+
213+
For example:
214+
215+
```text
216+
"OpenTelemetry instrumentation for `express` http framework"
217+
"OpenTelemetry instrumentation for `winston` logger"
218+
"OpenTelemetry instrumentation for `redis` database client for Redis"
219+
```
220+
221+
If the package is consumed directly, the description should state the package name in `<instrumented-package-name>`. Tools like `nestjs` and `aws-lambda` are examples of packages that are consumed indirectly.
222+
223+
A short description should follow the package name, like "http framework", "logger", "database client for X", "messaging client", etc as appropriate in each case. It is preferable to use the semconv namespace semantics that are emitted by this instrumentation (`http`, `database`, `messaging`, `rpc`, `net`) to give quick context for the scope of the instrumentation.

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ A repository for OpenTelemetry JavaScript contributions that are not part of the
4242

4343
This project includes:
4444

45-
* [Instrumentations & other plugins](./plugins),
46-
* [Metapackages](./metapackages),
47-
* [Context Propagators](./propagators),
48-
* [Resource Detectors](./detectors).
45+
- [Instrumentations & other plugins](./plugins),
46+
- [Metapackages](./metapackages),
47+
- [Context Propagators](./propagators),
48+
- [Resource Detectors](./detectors).
4949

5050
**Instrumentations**: OpenTelemetry can collect tracing data automatically using instrumentations. Vendors/Users can also create and use their own.
5151

@@ -59,9 +59,9 @@ Stability level for components in this repository follow the definitions in [CON
5959

6060
Packages in this repository have a variable range of support for Node.JS and browser versions which for each package depend on
6161

62-
* the activeness of the owners of those packages,
63-
* used techniques or runtime features and
64-
* in the case of the auto-instrumentations, the supported runtime versions for the underlying package.
62+
- the activeness of the owners of those packages,
63+
- used techniques or runtime features and
64+
- in the case of the auto-instrumentations, the supported runtime versions for the underlying package.
6565

6666
See the `README.md` files and the `engines` field in the `package.json` files for the respective packages for support information about that package.
6767

@@ -79,9 +79,9 @@ We'd love your help! Use tags [up-for-grabs][up-for-grabs-issues] and [good firs
7979

8080
## Useful links
8181

82-
* For more information on OpenTelemetry, visit [OpenTelemetry.io](https://opentelemetry.io/)
83-
* For help or feedback on this project, join us in [GitHub Discussions][discussions-url] or in [Slack](https://cloud-native.slack.com/archives/C01NL1GRPQR)
84-
* For more 3rd party components for JS as well as other languages, check [OpenTelemetry Registry](https://opentelemetry.io/registry/)
82+
- For more information on OpenTelemetry, visit [OpenTelemetry.io](https://opentelemetry.io/)
83+
- For help or feedback on this project, join us in [GitHub Discussions][discussions-url] or in [Slack](https://cloud-native.slack.com/archives/C01NL1GRPQR)
84+
- For more 3rd party components for JS as well as other languages, check [OpenTelemetry Registry](https://opentelemetry.io/registry/)
8585

8686
## License
8787

RELEASING.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ For posterity, or in the event of any failures with release-please, the process
99

1010
Manual Release Process Steps:
1111

12-
* [Update to latest locally](#update-to-latest-locally)
13-
* [Create a new branch](#create-a-new-branch)
14-
* [Prepare each package for release](#prepare-each-package-for-release)
15-
* [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
16-
* [Create a new PR](#create-a-new-pr)
17-
* [Merge and pull](#merge-and-pull)
18-
* [Publish all packages](#publish-all-packages)
19-
* [Publish the GitHub Release](#publish-the-github-release)
20-
* [Update CHANGELOG](#update-changelog)
12+
- [Update to latest locally](#update-to-latest-locally)
13+
- [Create a new branch](#create-a-new-branch)
14+
- [Prepare each package for release](#prepare-each-package-for-release)
15+
- [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
16+
- [Create a new PR](#create-a-new-pr)
17+
- [Merge and pull](#merge-and-pull)
18+
- [Publish all packages](#publish-all-packages)
19+
- [Publish the GitHub Release](#publish-the-github-release)
20+
- [Update CHANGELOG](#update-changelog)
2121

2222
## Update to latest locally
2323

@@ -31,9 +31,9 @@ Create a new branch called `x.y.z-proposal` from the current commit.
3131

3232
Decide on the next `major.minor.patch` release number based on [semver](http://semver.org/) guidelines.
3333

34-
* Use `npm install` command to initialize all package directories
35-
* Use `lerna publish --skip-npm --no-git-tag-version --no-push` to bump the version in all `package.json`
36-
* Use `npm run bootstrap` to generate latest `version.ts` files
34+
- Use `npm install` command to initialize all package directories
35+
- Use `lerna publish --skip-npm --no-git-tag-version --no-push` to bump the version in all `package.json`
36+
- Use `npm run bootstrap` to generate latest `version.ts` files
3737

3838
## Use the Changelog to create a GitHub Release
3939

@@ -58,10 +58,10 @@ It will print something like:
5858
## Unreleased (2018-05-24)
5959

6060
#### :bug: Bug Fix
61-
* [#198](https://github.com/my-org/my-repo/pull/198) Avoid an infinite loop ([@helpful-hacker](https://github.com/helpful-hacker))
61+
- [#198](https://github.com/my-org/my-repo/pull/198) Avoid an infinite loop ([@helpful-hacker](https://github.com/helpful-hacker))
6262

6363
#### :house: Internal
64-
* [#183](https://github.com/my-org/my-repo/pull/183) Standardize error messages ([@careful-coder](https://github.com/careful-coder))
64+
- [#183](https://github.com/my-org/my-repo/pull/183) Standardize error messages ([@careful-coder](https://github.com/careful-coder))
6565

6666
#### Commiters: 2
6767
- Helpful Hacker ([@helpful-hacker](https://github.com/helpful-hacker))
@@ -112,10 +112,10 @@ Publish the GitHub release, ensuring that the tag points to the newly landed com
112112

113113
## Update CHANGELOG
114114

115-
* After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) and start new Unreleased label.
116-
* Create a new commit with the exact title: `Post Release: update CHANGELOG.md`.
117-
* Go through PR review and merge it to GitHub main branch.
115+
- After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) and start new Unreleased label.
116+
- Create a new commit with the exact title: `Post Release: update CHANGELOG.md`.
117+
- Go through PR review and merge it to GitHub main branch.
118118

119119
## Known Issues
120120

121-
* The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.
121+
- The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.

0 commit comments

Comments
 (0)