Merge branch 'master' into http-sender

open-telemetry · May 27, 2020 · 0235711 · 0235711
2 parents 38dc850 + da11e1b
commit 0235711
Show file tree

Hide file tree

Showing 240 changed files with 2,787 additions and 1,522 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -124,13 +124,13 @@ jobs:
       - checkout
       - run:
           name: Install minimal doc and lint modules globally
-          command: npm i -g tslint lerna typedoc linkinator typescript tslint-consistent-codestyle tslint-microsoft-contrib
+          command: npm i -g eslint@^6.8.0 eslint-plugin-node @typescript-eslint/eslint-plugin@^2.23.0 @typescript-eslint/parser@^2.23.0 eslint-plugin-header@^3.0.0 eslint-plugin-import@^2.19.1 eslint-plugin-prettier prettier lerna typedoc linkinator typescript@^3.7.2
       - run:
-          name: Install gts version 1.1.0 globally
-          command: npm i -g gts@1.1.0
+          name: Install gts version 2.0.0 globally
+          command: npm i -g gts@2.0.0
       - run:
           name: Symlink global modules into all lerna packages
-          command: lerna exec 'npm link tslint lerna typedoc linkinator typescript gts tslint-consistent-codestyle tslint-microsoft-contrib'
+          command: lerna exec 'npm link eslint gts eslint-plugin-node @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-plugin-header eslint-plugin-import eslint-plugin-prettier prettier lerna typedoc linkinator typescript'
       - run:
           name: Check code style and linting
           command: npm run lint
@@ -140,35 +140,12 @@ jobs:
       - run:
           name: Docs tests
           command: npm run docs-test
-      - persist_to_workspace:
-          root: packages/opentelemetry-api/docs
-          paths:
-            - out
       - run:
           name: Install minimal modules to lint examples
           command: npm i --no-save eslint eslint-plugin-import eslint-config-airbnb-base
       - run:
           name: Lint examples
           command: npm run lint:examples
-  docs-deploy:
-    docker:
-      - image: node:12
-    steps:
-      - checkout
-      - attach_workspace:
-          at: packages/opentelemetry-api/docs
-      - run:
-          name: Install and configure dependencies
-          command: |
-            npm install --silent --no-save gh-pages
-            git config user.email noreply@opentelemetry.io
-            git config user.name "ci-build"
-      - add_ssh_keys:
-          fingerprints:
-            - "1d:a3:60:b5:b4:8d:e7:8a:96:ce:6a:0a:e9:58:4c:54"
-      - run:
-          name: Deploy docs to gh-pages branch
-          command: gh-pages --dist packages/opentelemetry-api/docs/out
   node8:
     docker:
       - image: node:8
@@ -207,14 +184,6 @@ workflows:
           filters:
             branches:
               only: /.*/
-      - docs-deploy:
-          requires:
-            - lint_&_docs
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d$/
-            branches:
-              ignore: /.*/
       - node8
       - node10
       - node12

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,4 +12,4 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @dyladan @mayurkale22 @rochdev @bg451 @OlivierAlbertini @vmarchaud @markwolff @obecny
+* @dyladan @mayurkale22 @rochdev @bg451 @OlivierAlbertini @vmarchaud @markwolff @obecny @mwear
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,25 @@
+name: Deploy docs on a new release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+
+      - name: Install and Build 🔧
+        run: |
+          npm install --ignore-scripts
+          npx lerna bootstrap --scope @opentelemetry/api --include-filtered-dependencies
+          npm run docs
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages # The branch the action should deploy to.
+          FOLDER: packages/opentelemetry-api/docs/out # The folder the action should deploy.
diff --git a/.nycrc b/.nycrc
@@ -4,11 +4,14 @@
   ],
   "exclude": [
     "**/*.d.ts",
-    "build/**/**/*.js",
+    "build/**/*.*",
     "src/index.ts",
-    "karma.conf.js",
+    "src/platform/**/index.ts",
     "src/platform/browser/*.ts",
-    "test/index-webpack.ts",
+    "src/version.ts",
+    "test/**/*.*",
+    ".eslintrc.js",
+    "karma.conf.js",
     "webpack/*.js"
   ],
   "all": true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,125 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.8.2
