Merge branch 'main' into instrumentation-prerelease

open-telemetry · Jul 17, 2021 · dabdf19 · dabdf19
2 parents 9bee39d + 90e941a
commit dabdf19
Show file tree

Hide file tree

Showing 35 changed files with 133 additions and 143 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | API Version | Core version | Contrib Version         |
 | ----------- |--------------|-------------------------|
-| 1.0.x       | 0.23.x       | ------                  |
+| 1.0.x       | 0.23.x       | 0.23.x                  |
 | 1.0.x       | 0.22.x       | 0.22.x                  |
 | 0.21.x      | 0.21.x       | 0.21.x                  |
 | 0.20.x      | 0.20.x       | 0.20.x                  |

diff --git a/examples/tracer-web/webpack.config.js b/examples/tracer-web/webpack.config.js
@@ -8,7 +8,6 @@ const common = {
   mode: 'development',
   entry: {
     metrics: 'examples/metrics/index.js',
-    test: 'examples/test/test.ts',
     fetch: 'examples/fetch/index.js',
     'xml-http-request': 'examples/xml-http-request/index.js',
     zipkin: 'examples/zipkin/index.js',

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -49,7 +49,6 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -67,7 +67,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -60,7 +60,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -75,7 +75,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0"
   },

diff --git a/packages/opentelemetry-exporter-collector-grpc/README.md b/packages/opentelemetry-exporter-collector-grpc/README.md
@@ -27,8 +27,8 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tra
 const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector-grpc');
 
 const collectorOptions = {
-  // url is optional and can be omitted - default is localhost:4317
-  url: '<collector-hostname>:<port>',
+  // url is optional and can be omitted - default is grpc://localhost:4317
+  url: 'grpc://<collector-hostname>:<port>',
 };
 
 const provider = new BasicTracerProvider();
@@ -51,8 +51,8 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tra
 const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector-grpc');
 
 const collectorOptions = {
-  // url is optional and can be omitted - default is localhost:4317
-  url: '<collector-hostname>:<port>',
+  // url is optional and can be omitted - default is grpc://localhost:4317
+  url: 'grpc://<collector-hostname>:<port>',
   credentials: grpc.credentials.createSsl(),
 };
 
@@ -91,8 +91,8 @@ const metadata = new grpc.Metadata();
 metadata.set('k', 'v');
 
 const collectorOptions = {
-  // url is optional and can be omitted - default is localhost:4317
-  url: '<collector-hostname>:<port>',
+  // url is optional and can be omitted - default is grpc://localhost:4317
+  url: 'grpc://<collector-hostname>:<port>',
   metadata, // // an optional grpc.Metadata object to be sent with each request
 };
 
@@ -116,8 +116,8 @@ The CollectorTraceExporter in Node expects the URL to only be the hostname. It w
 const { MeterProvider } = require('@opentelemetry/metrics');
 const { CollectorMetricExporter } =  require('@opentelemetry/exporter-collector-grpc');
 const collectorOptions = {
-  // url is optional and can be omitted - default is localhost:4317
-  url: '<collector-hostname>:<port>',
+  // url is optional and can be omitted - default is grpc://localhost:4317
+  url: 'grpc://<collector-hostname>:<port>',
 };
 const exporter = new CollectorMetricExporter(collectorOptions);
 

diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json
@@ -59,7 +59,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json
@@ -59,7 +59,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts
@@ -24,7 +24,7 @@ import { ServiceClientType } from './types';
 import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
 
-const DEFAULT_COLLECTOR_URL = 'http://localhost:4317/v1/metrics';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/metrics';
 
 /**
  * Collector Metric Exporter for Node with protobuf

diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts
@@ -24,7 +24,7 @@ import {
 import { ServiceClientType } from './types';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
 
-const DEFAULT_COLLECTOR_URL = 'http://localhost:4317/v1/traces';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/traces';
 
 /**
  * Collector Trace Exporter for Node with protobuf

diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -75,7 +75,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -52,7 +52,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json
@@ -49,7 +49,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -73,7 +73,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json
@@ -71,7 +71,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json
@@ -62,7 +62,6 @@
     "semver": "7.3.5",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json
@@ -64,7 +64,6 @@
     "sinon": "10.0.0",
     "superagent": "6.1.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -70,7 +70,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-instrumentation/package.json b/packages/opentelemetry-instrumentation/package.json
@@ -92,7 +92,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json
@@ -55,7 +55,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json
@@ -56,7 +56,6 @@
     "shimmer": "1.2.1",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json
@@ -66,7 +66,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0"
   },

diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json
@@ -50,7 +50,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json
@@ -50,7 +50,6 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -59,7 +59,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json
@@ -53,7 +53,6 @@
     "rimraf": "3.0.2",
     "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   }
 }
diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json
@@ -49,7 +49,6 @@
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5"
   },
   "peerDependencies": {

diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json
@@ -73,7 +73,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0"
   },

diff --git a/packages/opentelemetry-web/package.json b/packages/opentelemetry-web/package.json
@@ -71,7 +71,6 @@
     "sinon": "10.0.0",
     "ts-loader": "8.3.0",
     "ts-mocha": "8.0.0",
-    "ts-node": "10.0.0",
     "typescript": "4.3.5",
     "webpack": "4.46.0",
     "webpack-cli": "4.7.2",

diff --git a/packages/template/package.json b/packages/template/package.json
@@ -19,7 +19,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.5.0"
   },
   "scripts": {
     "compile": "tsc --build",

diff --git a/renovate.json b/renovate.json
@@ -11,7 +11,7 @@
       "rangeStrategy": "bump"
     },
     {
-      "matchPaths": ["backwards-compatibility/**"],
+      "matchPaths": ["backwards-compatibility"],
       "matchPackageNames": ["@types/node"],
       "enabled": false
     }