fix: default url for otelcol (#1254)

* fix: default url for otelcol

* docs: review example from default url otelcol

Co-authored-by: Mayur Kale <[email protected]>

examples/collector-exporter-node/docker/collector-config.yaml

@@ -1,6 +1,5 @@
 receivers:
-  otlp:
-    endpoint: 0.0.0.0:55678
+  otlp: {}
 
 exporters:
   zipkin:

examples/collector-exporter-node/docker/docker-compose.yaml

@@ -1,19 +1,24 @@
-version: "2"
+version: "3"
 services:
-
   # Collector
   collector:
-    image: omnition/opentelemetry-collector-contrib:0.2.8
+    image: otel/opentelemetry-collector:0.4.0
+    networks:
+      - otelcol
     command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml
     ports:
-      - "55678:55678"
+      - "55680:55680"
     depends_on:
       - zipkin-all-in-one
-
   # Zipkin
   zipkin-all-in-one:
     image: openzipkin/zipkin:latest
+    networks:
+      - otelcol
     ports:
       - "9411:9411"
+
+networks:
+  otelcol:

examples/collector-exporter-node/package.json

@@ -6,7 +6,7 @@
   "main": "index.js",
   "scripts": {
     "start": "node ./start.js",
-    "docker:start": "cd ./docker && docker-compose down && docker-compose up",
+    "docker:start": "cd ./docker && docker-compose down && docker-compose up -d",
     "docker:stop": "cd ./docker && docker-compose down"
   },
   "repository": {

examples/collector-exporter-node/start.js

@@ -1,17 +1,18 @@
 'use strict';
 
 const opentelemetry = require('@opentelemetry/api');
-const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tracing');
+const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
 
-const address = '127.0.0.1:55678';
+const address = '127.0.0.1:55680';
 const exporter = new CollectorTraceExporter({
   serviceName: 'basic-service',
   url: address,
 });
 
 const provider = new BasicTracerProvider();
 provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.register();
 
 const tracer = opentelemetry.trace.getTracer('example-collector-exporter-node');

packages/opentelemetry-exporter-collector/README.md

@@ -24,7 +24,7 @@ import { WebTracerProvider } from '@opentelemetry/web';
 import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
 
 const collectorOptions = {
-  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55678/v1/trace
+  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55680/v1/trace
   headers: {}, //an optional object containing custom headers to be sent with each request
 };
 
@@ -46,7 +46,7 @@ const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector')
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>' // url is optional and can be omitted - default is localhost:55678
+  url: '<opentelemetry-collector-url>' // url is optional and can be omitted - default is localhost:55680
 };
 
 const provider = new BasicTracerProvider();
@@ -67,7 +67,7 @@ const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector')
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55678
+  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55680
   credentials: grpc.credentials.createSsl(
     fs.readFileSync('./ca.crt'),
     fs.readFileSync('./client.key'),
@@ -96,7 +96,7 @@ metadata.set('k', 'v');
 
 const collectorOptions = {
   serviceName: 'basic-service',
-  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55678
+  url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is localhost:55680
   metadata, // // an optional grpc.Metadata object to be sent with each request
 };
 

packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts

@@ -20,7 +20,7 @@ import { toCollectorExportTraceServiceRequest } from '../../transform';
 import { CollectorExporterConfigBrowser } from '../../types';
 import * as collectorTypes from '../../types';
 
-const DEFAULT_COLLECTOR_URL = 'http://localhost:55678/v1/trace';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55680/v1/trace';
 
 /**
  * Collector Exporter for Web

packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts

@@ -29,7 +29,7 @@ import { toCollectorExportTraceServiceRequest } from '../../transform';
 import { GRPCSpanQueueItem, ServiceClient } from './types';
 import { removeProtocol } from './util';
 
-const DEFAULT_COLLECTOR_URL = 'localhost:55678';
+const DEFAULT_COLLECTOR_URL = 'localhost:55680';
 
 /**
  * Collector Trace Exporter for Node

packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts

@@ -332,7 +332,7 @@ describe('CollectorExporter - browser (getDefaultUrl)', () => {
     setTimeout(() => {
       assert.strictEqual(
         collectorExporter['url'],
-        'http://localhost:55678/v1/trace'
+        'http://localhost:55680/v1/trace'
       );
       done();
     });

packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts

@@ -176,7 +176,7 @@ describe('CollectorExporter - node (getDefaultUrl)', () => {
   it('should default to localhost', done => {
     const collectorExporter = new CollectorTraceExporter({});
     setTimeout(() => {
-      assert.strictEqual(collectorExporter['url'], 'localhost:55678');
+      assert.strictEqual(collectorExporter['url'], 'localhost:55680');
       done();
     });
   });