+
+#### :rocket: (Enhancement)
+* `opentelemetry-exporter-collector`
+  * [#1063](https://github.com/open-telemetry/opentelemetry-js/pull/1063) feat: exporter collector TLS option ([@mzahor](https://github.com/mzahor))
+* `opentelemetry-core`
+  * [#838](https://github.com/open-telemetry/opentelemetry-js/pull/838) feat: implement W3C Correlation Context propagator ([@rubenvp8510](https://github.com/rubenvp8510))
+
+#### :bug: (Bug Fix)
+* `opentelemetry-api`
+  * [#1067](https://github.com/open-telemetry/opentelemetry-js/pull/1067) fix: missing `global` in browser environments ([@legendecas](https://github.com/legendecas))
+
+#### :books: (Refine Doc)
+* Other
+  * [#1057](https://github.com/open-telemetry/opentelemetry-js/pull/1057) chore: add examples README.md ([@mayurkale22](https://github.com/mayurkale22))
+* `opentelemetry-core`
+  * [#1080](https://github.com/open-telemetry/opentelemetry-js/pull/1080) docs: document CorrelationContext propagator under Built-in Implement… ([@rubenvp8510](https://github.com/rubenvp8510))
+
+#### Committers: 5
+- Marian Zagoruiko ([@mzahor](https://github.com/mzahor))
+- Mayur Kale ([@mayurkale22](https://github.com/mayurkale22))
+- Olivier Albertini ([@OlivierAlbertini](https://github.com/OlivierAlbertini))
+- Ruben Vargas Palma ([@rubenvp8510](https://github.com/rubenvp8510))
+- legendecas ([@legendecas](https://github.com/legendecas))
+
+## 0.8.1
+
+#### :rocket: (Enhancement)
+* Other
+  * [#1050](https://github.com/open-telemetry/opentelemetry-js/pull/1050) feat: add plugin metapackages ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-resources`
+  * [#1055](https://github.com/open-telemetry/opentelemetry-js/pull/1055) chore(opentelemetry-resources): add instance type and az to aws detector ([@justinwalz](https://github.com/justinwalz))
+* `opentelemetry-plugin-http`
+  * [#963](https://github.com/open-telemetry/opentelemetry-js/pull/963) feat(plugin-http): add plugin hooks before processing req and res ([@BlumAmir](https://github.com/BlumAmir))
+* `opentelemetry-metrics`
+  * [#1049](https://github.com/open-telemetry/opentelemetry-js/pull/1049) chore: pipe resource through to MetricRecord ([@mwear](https://github.com/mwear))
+* `opentelemetry-api`, `opentelemetry-metrics`
+  * [#1032](https://github.com/open-telemetry/opentelemetry-js/pull/1032) Make Labels Optional for CounterMetric::add ([@astorm](https://github.com/astorm))
+
+
+#### :bug: (Bug Fix)
+* `opentelemetry-plugin-http`
+  * [#1060](https://github.com/open-telemetry/opentelemetry-js/pull/1060) fix(http-plugin): don't modify user's headers object in plugin ([@BlumAmir](https://github.com/BlumAmir))
+* `opentelemetry-exporter-collector`
+  * [#1053](https://github.com/open-telemetry/opentelemetry-js/pull/1053) fix: include proto files in deployment package ([@dyladan](https://github.com/dyladan))
+
+#### :books: (Refine Doc)
+* Other
+  * [#1065](https://github.com/open-telemetry/opentelemetry-js/pull/1065) style: format README ([@naseemkullah](https://github.com/naseemkullah))
+  * [#1064](https://github.com/open-telemetry/opentelemetry-js/pull/1064) chore: update README ([@mayurkale22](https://github.com/mayurkale22))
+  * [#1051](https://github.com/open-telemetry/opentelemetry-js/pull/1051) chore: deploy docs using github action ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-exporter-prometheus`
+  * [#1056](https://github.com/open-telemetry/opentelemetry-js/pull/1056) fix readme: setting labelKeys when creating the counter ([@luebken](https://github.com/luebken))
+
+#### Committers: 9
+- Alan Storm ([@astorm](https://github.com/astorm))
+- Amir Blum ([@BlumAmir](https://github.com/BlumAmir))
+- Daniel Dyla ([@dyladan](https://github.com/dyladan))
+- Justin Walz ([@justinwalz](https://github.com/justinwalz))
+- Matthew Wear ([@mwear](https://github.com/mwear))
+- Matthias Lübken ([@luebken](https://github.com/luebken))
+- Mayur Kale ([@mayurkale22](https://github.com/mayurkale22))
+- Naseem ([@naseemkullah](https://github.com/naseemkullah))
+- [@shivkanya9146](https://github.com/shivkanya9146)
+
+## 0.8.0
+
+Released 2020-05-12
+
+#### :boom: Breaking Change
+* `opentelemetry-api`, `opentelemetry-metrics`
+  * [#1001](https://github.com/open-telemetry/opentelemetry-js/pull/1001) fix: observers should not expose bind/unbind method ([@legendecas](https://github.com/legendecas))
+
+#### :bug: (Bug Fix)
+* `opentelemetry-plugin-http`
+  * [#984](https://github.com/open-telemetry/opentelemetry-js/pull/984) fix(http-plugin): strip otel custom http header #983 ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-core`
+  * [#1021](https://github.com/open-telemetry/opentelemetry-js/pull/1021) fix: left pad short b3 trace identifiers ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-plugin-xml-http-reques`
+  * [#1002](https://github.com/open-telemetry/opentelemetry-js/pull/1002) fix(opentelemetry-plugin-xml-http-request): define span kind as CLIENT for xmlhttprequests ([@ivansenic](https://github.com/ivansenic))
+* `opentelemetry-plugin-grpc`
+  * [#1005](https://github.com/open-telemetry/opentelemetry-js/pull/1005) fix: add missing error status handler ([@markwolff](https://github.com/markwolff))
+* `opentelemetry-exporter-collector`
+  * [#1008](https://github.com/open-telemetry/opentelemetry-js/pull/1008) fix: permission denied error when cloning submodules ([@sleighzy](https://github.com/sleighzy))
+
+#### :rocket: (Enhancement)
+* `opentelemetry-exporter-zipkin`, `opentelemetry-plugin-http`, `opentelemetry-tracing`
+  * [#1037](https://github.com/open-telemetry/opentelemetry-js/pull/1037) fix(tracing): span processor should receive a readable span as parameters ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-tracing`
+  * [#1024](https://github.com/open-telemetry/opentelemetry-js/pull/1024) fix: multi span processor should flush child span processors ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-metrics`, `opentelemetry-tracing`
+  * [#1015](https://github.com/open-telemetry/opentelemetry-js/pull/1015) fix: prevent duplicated resource creation ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-metrics`
+  * [#1014](https://github.com/open-telemetry/opentelemetry-js/pull/1014) feat(metrics): use MetricDescriptor to determine aggregator #989 ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-plugin-http`
+  * [#948](https://github.com/open-telemetry/opentelemetry-js/pull/948) feat(http-plugin): add options to disable new spans if no parent ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-api`, `opentelemetry-node`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-plugin-xml-http-request`, `opentelemetry-tracing`, `opentelemetry-web`
+  * [#943](https://github.com/open-telemetry/opentelemetry-js/pull/943) Use global API instances ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-api`
+  * [#1016](https://github.com/open-telemetry/opentelemetry-js/pull/1016) refactor: normalize namespace import name for @opentelemetry/api ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-core`, `opentelemetry-base`
+  * [#991](https://github.com/open-telemetry/opentelemetry-js/pull/991) refactor: merge opentelemetry-base to opentelemetry-core ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-core`
+  * [#981](https://github.com/open-telemetry/opentelemetry-js/pull/981) chore: splitting BasePlugin into browser and node ([@obecny](https://github.com/obecny))
+
+#### :books: (Refine Doc)
+* Other
+  * [#1003](https://github.com/open-telemetry/opentelemetry-js/pull/1003) chore: test on node 14 ([@dyladan](https://github.com/dyladan))
+  * [#990](https://github.com/open-telemetry/opentelemetry-js/pull/990) fix(opentracing-shim): update opentracing shim example ([@sleighzy](https://github.com/sleighzy))
+
+#### Committers: 7
+- legendecas ([@legendecas](https://github.com/legendecas))
+- Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+- Daniel Dyla ([@dyladan](https://github.com/dyladan))
+- Ivan Senic ([@ivansenic](https://github.com/ivansenic))
+- Mark Wolff ([@markwolff](https://github.com/markwolff))
+- Simon Leigh ([@sleighzy](https://github.com/sleighzy))
+- Bartlomiej Obecny ([@obecny](https://github.com/obecny))
+
 ## 0.7.0
 
 Released 2020-04-23

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -63,6 +63,31 @@ The `opentelemetry-js` project is written in TypeScript.
 - `npm test` tests code the same way that our CI will test it.
 - `npm run lint:fix` lint (and maybe fix) any changes.
 
+### 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, or you can ask for a review on Gitter channel.
+- 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.
+- 4 approvals, including the approvals of both maintainers
+  - A pull request opened by an approver may be merged with only 3 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.
 
 ### Generating API documentation
 - `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out`