From 5518315f4709853f51dd8a613c5281c59bae772f Mon Sep 17 00:00:00 2001
From: Julien FABRE <julien.fabre.33@gmail.com>
Date: Sun, 28 Jun 2020 02:11:39 +0200
Subject: [PATCH 1/2] fix: default url for otelcol
---
packages/opentelemetry-exporter-collector/README.md | 8 ++++----
.../src/platform/browser/CollectorExporter.ts | 2 +-
.../src/platform/node/CollectorExporter.ts | 2 +-
.../test/browser/CollectorExporter.test.ts | 2 +-
.../test/node/CollectorExporter.test.ts | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/packages/opentelemetry-exporter-collector/README.md b/packages/opentelemetry-exporter-collector/README.md
index 6a8b8280567..79b8869e545 100644
--- a/packages/opentelemetry-exporter-collector/README.md
+++ b/packages/opentelemetry-exporter-collector/README.md
@@ -24,7 +24,7 @@ import { WebTracerProvider } from '@opentelemetry/web';
import { CollectorExporter } 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 { CollectorExporter } = 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 { CollectorExporter } = 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
};
diff --git a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporter.ts
index 5e7f121ac62..80c324f82cc 100644
--- a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporter.ts
+++ b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporter.ts
@@ -29,7 +29,7 @@ export interface CollectorExporterConfig extends CollectorExporterConfigBase {
headers?: { [key: string]: string };
}
-const DEFAULT_COLLECTOR_URL = 'http://localhost:55678/v1/trace';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55680/v1/trace';
/**
* Collector Exporter for Web
diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporter.ts
index e5c767ecf3a..b497793a552 100644
--- a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporter.ts
+++ b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporter.ts
@@ -29,7 +29,7 @@ import { toCollectorExportTraceServiceRequest } from '../../transform';
import { GRPCQueueItem, TraceServiceClient } from './types';
import { removeProtocol } from './util';
-const DEFAULT_COLLECTOR_URL = 'localhost:55678';
+const DEFAULT_COLLECTOR_URL = 'localhost:55680';
/**
* Collector Exporter Config for Node
diff --git a/packages/opentelemetry-exporter-collector/test/browser/CollectorExporter.test.ts b/packages/opentelemetry-exporter-collector/test/browser/CollectorExporter.test.ts
index 265bf441366..8c3d6301c8b 100644
--- a/packages/opentelemetry-exporter-collector/test/browser/CollectorExporter.test.ts
+++ b/packages/opentelemetry-exporter-collector/test/browser/CollectorExporter.test.ts
@@ -306,7 +306,7 @@ describe('CollectorExporter - browser (getDefaultUrl)', () => {
setTimeout(() => {
assert.strictEqual(
collectorExporter['url'],
- 'http://localhost:55678/v1/trace'
+ 'http://localhost:55680/v1/trace'
);
done();
});
diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorExporter.test.ts
index 13da3284a2d..aefe7e2fabf 100644
--- a/packages/opentelemetry-exporter-collector/test/node/CollectorExporter.test.ts
+++ b/packages/opentelemetry-exporter-collector/test/node/CollectorExporter.test.ts
@@ -176,7 +176,7 @@ describe('CollectorExporter - node (getDefaultUrl)', () => {
it('should default to localhost', done => {
const collectorExporter = new CollectorExporter({});
setTimeout(() => {
- assert.strictEqual(collectorExporter['url'], 'localhost:55678');
+ assert.strictEqual(collectorExporter['url'], 'localhost:55680');
done();
});
});
From e7aa03650cc4f89102729a6ef88cd98e7bd52a9e Mon Sep 17 00:00:00 2001
From: Julien FABRE <julien.fabre.33@gmail.com>
Date: Mon, 29 Jun 2020 18:31:36 +0200
Subject: [PATCH 2/2] docs: review example from default url otelcol
---
.../docker/collector-config.yaml | 3 +--
.../docker/docker-compose.yaml | 15 ++++++++++-----
examples/collector-exporter-node/package.json | 2 +-
examples/collector-exporter-node/start.js | 5 +++--
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/examples/collector-exporter-node/docker/collector-config.yaml b/examples/collector-exporter-node/docker/collector-config.yaml
index 2f64d8b4fc6..8ea773375be 100644
--- a/examples/collector-exporter-node/docker/collector-config.yaml
+++ b/examples/collector-exporter-node/docker/collector-config.yaml
@@ -1,6 +1,5 @@
receivers:
- otlp:
- endpoint: 0.0.0.0:55678
+ otlp: {}
exporters:
zipkin:
diff --git a/examples/collector-exporter-node/docker/docker-compose.yaml b/examples/collector-exporter-node/docker/docker-compose.yaml
index fee8f1aca03..53c635a0f43 100644
--- a/examples/collector-exporter-node/docker/docker-compose.yaml
+++ b/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:
diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json
index a10b08b64b6..a30ad9a0b4d 100644
--- a/examples/collector-exporter-node/package.json
+++ b/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": {
diff --git a/examples/collector-exporter-node/start.js b/examples/collector-exporter-node/start.js
index 9acbcc06870..f7aed5210bf 100644
--- a/examples/collector-exporter-node/start.js
+++ b/examples/collector-exporter-node/start.js
@@ -1,10 +1,10 @@
'use strict';
const opentelemetry = require('@opentelemetry/api');
-const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tracing');
+const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { CollectorExporter } = require('@opentelemetry/exporter-collector');
-const address = '127.0.0.1:55678';
+const address = '127.0.0.1:55680';
const exporter = new CollectorExporter({
serviceName: 'basic-service',
url: address,
@@ -12,6 +12,7 @@ const exporter = new CollectorExporter({
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');