Merge branch 'master' into http-sender

.circleci/config.yml

@@ -1,43 +1,8 @@
 version: 2
 
 node_test_env: &node_test_env
-  RUN_POSTGRES_TESTS: 1
-  RUN_MYSQL_TESTS: 1
-  RUN_MONGODB_TESTS: 1
-  RUN_REDIS_TESTS: 1
-  POSTGRES_USER: postgres
-  POSTGRES_DB: circle_database
-  POSTGRES_HOST: localhost
-  POSTGRES_PORT: 5432
-  OPENTELEMETRY_REDIS_HOST: 'localhost'
-  OPENTELEMETRY_REDIS_PORT: 6379
-  MONGODB_HOST: localhost
-  MONGODB_DB: opentelemetry-tests
-  MONGODB_PORT: 27017
-  MYSQL_USER: otel
-  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
-  environment: # env to pass to CircleCI, specified values must match node_test_env
-    POSTGRES_USER: postgres
-    POSTGRES_DB: circle_database
-redis_service: &redis_service
-  image: redis
-
-mongo_service: &mongo_service
-  image: mongo
-
-mysql_service: &mysql_service
-  image: circleci/mysql:5.7
-  environment:
-    MYSQL_USER: otel
-    MYSQL_PASSWORD: secret
-    MYSQL_DATABASE: circle_database
-    MYSQL_ROOT_PASSWORD: rootpw
 
 cache_1: &cache_1
   key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-F267A71D
@@ -56,7 +21,6 @@ cache_1: &cache_1
     - packages/opentelemetry-exporter-zipkin/node_modules
     - packages/opentelemetry-metrics/node_modules
     - packages/opentelemetry-node/node_modules
-    - packages/opentelemetry-plugin-dns/node_modules
     - packages/opentelemetry-shim-opentracing/node_modules
     - packages/opentelemetry-tracing/node_modules
     - packages/opentelemetry-web/node_modules
@@ -66,17 +30,9 @@ cache_2: &cache_2
   paths:
     - packages/opentelemetry-plugin-grpc/node_modules
     - packages/opentelemetry-plugin-http/node_modules
-    - packages/opentelemetry-plugin-ioredis/node_modules
-    - packages/opentelemetry-plugin-mongodb/node_modules
-    - packages/opentelemetry-plugin-redis/node_modules
-    - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/node_modules
-    - packages/opentelemetry-plugin-document-load/node_modules
     - packages/opentelemetry-plugin-https/node_modules
-    - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules
-    - packages/opentelemetry-plugin-mysql/node_modules
     - packages/opentelemetry-exporter-collector/node_modules
     - packages/opentelemetry-plugin-xml-http-request/node_modules
-    - packages/opentelemetry-plugin-express/node_modules
     - packages/opentelemetry-resources/node_modules
 
 node_unit_tests: &node_unit_tests
@@ -218,37 +174,21 @@ jobs:
     docker:
       - image: node:8
         environment: *node_test_env
-      - *postgres_service
-      - *mysql_service
-      - *redis_service
-      - *mongo_service
     <<: *node_unit_tests
   node10:
     docker:
       - image: node:10
         environment: *node_test_env
-      - *postgres_service
-      - *mysql_service
-      - *redis_service
-      - *mongo_service
     <<: *node_unit_tests
   node12:
     docker:
       - image: node:12
         environment: *node_test_env
-      - *postgres_service
-      - *mysql_service
-      - *redis_service
-      - *mongo_service
     <<: *node_unit_tests
   node13:
     docker:
       - image: node:13
         environment: *node_test_env
-      - *postgres_service
-      - *mysql_service
-      - *redis_service
-      - *mongo_service
     <<: *node_unit_tests
   node12-browsers:
     docker:

README.md

