diff --git a/examples/basic-tracer-node/docker/ot/collector-config.yaml b/examples/basic-tracer-node/docker/ot/collector-config.yaml index b550ca4fa6..510af56b45 100644 --- a/examples/basic-tracer-node/docker/ot/collector-config.yaml +++ b/examples/basic-tracer-node/docker/ot/collector-config.yaml @@ -3,19 +3,24 @@ receivers: protocols: grpc: http: - cors_allowed_origins: - - http://* - - https://* + cors: + allowed_origins: + - http://* + - https://* exporters: jaeger: endpoint: jaeger-all-in-one:14250 - insecure: true + tls: + insecure: true processors: batch: service: + telemetry: + logs: + level: "debug" pipelines: traces: receivers: [otlp] diff --git a/examples/basic-tracer-node/docker/ot/docker-compose.yaml b/examples/basic-tracer-node/docker/ot/docker-compose.yaml index a2068c155b..41cc695469 100644 --- a/examples/basic-tracer-node/docker/ot/docker-compose.yaml +++ b/examples/basic-tracer-node/docker/ot/docker-compose.yaml @@ -3,20 +3,20 @@ services: # Collector otel-collector: - image: otel/opentelemetry-collector:0.27.0 - command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"] + image: otel/opentelemetry-collector-contrib:0.42.0 + command: ["--config=/conf/collector-config.yaml"] volumes: - ./collector-config.yaml:/conf/collector-config.yaml ports: - "9464:9464" - "4317:4317" - - "55681:55681" + - "4318:4318" depends_on: - jaeger-all-in-one # Jaeger jaeger-all-in-one: - image: jaegertracing/all-in-one:1.22.0 + image: jaegertracing/all-in-one:1.30.0 ports: - "16686:16686" - "14268:14268" diff --git a/examples/otlp-exporter-node/docker/collector-config.yaml b/examples/otlp-exporter-node/docker/collector-config.yaml index 04d65a6ba2..61025e4382 100644 --- a/examples/otlp-exporter-node/docker/collector-config.yaml +++ b/examples/otlp-exporter-node/docker/collector-config.yaml @@ -3,9 +3,10 @@ receivers: protocols: grpc: http: - cors_allowed_origins: - - http://* - - https://* + cors: + allowed_origins: + - http://* + - https://* exporters: zipkin: @@ -17,6 +18,9 @@ processors: batch: service: + telemetry: + logs: + level: "debug" pipelines: traces: receivers: [otlp] diff --git a/examples/otlp-exporter-node/docker/docker-compose.yaml b/examples/otlp-exporter-node/docker/docker-compose.yaml index 1324c33f00..d0b6d62e7c 100644 --- a/examples/otlp-exporter-node/docker/docker-compose.yaml +++ b/examples/otlp-exporter-node/docker/docker-compose.yaml @@ -2,15 +2,15 @@ version: "3" services: # Collector collector: - image: otel/opentelemetry-collector:0.25.0 -# image: otel/opentelemetry-collector:latest - command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"] + image: otel/opentelemetry-collector-contrib:0.42.0 +# image: otel/opentelemetry-collector-contrib:latest + command: ["--config=/conf/collector-config.yaml"] volumes: - ./collector-config.yaml:/conf/collector-config.yaml ports: - "9464:9464" - "4317:4317" - - "55681:55681" + - "4318:4318" depends_on: - zipkin-all-in-one diff --git a/examples/otlp-exporter-node/metrics.js b/examples/otlp-exporter-node/metrics.js index cb90169405..114fd0028a 100644 --- a/examples/otlp-exporter-node/metrics.js +++ b/examples/otlp-exporter-node/metrics.js @@ -1,7 +1,7 @@ 'use strict'; const { DiagConsoleLogger, DiagLogLevel, diag } = require('@opentelemetry/api'); -const { OTLPMetricExporter } = require('@opentelemetry/exporter-otlp-http'); +const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-http'); // const { OTLPMetricExporter } = require('@opentelemetry/exporter-otlp-grpc'); // const { OTLPMetricExporter } = require('@opentelemetry/exporter-otlp-proto'); const { MeterProvider } = require('@opentelemetry/sdk-metrics-base'); @@ -12,7 +12,7 @@ const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventi diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG); const metricExporter = new OTLPMetricExporter({ - // url: 'http://localhost:55681/v1/metrics', + url: 'http://localhost:4318/v1/metrics', }); const meter = new MeterProvider({ diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index 8fb2a32a82..4a3c3aacf4 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.25.0", + "version": "0.27.0", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,14 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/exporter-otlp-http": "0.25.0", - "@opentelemetry/exporter-otlp-grpc": "0.25.0", - "@opentelemetry/exporter-otlp-proto": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/core": "1.0.1", + "@opentelemetry/exporter-trace-otlp-http": "0.27.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.27.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.27.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.27.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.27.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.27.0", + "@opentelemetry/resources": "1.0.1", + "@opentelemetry/semantic-conventions": "1.0.1", + "@opentelemetry/sdk-metrics-base": "0.27.0", + "@opentelemetry/sdk-trace-base": "1.0.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/otlp-exporter-node/tracing.js b/examples/otlp-exporter-node/tracing.js index 4f718274aa..661c419348 100644 --- a/examples/otlp-exporter-node/tracing.js +++ b/examples/otlp-exporter-node/tracing.js @@ -2,7 +2,7 @@ const opentelemetry = require('@opentelemetry/api'); const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-http'); +const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http'); const { Resource } = require('@opentelemetry/resources'); const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions'); // const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc'); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md index fc7efb7732..fc5ebe33b8 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md @@ -25,7 +25,7 @@ The OTLPMetricExporter in Web expects the endpoint to end in `/v1/metrics`. import { MeterProvider } from '@opentelemetry/sdk-metrics-base'; import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; 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 }; @@ -49,7 +49,7 @@ counter.add(10, { 'key': 'value' }); const { MeterProvider } = require('@opentelemetry/sdk-metrics-base'); const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-http'); 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 OTLPMetricExporter(collectorOptions); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts index b19eb0070b..3eb49d9665 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts @@ -20,7 +20,7 @@ import { toOTLPExportMetricServiceRequest } from '../../transformMetrics'; import { getEnv, baggageUtils } from '@opentelemetry/core'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/metrics'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * Collector Metric Exporter for Web diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts index 2e83ee6be6..ebc2cc2294 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts @@ -25,7 +25,7 @@ import { toOTLPExportMetricServiceRequest } from '../../transformMetrics'; import { getEnv, baggageUtils } from '@opentelemetry/core'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/metrics'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * Collector Metric Exporter for Node diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts index f0beecd795..8bae6eab8c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts @@ -299,7 +299,7 @@ describe('OTLPMetricExporter - node with json over http', () => { setTimeout(() => { assert.strictEqual( collectorExporter['url'], - 'http://localhost:55681/v1/metrics' + 'http://localhost:4318/v1/metrics' ); done(); }); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md index ff033a00f0..cbf16261e7 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md @@ -23,7 +23,7 @@ To see sample code and documentation for the traces exporter, visit the [Collect const { MeterProvider } = require('@opentelemetry/sdk-metrics-base'); const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-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 OTLPMetricExporter(collectorOptions); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts index 9bbbfa6c66..e7916a34e7 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts @@ -25,7 +25,7 @@ import { ServiceClientType, OTLPExporterNodeBase } from '@opentelemetry/exporter import { getEnv, baggageUtils } from '@opentelemetry/core'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/metrics'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * OTLP Metric Exporter for Node with protobuf diff --git a/packages/exporter-trace-otlp-http/README.md b/packages/exporter-trace-otlp-http/README.md index e5413d7e52..f03ca83ff5 100644 --- a/packages/exporter-trace-otlp-http/README.md +++ b/packages/exporter-trace-otlp-http/README.md @@ -27,7 +27,7 @@ import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; 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: {}, // an optional object containing custom headers to be sent with each request concurrencyLimit: 10, // an optional limit on pending requests }; @@ -56,7 +56,7 @@ const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/sdk- const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http'); 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 diff --git a/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts index e68c571239..91ee101423 100644 --- a/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts +++ b/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts @@ -23,7 +23,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; import { appendResourcePathToUrlIfNotPresent } from '../../util'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/traces'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * Collector Trace Exporter for Web diff --git a/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts index 737980362a..82bdff3aef 100644 --- a/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts @@ -23,7 +23,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; import { appendResourcePathToUrlIfNotPresent } from '../../util'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/traces'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * Collector Trace Exporter for Node diff --git a/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts b/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts index 0a709a953f..a66a7c59d0 100644 --- a/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts +++ b/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts @@ -294,7 +294,7 @@ describe('OTLPTraceExporter - browser (getDefaultUrl)', () => { setTimeout(() => { assert.strictEqual( collectorExporter['url'], - 'http://localhost:55681/v1/traces' + 'http://localhost:4318/v1/traces' ); done(); }); diff --git a/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts index 33c9559dc9..af543bae22 100644 --- a/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts +++ b/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts @@ -325,7 +325,7 @@ describe('OTLPTraceExporter - node with json over http', () => { setTimeout(() => { assert.strictEqual( collectorExporter['url'], - 'http://localhost:55681/v1/traces' + 'http://localhost:4318/v1/traces' ); done(); }); diff --git a/packages/exporter-trace-otlp-proto/README.md b/packages/exporter-trace-otlp-proto/README.md index 81268201ad..19e91f0f46 100644 --- a/packages/exporter-trace-otlp-proto/README.md +++ b/packages/exporter-trace-otlp-proto/README.md @@ -24,7 +24,7 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-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 diff --git a/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts index b17e3c0633..9b3c5a6eff 100644 --- a/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts +++ b/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts @@ -26,7 +26,7 @@ import { ServiceClientType } from './types'; import { getEnv, baggageUtils } from '@opentelemetry/core'; const DEFAULT_COLLECTOR_RESOURCE_PATH = '/v1/traces'; -const DEFAULT_COLLECTOR_URL=`http://localhost:55681${DEFAULT_COLLECTOR_RESOURCE_PATH}`; +const DEFAULT_COLLECTOR_URL=`http://localhost:4318${DEFAULT_COLLECTOR_RESOURCE_PATH}`; /** * Collector Trace Exporter for Node with protobuf