Merge branch 'master' into use_trace_context

Author: mayurkale22

.circleci/config.yml

@@ -18,6 +18,7 @@ node_test_env: &node_test_env
   MYSQL_PASSWORD: secret
   MYSQL_DATABASE: circle_database
   MYSQL_PORT: 3306
+  NPM_CONFIG_UNSAFE_PERM: true
 
 postgres_service: &postgres_service
   image: circleci/postgres:9.6-alpine
@@ -39,10 +40,10 @@ mysql_service: &mysql_service
     MYSQL_ROOT_PASSWORD: rootpw
 
 cache_1: &cache_1
-  key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1
+  key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
   paths:
     - ./node_modules
-    - ./yarn.lock
+    - ./package-lock.json
     - packages/opentelemetry-base/node_modules
     - packages/opentelemetry-scope-base/node_modules
     - packages/opentelemetry-api/node_modules
@@ -59,7 +60,7 @@ cache_1: &cache_1
     - packages/opentelemetry-plugin-dns/node_modules
 
 cache_2: &cache_2
-  key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2
+  key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
   paths:
     - packages/opentelemetry-plugin-grpc/node_modules
     - packages/opentelemetry-plugin-http/node_modules
@@ -74,8 +75,10 @@ cache_2: &cache_2
     - packages/opentelemetry-exporter-collector/node_modules
     - packages/opentelemetry-plugin-xml-http-request/node_modules
     - packages/opentelemetry-exporter-stackdriver-trace/node_modules
+    - packages/opentelemetry-plugin-express/node_modules
 
 node_unit_tests: &node_unit_tests
+  resource_class: large
   steps:
     - checkout
     - run:
@@ -93,28 +96,29 @@ node_unit_tests: &node_unit_tests
           echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}"
     - restore_cache:
         keys:
-          - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1
+          - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
     - restore_cache:
         keys:
-          - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2
+          - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
     - run:
-        name: Install Dependencies
-        command: yarn install
+        name: Install Root Dependencies
+        command: npm install --ignore-scripts
+    - run:
+        name: Boostrap dependencies
+        command: npx lerna bootstrap --no-ci
     - save_cache:
         <<: *cache_1
     - save_cache:
         <<: *cache_2
-    - run:
-        name: Compile code
-        command: yarn compile
     - run:
         name: Unit tests
-        command: yarn test
+        command: npm run test
     - run:
         name: report coverage
-        command: if [ "${CIRCLE_NODE_VERSION}" = "v12" ]; then yarn codecov; fi
+        command: if [ "${CIRCLE_NODE_VERSION}" = "v12" ]; then npm run codecov; fi
 
 browsers_unit_tests: &browsers_unit_tests
+  resource_class: large
   steps:
     - checkout
     - run:
@@ -132,49 +136,57 @@ browsers_unit_tests: &browsers_unit_tests
           echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}"
     - restore_cache:
         keys:
-          - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1
+          - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
     - restore_cache:
         keys:
-          - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1
+          - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
     - run:
-        name: Install Dependencies
-        command: yarn install
+        name: Install Root Dependencies
+        command: npm install --ignore-scripts
+    - run:
+        name: Boostrap dependencies
+        command: npx lerna bootstrap --no-ci
     - save_cache:
         <<: *cache_1
     - save_cache:
         <<: *cache_2
     - run:
         name: Unit tests
-        command: yarn test:browser
+        command: npm run test:browser
     - run:
         name: report coverage
-        command: if [ "$CIRCLE_NODE_VERSION" = "v12" ]; then yarn codecov:browser; fi
+        command: if [ "$CIRCLE_NODE_VERSION" = "v12" ]; then npm run codecov:browser; fi
 
 jobs:
   lint_&_docs:
     docker:
       - image: node:12
+        environment:
+          NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - checkout
       - run:
           name: Install minimal doc and lint modules globally
-          command: yarn global add lerna typedoc linkinator typescript gts tslint-consistent-codestyle tslint-microsoft-contrib
+          command: npm i -g tslint lerna typedoc linkinator typescript gts tslint-consistent-codestyle tslint-microsoft-contrib
       - run:
           name: Symlink global modules into all lerna packages
