Merge remote-tracking branch 'origin/http-sender' into http-sender

.circleci/config.yml

@@ -10,7 +10,6 @@ cache_1: &cache_1
     - ./node_modules
     - ./package-lock.json
     - packages/opentelemetry-api/node_modules
-    - packages/opentelemetry-base/node_modules
     - packages/opentelemetry-context-async-hooks/node_modules
     - packages/opentelemetry-context-base/node_modules
     - packages/opentelemetry-context-zone/node_modules
@@ -190,6 +189,11 @@ jobs:
       - image: node:13
         environment: *node_test_env
     <<: *node_unit_tests
+  node14:
+    docker:
+      - image: node:14
+        environment: *node_test_env
+    <<: *node_unit_tests
   node12-browsers:
     docker:
       - image: circleci/node:12-browsers
@@ -215,5 +219,6 @@ workflows:
       - node10
       - node12
       - node13
+      - node14
       - node12-browsers
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "packages/opentelemetry-exporter-collector/src/platform/node/protos"]
 	path = packages/opentelemetry-exporter-collector/src/platform/node/protos
-	url = git@github.com:open-telemetry/opentelemetry-proto.git
+	url = https://github.com/open-telemetry/opentelemetry-proto.git

CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.7.0
+
+Released 2020-04-23
+
+#### :boom: Breaking Change
+* `opentelemetry-exporter-collector`
+  * [#901](https://github.com/open-telemetry/opentelemetry-js/pull/901) grpc for node and support for new proto format for node and browser ([@obecny](https://github.com/obecny))
+* `opentelemetry-api`, `opentelemetry-metrics`
+  * [#964](https://github.com/open-telemetry/opentelemetry-js/pull/964) chore: adding metric observable to be able to support async update ([@obecny](https://github.com/obecny))
+
+#### :bug: (Bug Fix)
+* `opentelemetry-plugin-http`
+  * [#960](https://github.com/open-telemetry/opentelemetry-js/pull/960) [http] fix: use url.URL ([@naseemkullah](https://github.com/naseemkullah))
+* `opentelemetry-core`
+  * [#977](https://github.com/open-telemetry/opentelemetry-js/pull/977) fix(B3Propagator): B3 sampled causing gRPC error ([@mayurkale22](https://github.com/mayurkale22))
+
+#### :rocket: (Enhancement)
+* `opentelemetry-resources`
+  * [#899](https://github.com/open-telemetry/opentelemetry-js/pull/899) feat: resource auto-detection ([@mwear](https://github.com/mwear))
+* `opentelemetry-metrics`
+  * [#930](https://github.com/open-telemetry/opentelemetry-js/pull/930) feat(aggregators): implement histogram aggregator ([@vmarchaud](https://github.com/vmarchaud))
+
+#### Committers: 5
+- Naseem ([@naseemkullah](https://github.com/naseemkullah))
+- Matthew Wear ([@mwear](https://github.com/mwear))
+- Bartlomiej Obecny ([@obecny](https://github.com/obecny))
+- Mayur Kale ([@mayurkale22](https://github.com/mayurkale22))
+- Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+
 ## 0.6.1
 
 Released 2020-04-08

README.md

@@ -54,6 +54,26 @@ To get started tracing your own application, see the [Getting Started Guide](get
 
 If you are a library author looking to build OpenTelemetry into your library, please see [the documentation][docs]. As a library author, it is important that you only depend on properties and methods published on the public API. If you use any properties or methods from the SDK that are not officially a part of the public API, your library may break if an [Application Owner](#application-owner) uses a different SDK implementation.
 
+## Supported Runtimes
+
+Platform Version | Supported
+---------------- | ---------
+Node.JS `v14`    | ✅
+Node.JS `v13`    | ✅
+Node.JS `v12`    | ✅
+Node.JS `v10`    | ✅
+Node.JS `v8`     | See [Node Support](#node-support) below
+Web Browsers     | ✅ See [Browser Support](#browser-support) below
+
+### Node Support
+Automated tests are run using the latest release of each currently active version of Node.JS.
+While Node.JS v8 is no longer supported by the Node.JS team, the latest version of Node.JS v8 is still included in our testing suite.
+Please note that versions of Node.JS v8 prior to `v8.5.0` will NOT work, because OpenTelemetry Node depends on the `perf_hooks` module introduced in `v8.5.0`
+
+### Browser Support
+Automated browser tests are run in the latest version of Headless Chrome.
+There is currently no list of officially supported browsers, but OpenTelemetry is developed using standard web technologies with wide support and should work in currently supported versions of major browsers.
+
 ## Release Schedule
 
 OpenTelemetry JS is under active development.
@@ -142,7 +162,6 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
 | [@opentelemetry/metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
 | [@opentelemetry/node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
 | [@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). |
 
 ### Compatible Exporters
 
@@ -202,7 +221,6 @@ 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-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
 

examples/basic-tracer-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-basic-tracer-node",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/tracing in Node.js",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.6.1",
-    "@opentelemetry/exporter-jaeger": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1"
+    "@opentelemetry/api": "^0.7.0",
+    "@opentelemetry/exporter-jaeger": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/collector-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-collector-exporter-node",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -26,9 +26,9 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.6.1",
-    "@opentelemetry/exporter-collector": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1"
+    "@opentelemetry/api": "^0.7.0",
+    "@opentelemetry/exporter-collector": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/grpc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "grpc-example",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of gRPC integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,12 +28,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.6.1",
-    "@opentelemetry/exporter-jaeger": "^0.6.1",
-    "@opentelemetry/exporter-zipkin": "^0.6.1",
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/plugin-grpc": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@opentelemetry/api": "^0.7.0",
+    "@opentelemetry/exporter-jaeger": "^0.7.0",
+    "@opentelemetry/exporter-zipkin": "^0.7.0",
+    "@opentelemetry/node": "^0.7.0",
+    "@opentelemetry/plugin-grpc": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0",
     "google-protobuf": "^3.9.2",
     "grpc": "^1.23.3",
     "node-pre-gyp": "0.12.0"

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,12 +28,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.6.1",
-    "@opentelemetry/exporter-jaeger": "^0.6.1",
-    "@opentelemetry/exporter-zipkin": "^0.6.1",
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/plugin-http": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1"
+    "@opentelemetry/api": "^0.7.0",
+    "@opentelemetry/exporter-jaeger": "^0.7.0",
+    "@opentelemetry/exporter-zipkin": "^0.7.0",
+    "@opentelemetry/node": "^0.7.0",
+    "@opentelemetry/plugin-http": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -29,12 +29,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.6.1",
-    "@opentelemetry/exporter-jaeger": "^0.6.1",
-    "@opentelemetry/exporter-zipkin": "^0.6.1",
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/plugin-https": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1"
+    "@opentelemetry/api": "^0.7.0",
+    "@opentelemetry/exporter-jaeger": "^0.7.0",
+    "@opentelemetry/exporter-zipkin": "^0.7.0",
+    "@opentelemetry/node": "^0.7.0",
+    "@opentelemetry/plugin-https": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {

examples/metrics/metrics/observer.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { MeterProvider } = require('@opentelemetry/metrics');
+const { MeterProvider, MetricObservable } = require('@opentelemetry/metrics');
 const { PrometheusExporter } = require('@opentelemetry/exporter-prometheus');
 
 const exporter = new PrometheusExporter(
@@ -14,7 +14,7 @@ const exporter = new PrometheusExporter(
 
 const meter = new MeterProvider({
   exporter,
-  interval: 1000,
+  interval: 2000,
 }).getMeter('example-observer');
 
 const otelCpuUsage = meter.createObserver('metric_observer', {
@@ -27,9 +27,16 @@ function getCpuUsage() {
   return Math.random();
 }
 
+const observable = new MetricObservable();
+
+setInterval(() => {
+  observable.next(getCpuUsage());
+}, 5000);
+
 otelCpuUsage.setCallback((observerResult) => {
   observerResult.observe(getCpuUsage, { pid: process.pid, core: '1' });
   observerResult.observe(getCpuUsage, { pid: process.pid, core: '2' });
   observerResult.observe(getCpuUsage, { pid: process.pid, core: '3' });
   observerResult.observe(getCpuUsage, { pid: process.pid, core: '4' });
+  observerResult.observe(observable, { pid: process.pid, core: '5' });
 });

examples/metrics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-metrics",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/metrics",
   "main": "index.js",
   "scripts": {
@@ -26,8 +26,8 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/exporter-prometheus": "^0.6.1",
-    "@opentelemetry/metrics": "^0.6.1"
+    "@opentelemetry/exporter-prometheus": "^0.7.0",
+    "@opentelemetry/metrics": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/opentracing-shim/client.js

@@ -4,7 +4,7 @@ const http = require('http');
 const opentracing = require('opentracing');
 const shim = require('./shim').shim('http_client_service');
 
-opentracing.setGlobalTracer(shim);
+opentracing.initGlobalTracer(shim);
 const tracer = opentracing.globalTracer();
 
 makeRequest();

examples/opentracing-shim/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opentracing-shim",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/shim-opentracing in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,11 +29,11 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/exporter-jaeger": "^0.6.1",
-    "@opentelemetry/exporter-zipkin": "^0.6.1",
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/shim-opentracing": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@opentelemetry/exporter-jaeger": "^0.7.0",
+    "@opentelemetry/exporter-zipkin": "^0.7.0",
+    "@opentelemetry/node": "^0.7.0",
+    "@opentelemetry/shim-opentracing": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0",
     "opentracing": "^0.14.4"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

examples/opentracing-shim/server.js

@@ -5,7 +5,7 @@ const opentracing = require('opentracing');
 const utils = require('./utils');
 const shim = require('./shim').shim('http_server_service');
 
-opentracing.setGlobalTracer(shim);
+opentracing.initGlobalTracer(shim);
 const tracer = opentracing.globalTracer();
 
 startServer(3000);

examples/opentracing-shim/shim.js

@@ -10,6 +10,8 @@ function shim(serviceName) {
   const provider = new NodeTracerProvider();
 
   provider.addSpanProcessor(new SimpleSpanProcessor(getExporter(serviceName)));
+  // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
+  provider.register();
 
   return new TracerShim(provider.getTracer('opentracing-shim'));
 }

examples/prometheus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/metrics and  @opentelemetry/exporter-prometheus",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@opentelemetry/exporter-prometheus": "^0.6.1",
-    "@opentelemetry/metrics": "^0.6.1"
+    "@opentelemetry/exporter-prometheus": "^0.7.0",
+    "@opentelemetry/metrics": "^0.7.0"
   }
 }

examples/tracer-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-tracer-example",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Example of using @opentelemetry/web in browser",
   "main": "index.js",
   "scripts": {
@@ -34,14 +34,14 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@opentelemetry/context-zone": "^0.6.1",
-    "@opentelemetry/core": "^0.6.1",
-    "@opentelemetry/exporter-collector": "^0.6.1",
+    "@opentelemetry/context-zone": "^0.7.0",
+    "@opentelemetry/core": "^0.7.0",
+    "@opentelemetry/exporter-collector": "^0.7.0",
     "@opentelemetry/plugin-document-load": "^0.6.1",
     "@opentelemetry/plugin-user-interaction": "^0.6.1",
-    "@opentelemetry/plugin-xml-http-request": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
-    "@opentelemetry/web": "^0.6.1"
+    "@opentelemetry/plugin-xml-http-request": "^0.7.0",
+    "@opentelemetry/tracing": "^0.7.0",
+    "@opentelemetry/web": "^0.7.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }