Merge remote-tracking branch 'upstream/main' into service-worker-support

.github/workflows/close-stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           days-before-stale: 60
           days-before-close: 14

.github/workflows/unit-test.yml

@@ -197,7 +197,7 @@ jobs:
           npm install --ignore-scripts
           npm install @types/mocha@^7 mocha@^7 ts-loader@^8 ts-mocha@^8
           node ../scripts/version-update.js
-          tsc --build tsconfig.json tsconfig.esm.json
+          npx tsc --build tsconfig.json tsconfig.esm.json
 
       - name: Test
         working-directory: ./api

.gitignore

@@ -8,6 +8,8 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+# Filter Logs singal files
+!experimental/examples/logs
 
 # Runtime data
 pids

CHANGELOG.md

@@ -7,18 +7,71 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ## Unreleased
 
-* feat: collect host id for non-cloud environments [#3575](https://github.com/open-telemetry/opentelemetry-js/pull/3575) @mwear
-
 ### :boom: Breaking Change
 
 ### :rocket: (Enhancement)
 
+* feat(core): add environment variables for OTLP log exporters. [#3712](https://github.com/open-telemetry/opentelemetry-js/pull/3712/) @llc1123
+
+### :bug: (Bug Fix)
+
+* fix(http-instrumentation): stop listening to `request`'s `close` event once it has emitted `response` [#3625](https://github.com/open-telemetry/opentelemetry-js/pull/3625) @SimenB
+* fix(sdk-node): fix initialization in bundled environments by not loading @opentelemetry/exporter-jaeger [#3739](https://github.com/open-telemetry/opentelemetry-js/pull/3739) @pichlermarc
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.12.0
+
+### :rocket: (Enhancement)
+
+* feat(tracing): log span name and IDs when span end is called multiple times [#3716](https://github.com/open-telemetry/opentelemetry-js/pull/3716)
+* feat(core): add logs environment variables; add timeout utils method. [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi
+
+### :bug: (Bug Fix)
+
+* fix(instrumentation-http): fixed description for http.server.duration metric [#3710](https://github.com/open-telemetry/opentelemetry-js/pull/3710)
+* 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)
+
+## 1.11.0
+
+### :rocket: (Enhancement)
+
+* feat(sdk-metrics): add exponential histogram support [#3505](https://github.com/open-telemetry/opentelemetry-js/pull/3505), [#3506](https://github.com/open-telemetry/opentelemetry-js/pull/3506) @mwear
+* feat(resources): collect additional process attributes [#3605](https://github.com/open-telemetry/opentelemetry-js/pull/3605) @mwear
+
+### :bug: (Bug Fix)
+
+* fix(sdk-metrics): merge uncollected delta accumulations [#3667](https://github.com/open-telemetry/opentelemetry-js/pull/3667) @legendecas
+* fix(sdk-trace-web): make `parseUrl()` respect document.baseURI [#3670](https://github.com/open-telemetry/opentelemetry-js/pull/3670) @domasx2
+
+### :books: (Refine Doc)
+
+* doc(sdk): update NodeSDK example [#3684](https://github.com/open-telemetry/opentelemetry-js/pull/3684) @martinkuba
+* docs: change vmarchaud status from maintainer to emeritus [#3710](https://github.com/open-telemetry/opentelemetry-js/pull/3710) @vmarchaud
+* docs: change rauno56 status from maintainer to emeritus [#3706](https://github.com/open-telemetry/opentelemetry-js/pull/3706) @rauno56
+
+## 1.10.1
+
+### :bug: (Bug Fix)
+
+* fix(resource): make properties for async resource resolution optional [#3677](https://github.com/open-telemetry/opentelemetry-js/pull/3677) @pichlermarc
+* fix(resource): change fs/promises import to be node 12 compatible [#3681](https://github.com/open-telemetry/opentelemetry-js/pull/3681) @pichlermarc
+
+## 1.10.0
+
+### :rocket: (Enhancement)
+
 * feat(resource): create sync resource with some attributes that resolve asynchronously [#3460](https://github.com/open-telemetry/opentelemetry-js/pull/3460) @samimusallam
+* feat: collect host id for non-cloud environments [#3575](https://github.com/open-telemetry/opentelemetry-js/pull/3575) @mwear
 * feat (api-logs): separate Events API into its own package [3550](https://github.com/open-telemetry/opentelemetry-js/pull/3550) @martinkuba
 * feat(sdk-metrics): apply binary search in histogram recording [#3539](https://github.com/open-telemetry/opentelemetry-js/pull/3539) @legendecas
 * perf(propagator-jaeger): improve deserializeSpanContext performance [#3541](https://github.com/open-telemetry/opentelemetry-js/pull/3541) @doochik
 * feat: support TraceState in SamplingResult [#3530](https://github.com/open-telemetry/opentelemetry-js/pull/3530) @raphael-theriault-swi
 * feat(sdk-trace-base): add diagnostic logging when spans are dropped [#3610](https://github.com/open-telemetry/opentelemetry-js/pull/3610) @neoeinstein
+* feat: add unit to view instrument selection criteria [#3647](https://github.com/open-telemetry/opentelemetry-js/pull/3647) @jlabatut
+* feat(tracing): expose dropped counts for attributes, events and links on span [#3576](https://github.com/open-telemetry/opentelemetry-js/pull/3576) @mohitk05
 
 ### :bug: (Bug Fix)
 

CONTRIBUTING.md

@@ -2,6 +2,25 @@
 
 We'd love your help!
 
+- [Development Quick Start](#development-quick-start)
+- [Pull Request Merge Guidelines](#pull-request-merge-guidelines)
+  - [General Merge Requirements](#general-merge-requirements)
+- [Report a bug or requesting feature](#report-a-bug-or-requesting-feature)
+- [How to contribute](#how-to-contribute)
+  - [Before you start](#before-you-start)
+    - [Conventional commit](#conventional-commit)
+  - [Changelog](#changelog)
+  - [Fork](#fork)
+- [Development](#development)
+  - [Tools used](#tools-used)
+  - [Install dependencies](#install-dependencies)
+  - [Compile modules](#compile-modules)
+  - [Running tests](#running-tests)
+  - [Linting](#linting)
+  - [Generating docs](#generating-docs)
+  - [Adding a package](#adding-a-package)
+  - [Platform conditional exports](#platform-conditional-exports)
+
 ## Development Quick Start
 
 To get the project started quickly, you can follow these steps. For more
@@ -15,6 +34,37 @@ npm run compile
 npm test
 ```
 
+## Pull Request Merge Guidelines
+
+Most pull requests MAY be merged by an approver OR a maintainer provided they meet the following [General Merge Requirements](#general-merge-requirements).
+All requirements are at the discretion of the maintainers.
+Maintainers MAY merge pull requests which have not strictly met these requirements.
+Maintainers MAY close, block, or put on hold pull requests even if they have strictly met these requirements.
+
+It is generally expected that a maintainer ([@open-telemetry/javascript-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)) should review and merge major changes.
+Some examples include, but are not limited to:
+
+- API changes
+- Breaking changes
+- New modules
+- Changes which affect runtime support
+- New features which are not required by the specification
+
+If a PR has not been interacted with by a reviewer within one week, please ping the approvers ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)).
+
+### General Merge Requirements
+
+- No “changes requested” reviews by approvers, maintainers, technical committee members, or subject matter experts
+- No unresolved conversations
+- Approved by at least one maintainer OR by at least one approver who is not the approver merging the pull request
+  - A pull request for small (simple typo, URL, update docs, or grammatical fix) changes may be approved and merged by the same approver
+- For plugins, exporters, and propagators approval of the original code module author, or a contributor who has done extensive work on the module, is preferred but not required
+- New or changed functionality is tested by unit tests
+- New or changed functionality is documented if appropriate
+- Substantial changes should not be merged within 24 hours of opening in order to allow reviewers from all time zones to have a chance to review
+
+If all of the above requirements are met and there are no unresolved discussions, a pull request may be merged by either a maintainer or an approver.
+
 ## Report a bug or requesting feature
 
 Reporting bugs is an important contribution. Please make sure to include:
@@ -216,40 +266,6 @@ To add a new package, copy `packages/template` to your new package directory and
 
 After adding the package, run `npm install` from the root of the project. This will update the `tsconfig.json` project references automatically and install all dependencies in your new package. For packages supporting browser, file `tsconfig.esm.json` needs to be manually updated to include reference to ES modules build.
 
-### Guidelines for Pull Requests
-
-- Typically we try to turn around reviews within one to two business days.
-- It is generally expected that a maintainer ([@open-telemetry/javascript-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)) should review and merge every PR.
-  - If a change has met the requirements listed below, an approver may also merge the pull request.
-- Most PRs should be merged in one to two weeks.
-- If a PR is taking longer than 30 days, please ping the approvers ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)) as it may have been lost
-- Dependency upgrades and Security fixes: This PR is small and/or low-risk and can be merged with only maintainer reviews.
-- If your patch is not getting reviewed or you need a specific person to review it, you can @username or @open-telemetry/javascript-approvers a reviewer asking for a review in the pull request.
-- API changes, breaking changes, or large changes will be subject to more scrutiny and may require more reviewers. These PRs should only be merged by maintainers.
-- Changes to existing plugins and exporters will typically require the approval of the original plugin/exporter author.
-
-### General Merge Requirements
-
-- All requirements are at the discretion of the maintainers.
-  - Maintainers may merge pull requests which have not strictly met these requirements.
-  - Maintainers may close, block, or put on hold pull requests even if they have strictly met these requirements.
-- No “changes requested” reviews.
-- No unresolved conversations.
-- 3 approvals, including the approvals of at least 2 maintainers
-  - A pull request opened by an approver may be merged with only the 2 maintainer reviews.
-  - Small (simple typo, URL, update docs, or grammatical fix) or high-priority changes may be merged more quickly or with fewer reviewers at the discretion of the maintainers. This is typically indicated with the express label.
-- For plugins, exporters, and propagators approval of the original code module author is preferred but not required.
-- New or changed functionality is tested by unit tests.
-- New or changed functionality is documented.
-- Substantial changes should not be merged within 24 hours of opening in order to allow reviewers from all time zones to have a chance to review.
-
-If all of the above requirements are met and there are no unresolved discussions, a pull request may be merged by either a maintainer or an approver.
-
-### Generating CHANGELOG documentation
-
-- Generate and export your [Github access token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token): `export GITHUB_AUTH=<your_token>`
-- `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
-
 ### Platform conditional exports
 
 Universal packages are packages that can be used in both web browsers and

README.md

@@ -173,7 +173,18 @@ instructions to build and make changes to this project, see the
 
 We have a weekly SIG meeting! See the [community page](https://github.com/open-telemetry/community#javascript-sdk) for meeting details and notes.
 
-Approvers ([@open-telemetry/js-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)):
+### Community members
+
+#### Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers))
+
+- [Amir Blum](https://github.com/blumamir), Aspecto
+- [Chengzhong Wu](https://github.com/legendecas), Alibaba
+- [Daniel Dyla](https://github.com/dyladan), Dynatrace
+- [Marc Pichler](https://github.com/pichlermarc), Dynatrace
+
+*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
+
+#### Approvers ([@open-telemetry/js-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers))
 
 - [Gerhard Stöbich](https://github.com/Flarna), Dynatrace
 - [Haddas Bronfman](https://github.com/haddasbronfman), Cisco
@@ -188,31 +199,24 @@ Approvers ([@open-telemetry/js-approvers](https://github.com/orgs/open-telemetry
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
-Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)):
+#### Emeriti
 
-- [Amir Blum](https://github.com/blumamir), Aspecto
-- [Chengzhong Wu](https://github.com/legendecas), Alibaba
-- [Daniel Dyla](https://github.com/dyladan), Dynatrace
-- [Marc Pichler](https://github.com/pichlermarc), Dynatrace
-- [Rauno Viskus](https://github.com/Rauno56), Splunk
-- [Valentin Marchaud](https://github.com/vmarchaud), Open Source Contributor
+- [Bartlomiej Obecny](https://github.com/obecny), LightStep, Maintainer
+- [Daniel Khan](https://github.com/dkhan), Dynatrace, Maintainer
+- [Mayur Kale](https://github.com/mayurkale22), Google, Maintainer
+- [Rauno Viskus](https://github.com/rauno56), Maintainer
+- [Valentin Marchaud](https://github.com/vmarchaud), Maintainer
+- [Brandon Gonzalez](https://github.com/bg451), LightStep, Approver
+- [Roch Devost](https://github.com/rochdev), DataDog, Approver
 
-*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
+*Find more about the emeritus role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager).*
 
-### Thanks to all the people who already contributed
+#### Thanks to all the people who already contributed
 
 <a href="https://github.com/open-telemetry/opentelemetry-js/graphs/contributors">
   <img src="https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-js" />
 </a>
 
-### Thanks to all previous approvers and maintainers
-
-- [Bartlomiej Obecny](https://github.com/obecny), LightStep, Maintainer
-- [Daniel Khan](https://github.com/dkhan), Dynatrace, Maintainer
-- [Mayur Kale](https://github.com/mayurkale22), Google, Maintainer
-- [Brandon Gonzalez](https://github.com/bg451), LightStep, Approver
-- [Roch Devost](https://github.com/rochdev), DataDog, Approver
-
 ## Packages
 
 ### API
@@ -275,6 +279,11 @@ These instrumentations are hosted at <https://github.com/open-telemetry/opentele
 
 ## Upgrade guidelines
 
+### 0.37.x to 0.38.0
+
+- `@opentelemetry/sdk-node` `NodeSDKConfiguration.defaultAttributes` has been unused and was removed as the concept does not exist in OpenTelemetry anymore
+  - Please use `NodeSDKConfiguration.resource` instead.
+
 ### 0.35.x to 0.36.0
 
 - `@opentelemetry/sdk-node` changed `await start()` to now be synchronous
@@ -544,7 +553,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [compliance-matrix]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md
 [CONTRIBUTING]: https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
 
-[otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-metrics
+[otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics
 [otel-node]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node
 
 [otel-instrumentation-fetch]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch

api/CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 1.4.1
+
 ### :bug: (Bug Fix)
 
 * fix(metrics): export `MetricsAPI` type [#3535](https://github.com/open-telemetry/opentelemetry-js/pull/3535)
@@ -15,6 +17,7 @@ All notable changes to this project will be documented in this file.
 ### :rocket: (Enhancement)
 
 * feat(api): add `getActiveBaggage` API [#3385](https://github.com/open-telemetry/opentelemetry-js/pull/3385)
+* feat(api): add optional `droppedAttributesCount` property in the `Link` interface [#3576](https://github.com/open-telemetry/opentelemetry-js/pull/3576) @mohitk05
 
 ### :bug: (Bug Fix)
 

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Public API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

api/src/trace/link.ts

@@ -37,4 +37,6 @@ export interface Link {
   context: SpanContext;
   /** A set of {@link SpanAttributes} on the link. */
   attributes?: SpanAttributes;
+  /** Count of attributes of the link that were dropped due to collection limits */
+  droppedAttributesCount?: number;
 }

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.35.1",
+  "version": "0.37.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -34,9 +34,9 @@
     "@opentelemetry/instrumentation": "0.35.1",
     "@opentelemetry/instrumentation-http": "0.35.1",
     "@opentelemetry/resources": "1.9.1",
-    "@opentelemetry/semantic-conventions": "1.9.1",
+    "@opentelemetry/sdk-trace-base": "1.9.1",
     "@opentelemetry/sdk-trace-node": "1.9.1",
-    "@opentelemetry/sdk-trace-base": "1.9.1"
+    "@opentelemetry/semantic-conventions": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.35.1",
+  "version": "0.38.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.9.1",
-    "@opentelemetry/exporter-zipkin": "1.9.1",
-    "@opentelemetry/instrumentation": "0.35.1",
-    "@opentelemetry/instrumentation-http": "0.35.1",
-    "@opentelemetry/resources": "1.9.1",
-    "@opentelemetry/sdk-trace-base": "1.9.1",
-    "@opentelemetry/sdk-trace-node": "1.9.1",
-    "@opentelemetry/semantic-conventions": "1.9.1"
+    "@opentelemetry/exporter-jaeger": "1.12.0",
+    "@opentelemetry/exporter-zipkin": "1.12.0",
+    "@opentelemetry/instrumentation": "0.38.0",
+    "@opentelemetry/instrumentation-http": "0.38.0",
+    "@opentelemetry/resources": "1.12.0",
+    "@opentelemetry/sdk-trace-base": "1.12.0",
+    "@opentelemetry/sdk-trace-node": "1.12.0",
+    "@opentelemetry/semantic-conventions": "1.12.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {