diff --git a/examples/basic-tracer-node/docker/ot/docker-compose.yaml b/examples/basic-tracer-node/docker/ot/docker-compose.yaml index a2068c155b..aac99f4b71 100644 --- a/examples/basic-tracer-node/docker/ot/docker-compose.yaml +++ b/examples/basic-tracer-node/docker/ot/docker-compose.yaml @@ -10,7 +10,7 @@ services: ports: - "9464:9464" - "4317:4317" - - "55681:55681" + - "4318:4318" depends_on: - jaeger-all-in-one diff --git a/examples/collector-exporter-node/docker/docker-compose.yaml b/examples/collector-exporter-node/docker/docker-compose.yaml index 1324c33f00..9a1de62fe8 100644 --- a/examples/collector-exporter-node/docker/docker-compose.yaml +++ b/examples/collector-exporter-node/docker/docker-compose.yaml @@ -10,7 +10,7 @@ services: ports: - "9464:9464" - "4317:4317" - - "55681:55681" + - "4318:4318" depends_on: - zipkin-all-in-one diff --git a/examples/collector-exporter-node/metrics.js b/examples/collector-exporter-node/metrics.js index abcff409c1..73d75b6167 100644 --- a/examples/collector-exporter-node/metrics.js +++ b/examples/collector-exporter-node/metrics.js @@ -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({ diff --git a/packages/opentelemetry-exporter-collector-proto/README.md b/packages/opentelemetry-exporter-collector-proto/README.md index cd22a8769b..9d1e90629f 100644 --- a/packages/opentelemetry-exporter-collector-proto/README.md +++ b/packages/opentelemetry-exporter-collector-proto/README.md @@ -25,7 +25,7 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/tra const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto'); const collectorOptions = { - url: '', // url is optional and can be omitted - default is http://localhost:55681/v1/traces + 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 @@ -45,7 +45,7 @@ provider.register(); const { MeterProvider } = require('@opentelemetry/metrics'); const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto'); const collectorOptions = { - url: '', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics + url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics }; const exporter = new CollectorMetricExporter(collectorOptions); diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts index 76294f1d70..b6574d1a26 100644 --- a/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts +++ b/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts index 2715f88474..bea2fee589 100644 --- a/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts +++ b/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector/README.md b/packages/opentelemetry-exporter-collector/README.md index 93902d9326..ad07613147 100644 --- a/packages/opentelemetry-exporter-collector/README.md +++ b/packages/opentelemetry-exporter-collector/README.md @@ -28,7 +28,7 @@ import { WebTracerProvider } from '@opentelemetry/web'; import { CollectorTraceExporter } from '@opentelemetry/exporter-collector'; const collectorOptions = { - url: '', // url is optional and can be omitted - default is http://localhost:55681/v1/trace + 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 }; @@ -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: '', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics + 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 }; @@ -83,7 +83,7 @@ const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/trac const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector'); const collectorOptions = { - url: '', // url is optional and can be omitted - default is http://localhost:55681/v1/trace + 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 @@ -109,7 +109,7 @@ provider.register(); const { MeterProvider } = require('@opentelemetry/metrics'); const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector'); const collectorOptions = { - url: '', // url is optional and can be omitted - default is http://localhost:55681/v1/metrics + 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); diff --git a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorMetricExporter.ts index 8d281e8c32..9406057bd5 100644 --- a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorMetricExporter.ts +++ b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorMetricExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts index 305875a088..7cae2754a3 100644 --- a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts +++ b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorTraceExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorMetricExporter.ts index dcffc1ac95..71aa4e40c3 100644 --- a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorMetricExporter.ts +++ b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorMetricExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts index 7354491208..afac64b16a 100644 --- a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts +++ b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorTraceExporter.ts @@ -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 diff --git a/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts index f0b8e6a1d2..480c07a658 100644 --- a/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts @@ -293,7 +293,7 @@ describe('CollectorTraceExporter - browser (getDefaultUrl)', () => { setTimeout(() => { assert.strictEqual( collectorExporter['url'], - 'http://localhost:55681/v1/traces' + 'http://localhost:4318/v1/traces' ); done(); }); diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts index 750b196a2c..9301b29048 100644 --- a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts @@ -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(); }); diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts index f8215d6494..fcb694cfe5 100644 --- a/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts @@ -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(); });