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

Follow spec defined port 4318 for HTTP exporter #2395

Closed
wants to merge 2 commits into from
Closed

Follow spec defined port 4318 for HTTP exporter #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a52f8
Follow spec defined port 4318 for HTTP exporter
NathanielRN Aug 3, 2021
085ed57
Find a replace all 55681 endpoints with 4318 for HTTP
NathanielRN Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/basic-tracer-node/docker/ot/docker-compose.yaml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ services:
ports:
- "9464:9464"
- "4317:4317"
- "55681:55681"
- "4318:4318"
depends_on:
- jaeger-all-in-one

Expand Down
2 changes: 1 addition & 1 deletion examples/collector-exporter-node/docker/docker-compose.yaml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ services:
ports:
- "9464:9464"
- "4317:4317"
- "55681:55681"
- "4318:4318"
depends_on:
- zipkin-all-in-one

Expand Down
2 changes: 1 addition & 1 deletion examples/collector-exporter-node/metrics.js
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventi
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);

const metricExporter = new CollectorMetricExporter({
// url: 'http://localhost:55681/v1/metrics',
// url: 'http://localhost:4318/v1/metrics',
});

const meter = new MeterProvider({
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-proto/README.md
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tra
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');

const collectorOptions = {
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55681/v1/traces
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/traces
headers: {
foo: 'bar'
}, //an optional object containing custom headers to be sent with each request will only work with http
Expand All @@ -45,7 +45,7 @@ provider.register();
const { MeterProvider } = require('@opentelemetry/metrics');
const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
const collectorOptions = {
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics
};
const exporter = new CollectorMetricExporter(collectorOptions);

Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ import { ServiceClientType } from './types';
import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/metrics';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/metrics';

/**
* Collector Metric Exporter for Node with protobuf
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ import {
import { ServiceClientType } from './types';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/traces';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/traces';

/**
* Collector Trace Exporter for Node with protobuf
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry-exporter-collector/README.md
View file
Open in desktop
Expand Up @@ -28,7 +28,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:55681/v1/trace
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/trace
headers: {}, // an optional object containing custom headers to be sent with each request
concurrencyLimit: 10, // an optional limit on pending requests
};
Expand Down Expand Up @@ -58,7 +58,7 @@ The CollectorMetricExporter in Web expects the endpoint to end in `/v1/metrics`.
import { MeterProvider } from '@opentelemetry/metrics';
import { CollectorMetricExporter } from '@opentelemetry/exporter-collector';
const collectorOptions = {
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics
headers: {}, // an optional object containing custom headers to be sent with each request
concurrencyLimit: 1, // an optional limit on pending requests
};
Expand All @@ -83,7 +83,7 @@ const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/trac
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');

const collectorOptions = {
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55681/v1/trace
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/trace
headers: {
foo: 'bar'
}, // an optional object containing custom headers to be sent with each request will only work with http
Expand All @@ -109,7 +109,7 @@ provider.register();
const { MeterProvider } = require('@opentelemetry/metrics');
const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');
const collectorOptions = {
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics
url: '<opentelemetry-collector-url>', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics
concurrencyLimit: 1, // an optional limit on pending requests
};
const exporter = new CollectorMetricExporter(collectorOptions);
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/src/platform/browser/CollectorMetricExporter.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import { CollectorExporterBrowserBase } from './CollectorExporterBrowserBase';
import { toCollectorExportMetricServiceRequest } from '../../transformMetrics';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/metrics';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/metrics';

/**
* Collector Metric Exporter for Web
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import { toCollectorExportTraceServiceRequest } from '../../transform';
import * as collectorTypes from '../../types';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/traces';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/traces';

/**
* Collector Trace Exporter for Web
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/src/platform/node/CollectorMetricExporter.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
import { toCollectorExportMetricServiceRequest } from '../../transformMetrics';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/metrics';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/metrics';

/**
* Collector Metric Exporter for Node
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import * as collectorTypes from '../../types';
import { toCollectorExportTraceServiceRequest } from '../../transform';
import { getEnv, baggageUtils } from '@opentelemetry/core';

const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/traces';
const DEFAULT_COLLECTOR_URL = 'http://localhost:4318/v1/traces';

/**
* Collector Trace Exporter for Node
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts
View file
Open in desktop
Expand Up @@ -293,7 +293,7 @@ describe('CollectorTraceExporter - browser (getDefaultUrl)', () => {
setTimeout(() => {
assert.strictEqual(
collectorExporter['url'],
'http://localhost:55681/v1/traces'
'http://localhost:4318/v1/traces'
);
done();
});
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts
View file
Open in desktop
Expand Up @@ -292,7 +292,7 @@ describe('CollectorMetricExporter - node with json over http', () => {
setTimeout(() => {
assert.strictEqual(
collectorExporter['url'],
'http://localhost:55681/v1/metrics'
'http://localhost:4318/v1/metrics'
);
done();
});
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts
View file
Open in desktop
Expand Up @@ -317,7 +317,7 @@ describe('CollectorTraceExporter - node with json over http', () => {
setTimeout(() => {
assert.strictEqual(
collectorExporter['url'],
'http://localhost:55681/v1/traces'
'http://localhost:4318/v1/traces'
);
done();
});
Expand Down