open-telemetry · dyladan · Dec 21, 2020 · Dec 4, 2020 · Dec 8, 2020 · Dec 8, 2020
diff --git a/examples/collector-exporter-node/docker/docker-compose.yaml b/examples/collector-exporter-node/docker/docker-compose.yaml
@@ -2,14 +2,14 @@ version: "3"
 services:
   # Collector
   collector:
-    image: otel/opentelemetry-collector:0.13.0
+    image: otel/opentelemetry-collector:0.16.0
 #    image: otel/opentelemetry-collector:latest
     command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml
     ports:
       - "9464:9464"
-      - "55680:55680"
+      - "4317:4317"
       - "55681:55681"
     depends_on:
       - zipkin-all-in-one

diff --git a/packages/opentelemetry-exporter-collector-grpc/README.md b/packages/opentelemetry-exporter-collector-grpc/README.md
@@ -6,7 +6,7 @@
 [![devDependencies][devDependencies-image]][devDependencies-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.6.0**.
+This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.16.0**.
 
 ## Installation
 
@@ -24,7 +24,7 @@ const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector-g
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>' // url is optional and can be omitted - default is localhost:55680
+  url: '<opentelemetry-collector-url>' // url is optional and can be omitted - default is localhost:4317
 };
 
 const provider = new BasicTracerProvider();
@@ -45,7 +45,7 @@ const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector-g
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55680
+  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:4317
   credentials: grpc.credentials.createSsl(
     fs.readFileSync('./ca.crt'),
     fs.readFileSync('./client.key'),
@@ -74,7 +74,7 @@ metadata.set('k', 'v');
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55680
+  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:4317
   metadata, // // an optional grpc.Metadata object to be sent with each request
 };
 

diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts
@@ -23,7 +23,7 @@ import { CollectorExporterConfigNode, ServiceClientType } from './types';
 import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
 
 const DEFAULT_SERVICE_NAME = 'collector-metric-exporter';
-const DEFAULT_COLLECTOR_URL = 'localhost:55680';
+const DEFAULT_COLLECTOR_URL = 'localhost:4317';
 
 /**
  * Collector Metric Exporter for Node

diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts
@@ -23,7 +23,7 @@ import {
 import { CollectorExporterConfigNode, ServiceClientType } from './types';
 
 const DEFAULT_SERVICE_NAME = 'collector-trace-exporter';
-const DEFAULT_COLLECTOR_URL = 'localhost:55680';
+const DEFAULT_COLLECTOR_URL = 'localhost:4317';
 
 /**
  * Collector Trace Exporter for Node

diff --git a/packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts
@@ -229,7 +229,7 @@ describe('CollectorMetricExporter - node (getDefaultUrl)', () => {
   it('should default to localhost', done => {
     const collectorExporter = new CollectorMetricExporter({});
     setTimeout(() => {
-      assert.strictEqual(collectorExporter['url'], 'localhost:55680');
+      assert.strictEqual(collectorExporter['url'], 'localhost:4317');
       done();
     });
   });

diff --git a/packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts
@@ -194,7 +194,7 @@ describe('CollectorTraceExporter - node (getDefaultUrl)', () => {
   it('should default to localhost', done => {
     const collectorExporter = new CollectorTraceExporter({});
     setTimeout(() => {
-      assert.strictEqual(collectorExporter['url'], 'localhost:55680');
+      assert.strictEqual(collectorExporter['url'], 'localhost:4317');
       done();
     });
   });

diff --git a/packages/opentelemetry-exporter-collector-grpc/test/helper.ts b/packages/opentelemetry-exporter-collector-grpc/test/helper.ts
@@ -87,7 +87,9 @@ export function mockObserver(
   return metric;
 }
 
-export function mockValueRecorder(): metrics.Metric<metrics.BoundValueRecorder> &
+export function mockValueRecorder(): metrics.Metric<
+  metrics.BoundValueRecorder
+> &
   api.ValueRecorder {
   const name = 'int-recorder';
   const metric =

diff --git a/packages/opentelemetry-exporter-collector-proto/README.md b/packages/opentelemetry-exporter-collector-proto/README.md
@@ -6,7 +6,7 @@
 [![devDependencies][devDependencies-image]][devDependencies-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.6.0**.
+This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.16.0**.
 
 ## Installation
 

diff --git a/packages/opentelemetry-exporter-collector-proto/test/helper.ts b/packages/opentelemetry-exporter-collector-proto/test/helper.ts
@@ -67,7 +67,9 @@ export function mockObserver(
   return metric;
 }
 
-export function mockValueRecorder(): metrics.Metric<metrics.BoundValueRecorder> &
+export function mockValueRecorder(): metrics.Metric<
+  metrics.BoundValueRecorder
+> &
   api.ValueRecorder {
   const name = 'int-recorder';
   const metric =

diff --git a/packages/opentelemetry-exporter-collector/README.md b/packages/opentelemetry-exporter-collector/README.md
@@ -6,7 +6,7 @@
 [![devDependencies][devDependencies-image]][devDependencies-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.12.0**.
+This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url] - last tested with version **0.16.0**.
 
 ## Installation
 

diff --git a/packages/opentelemetry-exporter-collector/test/helper.ts b/packages/opentelemetry-exporter-collector/test/helper.ts
@@ -127,7 +127,9 @@ export function mockUpDownSumObserver(
   return metric;
 }
 
-export function mockValueRecorder(): metrics.Metric<metrics.BoundValueRecorder> &
+export function mockValueRecorder(): metrics.Metric<
+  metrics.BoundValueRecorder
+> &
   api.ValueRecorder {
   const name = 'int-recorder';
   const metric =

diff --git a/packages/opentelemetry-web/src/utils.ts b/packages/opentelemetry-web/src/utils.ts
@@ -125,7 +125,9 @@ export function getResource(
   startTimeHR: api.HrTime,
   endTimeHR: api.HrTime,
   resources: PerformanceResourceTiming[],
-  ignoredResources: WeakSet<PerformanceResourceTiming> = new WeakSet<PerformanceResourceTiming>(),
+  ignoredResources: WeakSet<PerformanceResourceTiming> = new WeakSet<
+    PerformanceResourceTiming
+  >(),
   initiatorType?: string
 ): PerformanceResourceTimingInfo {
   // de-relativize the URL before usage (does no harm to absolute URLs)