Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new gRPC default port #1725

Merged
merged 15 commits into from
Dec 21, 2020
Merged

Use new gRPC default port #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7f3d3a2
chore: use new gRPC default port
jufab Dec 4, 2020
cad70e4
docs: change version collector
jufab Dec 8, 2020
fc54c2e
Merge branch 'master' into otel-grpc-port-default
jufab Dec 8, 2020
b9e4e79
fix: linter error
jufab Dec 8, 2020
6d65379
Merge branch 'master' into otel-grpc-port-default
jufab Dec 11, 2020
4ad91b8
Merge branch 'master' into otel-grpc-port-default
jufab Dec 18, 2020
3ca383a
Merge branch 'master' into otel-grpc-port-default
jufab Dec 18, 2020
366e266
fix: lint helper
jufab Dec 18, 2020
44e91a5
fix: lint helper
jufab Dec 18, 2020
e8040a2
fix: lint helper
jufab Dec 18, 2020
9a1e15f
fix: protos
jufab Dec 19, 2020
396df74
fix: linter
jufab Dec 19, 2020
77d3009
fix: linter
jufab Dec 19, 2020
1552f35
Merge branch 'master' into otel-grpc-port-default
jufab Dec 21, 2020
42ed391
fix: linter OK after reinstall all
jufab Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/collector-exporter-node/docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry-exporter-collector-grpc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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();
Expand All @@ -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'),
Expand Down Expand Up @@ -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
};

Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-proto/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down