-          command: lerna exec 'ln -s $(yarn global dir)/node_modules node_modules'
+          command: lerna exec 'npm link tslint lerna typedoc linkinator typescript gts tslint-consistent-codestyle tslint-microsoft-contrib'
       - run:
           name: Check code style and linting
-          command: yarn run check
+          command: npm run check
+      - run:
+          name: Install doc dependencies
+          command: lerna bootstrap --no-ci --scope @opentelemetry/api --include-filtered-dependencies -- --only dev
       - run:
           name: Docs tests
-          command: yarn docs-test
+          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 -D eslint eslint-plugin-import eslint-config-airbnb-base
+          command: npm i --no-save eslint eslint-plugin-import eslint-config-airbnb-base
       - run:
           name: Lint examples
           command: npm run lint-examples

CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.4.0
+
+Released 2020-02-05
+
+#### :rocket: (Enhancement)
+* `opentelemetry-api`
+  * [#727](https://github.com/open-telemetry/opentelemetry-js/pull/727) Api separation (deprecate `opentelemetry-types`)
+  * [#749](https://github.com/open-telemetry/opentelemetry-js/pull/749) chore: rename registry to provider
+
+
+#### :sparkles: (Feature)
+* `opentelemetry-plugin-http`
+  * [#719](https://github.com/open-telemetry/opentelemetry-js/pull/719) feat(plugin-http): sync. specs for statuscode
+* `opentelemetry-exporter-jaeger`
+  * [#735](https://github.com/open-telemetry/opentelemetry-js/pull/735) feat: decode jaeger header
+* `opentelemetry-plugin-user-interaction`
+  * [#658](https://github.com/open-telemetry/opentelemetry-js/pull/658) feat: plugin user interaction for web
+
+#### :books: (Refine Doc)
+  * [#689](https://github.com/open-telemetry/opentelemetry-js/pull/689) Add benchmark README and latest numbers
+  * [#733](https://github.com/open-telemetry/opentelemetry-js/pull/733) chore: add instruction for pg-pool plugin
+  * [#665](https://github.com/open-telemetry/opentelemetry-js/pull/665) docs: add ioredis example
+  * [#731](https://github.com/open-telemetry/opentelemetry-js/pull/731) Update Stackdriver exporter example
+
+#### :bug: (Bug Fix)
+* `opentelemetry-exporter-jaeger`
+  * [#715](https://github.com/open-telemetry/opentelemetry-js/pull/715) fix: unref jaeger socket to prevent process running indefinitely
+* `opentelemetry-plugin-ioredis`
+  * [#671](https://github.com/open-telemetry/opentelemetry-js/pull/671) [ioredis plugin] fix: change supportedVersions to >1 <5
+
+
 ## 0.3.3
 
 Released 2020-01-22
@@ -15,11 +46,11 @@ Released 2020-01-22
   * [#662](https://github.com/open-telemetry/opentelemetry-js/pull/662) feat: add pg-pool to default list of instrumented plugins
   * [#708](https://github.com/open-telemetry/opentelemetry-js/pull/708) Simplify and speed up trace context parsing
 * `opentelemetry-metrics`
-  * [#700](https://github.com/open-telemetry/opentelemetry-js/pull/700) implement named meter 
+  * [#700](https://github.com/open-telemetry/opentelemetry-js/pull/700) implement named meter
 
 #### :sparkles: (Feature)
 * `opentelemetry-propagator-jaeger`
-  * [#701](https://github.com/open-telemetry/opentelemetry-js/pull/701) add jaeger http trace format 
+  * [#701](https://github.com/open-telemetry/opentelemetry-js/pull/701) add jaeger http trace format
 * `opentelemetry-exporter-stackdriver-trace`
   * [#648](https://github.com/open-telemetry/opentelemetry-js/pull/648) Stackdriver Trace exporter
 
@@ -28,7 +59,7 @@ Released 2020-01-22
 
 #### :bug: (Bug Fix)
 * `opentelemetry-plugin-ioredis`
-  * [#714](https://github.com/open-telemetry/opentelemetry-js/pull/714) fix: return module exports from ioredis 
+  * [#714](https://github.com/open-telemetry/opentelemetry-js/pull/714) fix: return module exports from ioredis
 
 ## 0.3.2
 

CONTRIBUTING.md

@@ -57,20 +57,20 @@ Please also see [GitHub workflow](https://github.com/open-telemetry/community/bl
 
 The `opentelemetry-js` project is written in TypeScript.
 
-- `yarn install` or `npm install` to install dependencies.
-- `yarn compile` or `npm run compile` compiles the code, checking for type errors.
-- `yarn bootstrap` or `npm run bootstrap` Bootstrap the packages in the current Lerna repo. Installs all of their dependencies and links any cross-dependencies.
-- `yarn test` or `npm test` tests code the same way that our CI will test it.
-- `yarn fix` or `npm run fix` lint (and maybe fix) any changes.
+- `npm install` to install dependencies.
+- `npm run compile` compiles the code, checking for type errors.
+- `npm run bootstrap` Bootstrap the packages in the current Lerna repo. Installs all of their dependencies and links any cross-dependencies.
+- `npm test` tests code the same way that our CI will test it.
+- `npm run fix` lint (and maybe fix) any changes.
 
 
 ### Generating API documentation
-- `yarn docs` or `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out`
+- `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out`
 
 ### Generating CHANGELOG documentation
-- `yarn changelog` or `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
+- `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
 
 ### Benchmarks
 When two or more approaches must be compared, please write a benchmark in the benchmark/index.js module so that we can keep track of the most efficient algorithm.
 
-- `yarn bench` or `npm run bench` to run your benchmark.
+- `npm run bench` to run your benchmark.

README.md

@@ -96,7 +96,7 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
 
 | Package                 | Description |
 | ----------------------- | -----------------|
-| [@opentelemetry/api][otel-api] | This package provides TypeScript interfaces and enums for the OpenTelemetry core trace and metrics model. It is intended for use both on the server and in the browser. |
+| [@opentelemetry/api][otel-api] | This package provides TypeScript interfaces, enums and no-op implementations for the OpenTelemetry core trace and metrics model. It is intended for use both on the server and in the browser. |
 | [@opentelemetry/core][otel-core] | This package provides default and no-op implementations of the OpenTelemetry api for trace and metrics. It's intended for use both on the server and in the browser. |
 
 ### Implementation / SDKs
@@ -137,10 +137,12 @@ OpenTelemetry can collect tracing data automatically using plugins. Vendors/User
 - [@opentelemetry/plugin-redis][otel-plugin-redis]
 - [@opentelemetry/plugin-ioredis][otel-plugin-ioredis]
 - [@opentelemetry/plugin-dns][otel-plugin-dns] - By default, this plugin is not loaded [#612](https://github.com/open-telemetry/opentelemetry-js/issues/612)
+- [@opentelemetry/plugin-express][otel-plugin-express] - By default, this plugin is not loaded
 
 #### Web Plugins
 - [@opentelemetry/plugin-document-load][otel-plugin-document-load]
 - [@opentelemetry/plugin-xml-http-request][otel-plugin-xml-http-request]
+- [@opentelemetry/plugin-user-interaction][otel-plugin-user-interaction]
 
 To request automatic tracing support for a module not on this list, please [file an issue](https://github.com/open-telemetry/opentelemetry-js/issues). Alternatively, you can [write a plugin yourself](https://github.com/open-telemetry/opentelemetry-js/blob/master/doc/plugin-guide.md).
 
@@ -191,7 +193,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [otel-plugin-pg-pool]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool
 [otel-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg
 [otel-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-redis
+[otel-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-user-interaction
 [otel-plugin-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-xml-http-request
+[otel-plugin-express]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-express
 [otel-shim-opentracing]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-shim-opentracing
 [otel-tracing]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-tracing
 [otel-web]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-web

benchmark/tracer.js

@@ -1,15 +1,16 @@
 'use strict';
 
 const benchmark = require('./benchmark');
-const opentelemetry = require('../packages/opentelemetry-core');
+const opentelemetry = require('../packages/opentelemetry-api');
+const { NoopLogger } = require('../packages/opentelemetry-core');
 const { BasicTracerProvider, BatchSpanProcessor, InMemorySpanExporter, SimpleSpanProcessor } = require('../packages/opentelemetry-tracing');
 
-const logger = new opentelemetry.NoopLogger();
+const logger = new NoopLogger();
 
 const setups = [
   {
     name: 'NoopTracerProvider',
-    provider: opentelemetry.getTracerProvider()
+    provider: new opentelemetry.NoopTracerProvider()
   },
   {
     name: 'BasicTracerProvider',

doc/development-guide.md

@@ -2,19 +2,17 @@
 
 Before contributing to this open source project, read our [CONTRIBUTING](../CONTRIBUTING.md). We gratefully welcome improvements to documentation as well as to code.
 
-The code base is a monorepo. We use [Lerna](https://lerna.js.org/) for managing inter-module dependencies, which makes it easier to develop coordinated changes between the modules. Instead of running lerna directly, the commands are wrapped with `yarn`;
+The code base is a monorepo. We use [Lerna](https://lerna.js.org/) for managing inter-module dependencies, which makes it easier to develop coordinated changes between the modules. Instead of running lerna directly, the commands are wrapped with `npm`;
 
 ### Requirements
 
 Since this project supports multiple Node versions, using a version
 manager such as [nvm](https://github.com/creationix/nvm) is recommended.
 
-We use [yarn](https://yarnpkg.com/) for its workspace functionality, so make sure to install that as well.
-
-To get started once you have Node and yarn installed, run:
+To get started once you have Node installed, run:
 
 ```sh
-$ yarn
+$ npm install
 ```
 
 This will install all the necessary modules.
@@ -26,13 +24,13 @@ This will install all the necessary modules.
 To run the all unit tests, use:
 
 ```sh
-$ yarn test
+$ npm run test
 ```
 
 To run the unit tests continuously in watch mode while developing, use:
 
 ```sh
-$ yarn tdd
+$ npm run tdd
 ```
 
 ### Linting
@@ -43,12 +41,12 @@ Before raising a pull request, make sure there are no lint problems.
 
 To check the linter, use:
 ```sh
-$ yarn run check
+$ npm run check
 ```
 
 To fix the linter, use:
 ```sh
-$ yarn fix
+$ npm run fix
 ```
 
 ### Continuous Integration
@@ -74,7 +72,7 @@ We use [typedoc](https://www.npmjs.com/package/typedoc) to generate the api docu
 
 To generate the docs, use:
 ```sh
-$ yarn docs
+$ npm run docs
 ```
 
 The document will be available under `packages/opentelemetry-api/docs/out` path.

doc/exporter-guide.md

@@ -43,7 +43,7 @@ The `MetricExporter` defines the interface that protocol-specific exporters must
 
 The current `MetricExporter` interface (`0.2.0`) defines 2 methods:
 
-- `export`: Exports a batch of telemetry data. In this method you’ll process and translate `ReadableMetric` Data into the data that your metric backend accepts.
+- `export`: Exports a batch of telemetry data. In this method you’ll process and translate `MetricRecord` Data into the data that your metric backend accepts.
 
 - `shutdown`: Shuts down the exporter. This is an opportunity for exporter to do any cleanup required. `Shutdown` should be called only once for each Exporter instance. After the call to `Shutdown` subsequent calls to Export are not allowed and should return `FailedNotRetryable` error.
 

doc/plugin-guide.md

@@ -1,6 +1,6 @@
 # Plugin Developer Guide
 
-The `NodeTracer` or `Node-SDK` is driven by a set of plugins that describe how to patch a module to generate trace spans when that module is used. We provide out-of-the-box instrumentation for many popular frameworks and libraries by using a plugin system (see [builtin plugins][builtin-plugins]), and provide a means for developers to create their own.
+The `NodeTracerProvider` or `Node-SDK` is driven by a set of plugins that describe how to patch a module to generate trace spans when that module is used. We provide out-of-the-box instrumentation for many popular frameworks and libraries by using a plugin system (see [builtin plugins][builtin-plugins]), and provide a means for developers to create their own.
 
 We strongly recommended to create a dedicated package for newly added plugin, example: `@opentelemetry/plugin-xxx`.
 

examples/basic-tracer-node/README.md

@@ -73,7 +73,7 @@ For that please make sure you have [docker](https://docs.docker.com/) installed
    ```
 
 #### Collector Exporter - Zipkin UI
-The [opentelemetry-collector][opentelemetry-collector-url] 
+The [opentelemetry-collector][opentelemetry-collector-url]
 docker container is using [Zipkin Exporter](#zipkin).
 You can define more exporters without changing the instrumented code.
 To use default [Zipkin Exporter](#zipkin) please follow the section [Zipkin UI](#zipkin-ui) only