Skip to content

Commit

Permalink
Merge branch 'main' into fix/aws-resource-detector-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
arunp0 committed May 17, 2024
2 parents 5277166 + b41797b commit 84ddcf3
Show file tree
Hide file tree
Showing 34 changed files with 2,634 additions and 88 deletions.
2 changes: 2 additions & 0 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ components:
- henrinormak
plugins/node/instrumentation-fs:
- rauno56
plugins/node/instrumentation-kafkajs:
- seemk
plugins/node/instrumentation-lru-memoizer:
- blumamir
plugins/node/instrumentation-mongoose:
Expand Down
5 changes: 5 additions & 0 deletions .github/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# MD004 - Unordered list style
# This rule is triggered when the symbols used in the document for unordered list items do not match the configured unordered list style
# * Item 1 // Error: Unordered list style [Expected: dash; Actual: asterisk]
MD004:
style: dash
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- name: Lint markdown files
uses: avto-dev/markdown-lint@v1
with:
config: '.github/markdown-lint.yml'
ignore: "./**/CHANGELOG.md"
args: "./**/*.md"

Expand Down
1 change: 1 addition & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"plugins/node/instrumentation-cucumber": "0.6.0",
"plugins/node/instrumentation-dataloader": "0.9.0",
"plugins/node/instrumentation-fs": "0.12.0",
"plugins/node/instrumentation-kafkajs": "0.0.1",
"plugins/node/instrumentation-lru-memoizer": "0.37.0",
"plugins/node/instrumentation-mongoose": "0.38.1",
"plugins/node/instrumentation-runtime-node": "0.4.0",
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ A repository for OpenTelemetry JavaScript contributions that are not part of the

This project includes:

* [Instrumentations & other plugins](./plugins),
* [Metapackages](./metapackages),
* [Context Propagators](./propagators),
* [Resource Detectors](./detectors).
- [Instrumentations & other plugins](./plugins),
- [Metapackages](./metapackages),
- [Context Propagators](./propagators),
- [Resource Detectors](./detectors).

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

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

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

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

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

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

## Useful links

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

## License

Expand Down
36 changes: 18 additions & 18 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ For posterity, or in the event of any failures with release-please, the process

Manual Release Process Steps:

* [Update to latest locally](#update-to-latest-locally)
* [Create a new branch](#create-a-new-branch)
* [Prepare each package for release](#prepare-each-package-for-release)
* [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
* [Create a new PR](#create-a-new-pr)
* [Merge and pull](#merge-and-pull)
* [Publish all packages](#publish-all-packages)
* [Publish the GitHub Release](#publish-the-github-release)
* [Update CHANGELOG](#update-changelog)
- [Update to latest locally](#update-to-latest-locally)
- [Create a new branch](#create-a-new-branch)
- [Prepare each package for release](#prepare-each-package-for-release)
- [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
- [Create a new PR](#create-a-new-pr)
- [Merge and pull](#merge-and-pull)
- [Publish all packages](#publish-all-packages)
- [Publish the GitHub Release](#publish-the-github-release)
- [Update CHANGELOG](#update-changelog)

## Update to latest locally

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

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

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

## Use the Changelog to create a GitHub Release

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

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

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

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

## Update CHANGELOG

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

## Known Issues

* The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.
- The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.
12 changes: 6 additions & 6 deletions archive/opentelemetry-browser-extension-autoinjection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`.

## Supported Environments

* Google Chrome (with [Manifest Version 3](https://developer.chrome.com/docs/extensions/mv3/intro/) support)
* Chromium (with Manifest Version 2)
* Firefox (*unstable*, with Manifest Version 2)
- Google Chrome (with [Manifest Version 3](https://developer.chrome.com/docs/extensions/mv3/intro/) support)
- Chromium (with Manifest Version 2)
- Firefox (*unstable*, with Manifest Version 2)

## Installation

Expand All @@ -32,9 +32,9 @@ npm run build

This will create a so-called unpacked extension into the `build/` folder you now can load into your browser:

* Open a new browser window and go to chrome://extensions
* Turn on "Developer Mode"
* Click on "Load unpacked" and select the `build/mv3` (or `build/mv2`) folder, which contains the extension
- Open a new browser window and go to chrome://extensions
- Turn on "Developer Mode"
- Click on "Load unpacked" and select the `build/mv3` (or `build/mv2`) folder, which contains the extension

If all goes well you should see the extension listed:

Expand Down
10 changes: 5 additions & 5 deletions archive/opentelemetry-propagator-grpc-census-binary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

OpenTelemetry gRPC Census propagator provides gRPC header propagation for systems that use the OpenCensus 'grpc-trace-bin' binary header format. This allows for context propagation when either:

* incoming gRPC calls come from services already instrumented using OpenCensus
* outgoing gRPC calls go to services already instrumented using OpenCensus
- incoming gRPC calls come from services already instrumented using OpenCensus
- outgoing gRPC calls go to services already instrumented using OpenCensus

This propagator works in conjunction with the OpenTelemetry [gRPC plugin](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-grpc).

Expand Down Expand Up @@ -43,9 +43,9 @@ See [binary-format.ts](https://github.com/census-instrumentation/opencensus-node

## Useful links

* For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
* For more about OpenTelemetry JavaScript: <https://github.com/open-telemetry/opentelemetry-js>
* For help or feedback on this project, join us in [GitHub Discussions][discussions-url]
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
- For more about OpenTelemetry JavaScript: <https://github.com/open-telemetry/opentelemetry-js>
- For help or feedback on this project, join us in [GitHub Discussions][discussions-url]

## License

Expand Down
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
"no-shadow": "off",
"node/no-deprecated-api": ["warn"],
"header/header": ["error", "block", [{
pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
pattern: / \* Copyright The OpenTelemetry Authors(, .+)*[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
template:
`\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n `
}]]
Expand Down
Loading

0 comments on commit 84ddcf3

Please sign in to comment.