@@ -144,39 +144,39 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
 | [@opentelemetry/web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |
 | [@opentelemetry/base][otel-base] | This package provides base code for the SDK packages (tracing and metrics). |
 
-### Exporters
+### Compatible Exporters
 
-OpenTelemetry is vendor-agnostic and can upload data to any backend with various exporter implementations. Even though, OpenTelemetry provides support for many backends, vendors/users can also implement their own exporters for proprietary and unofficially supported backends. Currently, OpenTelemetry supports:
+OpenTelemetry is vendor-agnostic and can upload data to any backend with various exporter implementations. Even though, OpenTelemetry provides support for many backends, vendors/users can also implement their own exporters for proprietary and unofficially supported backends.
 
-#### Trace Exporters
-- [@opentelemetry/exporter-jaeger][otel-exporter-jaeger]
-- [@opentelemetry/exporter-zipkin][otel-exporter-zipkin]
-- [@opentelemetry/exporter-collector][otel-exporter-collector]
-
-#### Metric Exporters
-- [@opentelemetry/exporter-prometheus][otel-exporter-prometheus]
+See the [OpenTelemetry registry](https://opentelemetry.io/registry/?s=node.js) for a list of exporters available.
 
 ### Plugins
 
 OpenTelemetry can collect tracing data automatically using plugins. Vendors/Users can also create and use their own. Currently, OpenTelemetry supports automatic tracing for:
 
 #### Node Plugins
+##### Core
 - [@opentelemetry/plugin-grpc][otel-plugin-grpc]
 - [@opentelemetry/plugin-http][otel-plugin-http]
 - [@opentelemetry/plugin-https][otel-plugin-https]
-- [@opentelemetry/plugin-mongodb][otel-plugin-mongodb]
-- [@opentelemetry/plugin-mysql][otel-plugin-mysql]
-- [@opentelemetry/plugin-pg][otel-plugin-pg]
-- [@opentelemetry/plugin-pg-pool][otel-plugin-pg-pool]
-- [@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
+##### Contrib
+These plugins are hosted at https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node
+- [@opentelemetry/plugin-mongodb][otel-contrib-plugin-mongodb]
+- [@opentelemetry/plugin-mysql][otel-contrib-plugin-mysql]
+- [@opentelemetry/plugin-pg][otel-contrib-plugin-pg]
+- [@opentelemetry/plugin-pg-pool][otel-contrib-plugin-pg-pool]
+- [@opentelemetry/plugin-redis][otel-contrib-plugin-redis]
+- [@opentelemetry/plugin-ioredis][otel-contrib-plugin-ioredis]
+- [@opentelemetry/plugin-dns][otel-contrib-plugin-dns] - By default, this plugin is not loaded [#612](https://github.com/open-telemetry/opentelemetry-js/issues/612)
+- [@opentelemetry/plugin-express][otel-contrib-plugin-express] - By default, this plugin is not loaded
 
 #### Web Plugins
-- [@opentelemetry/plugin-document-load][otel-plugin-document-load]
+##### Core
 - [@opentelemetry/plugin-xml-http-request][otel-plugin-xml-http-request]
-- [@opentelemetry/plugin-user-interaction][otel-plugin-user-interaction]
+##### Contrib
+These plugins are hosted at https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web
+- [@opentelemetry/plugin-document-load][otel-contrib-plugin-document-load]
+- [@opentelemetry/plugin-user-interaction][otel-contrib-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).
 
@@ -203,29 +203,28 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [docs]: https://open-telemetry.github.io/opentelemetry-js
 
 [otel-base]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-base
-[otel-exporter-collector]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-exporter-collector
-[otel-exporter-jaeger]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-exporter-jaeger
-[otel-exporter-prometheus]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-exporter-prometheus
-[otel-exporter-zipkin]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-exporter-zipkin
 [otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-metrics
 [otel-node]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node
-[otel-plugin-dns]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-dns
-[otel-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-document-load
+
 [otel-plugin-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc
 [otel-plugin-http]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-http
 [otel-plugin-https]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-https
-[otel-plugin-ioredis]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-ioredis
-[otel-plugin-mongodb]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-mongodb
-[otel-plugin-mysql]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-mysql
-[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
 [otel-api]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-api
 [otel-core]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-core
 [generate-api-documentation]: https://github.com/open-telemetry/opentelemetry-js/blob/master/CONTRIBUTING.md#generating-api-documentation
+
+[otel-contrib-plugin-dns]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-dns
+[otel-contrib-plugin-ioredis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-ioredis
+[otel-contrib-plugin-mongodb]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-mongodb
+[otel-contrib-plugin-mysql]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-mysql
+[otel-contrib-plugin-pg-pool]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool
+[otel-contrib-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-postgres/opentelemetry-plugin-pg
+[otel-contrib-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis
+[otel-contrib-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express
+[otel-contrib-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction
+[otel-contrib-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-document-load