Merge branch 'master' into http-instrumentation-content-size

open-telemetry · Dec 21, 2020 · 3d3295e · 3d3295e
2 parents 40c2d2d + 16a3316
commit 3d3295e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/examples/collector-exporter-node/docker/docker-compose.yaml b/examples/collector-exporter-node/docker/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       - ./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-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