From 5900cbb6e696e3ce6a3266ca7abd0fdcba87cf0a Mon Sep 17 00:00:00 2001 From: secustor Date: Thu, 21 Oct 2021 17:16:25 +0200 Subject: [PATCH 1/3] feat(otlp-exporter-http): change otlp-http port to canonical 4318 Signed-off-by: secustor --- examples/basic-tracer-node/docker/ot/docker-compose.yaml | 2 +- examples/otlp-exporter-node/docker/docker-compose.yaml | 2 +- examples/otlp-exporter-node/metrics.js | 2 +- .../packages/opentelemetry-exporter-otlp-http/README.md | 8 ++++---- .../src/platform/browser/OTLPMetricExporter.ts | 2 +- .../src/platform/browser/OTLPTraceExporter.ts | 2 +- .../src/platform/node/OTLPMetricExporter.ts | 2 +- .../src/platform/node/OTLPTraceExporter.ts | 2 +- .../test/browser/CollectorTraceExporter.test.ts | 2 +- .../test/node/CollectorMetricExporter.test.ts | 2 +- .../test/node/CollectorTraceExporter.test.ts | 2 +- .../packages/opentelemetry-exporter-otlp-proto/README.md | 4 ++-- .../src/OTLPMetricExporter.ts | 2 +- .../src/OTLPTraceExporter.ts | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) 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/otlp-exporter-node/docker/docker-compose.yaml b/examples/otlp-exporter-node/docker/docker-compose.yaml index 1324c33f00..9a1de62fe8 100644 --- a/examples/otlp-exporter-node/docker/docker-compose.yaml +++ b/examples/otlp-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/otlp-exporter-node/metrics.js b/examples/otlp-exporter-node/metrics.js index 3a2294f43f..b749fab87b 100644 --- a/examples/otlp-exporter-node/metrics.js +++ b/examples/otlp-exporter-node/metrics.js @@ -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/experimental/packages/opentelemetry-exporter-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-otlp-http/README.md index 7aff40f464..7c386e86a8 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/README.md +++ b/experimental/packages/opentelemetry-exporter-otlp-http/README.md @@ -28,7 +28,7 @@ import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { OTLPTraceExporter } from '@opentelemetry/exporter-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 }; @@ -58,7 +58,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-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 }; @@ -83,7 +83,7 @@ const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/sdk- const { OTLPTraceExporter } = require('@opentelemetry/exporter-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 @@ -109,7 +109,7 @@ provider.register(); const { MeterProvider } = require('@opentelemetry/sdk-metrics-base'); const { OTLPMetricExporter } = require('@opentelemetry/exporter-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-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts index 7d3840f4c3..4a23ecdd4f 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts @@ -23,7 +23,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; import { appendResourcePathToUrlIfNotPresent } from '../../util'; 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-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts index e68c571239..91ee101423 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts +++ b/experimental/packages/opentelemetry-exporter-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/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts index 5d3b645591..9d37c8a934 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts @@ -23,7 +23,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; import { appendResourcePathToUrlIfNotPresent } from '../../util'; 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-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts index 737980362a..82bdff3aef 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/opentelemetry-exporter-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/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts index 33cc33fff8..814fa5a434 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-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/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts index 11308aeef2..9c01e12ade 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts @@ -300,7 +300,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-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts index 8988572b67..42f078721e 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-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/experimental/packages/opentelemetry-exporter-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-otlp-proto/README.md index 55b14756ab..d20e32059a 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-proto/README.md +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/README.md @@ -25,7 +25,7 @@ const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk const { OTLPTraceExporter } = require('@opentelemetry/exporter-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 @@ -45,7 +45,7 @@ provider.register(); const { MeterProvider } = require('@opentelemetry/sdk-metrics-base'); const { OTLPMetricExporter } = require('@opentelemetry/exporter-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-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts index bd1bc75c17..bbf41347e0 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts @@ -26,7 +26,7 @@ import { OTLPExporterNodeBase } from './OTLPExporterNodeBase'; 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/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts index 1e2f8d7af4..e8b2caedcd 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts +++ b/experimental/packages/opentelemetry-exporter-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 From c761a6c095a00fb1e515239f3ff45a6d3968bc9b Mon Sep 17 00:00:00 2001 From: secustor Date: Tue, 28 Dec 2021 00:31:09 +0100 Subject: [PATCH 2/3] docs(otlp-exporter-http): change otlp-http port to canonical 4318 --- .../opentelemetry-exporter-metrics-otlp-http/README.md | 4 ++-- .../opentelemetry-exporter-metrics-otlp-proto/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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-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); From 56bc3138932f2b66dcf02c6e0641a4e593aa6e00 Mon Sep 17 00:00:00 2001 From: secustor Date: Wed, 19 Jan 2022 19:48:33 +0100 Subject: [PATCH 3/3] chore(examples): update to newest components --- .../docker/ot/collector-config.yaml | 13 ++++++++---- .../docker/ot/docker-compose.yaml | 6 +++--- .../docker/collector-config.yaml | 10 ++++++--- .../docker/docker-compose.yaml | 6 +++--- examples/otlp-exporter-node/metrics.js | 4 ++-- examples/otlp-exporter-node/package.json | 21 +++++++++++-------- examples/otlp-exporter-node/tracing.js | 2 +- 7 files changed, 37 insertions(+), 25 deletions(-) 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 aac99f4b71..41cc695469 100644 --- a/examples/basic-tracer-node/docker/ot/docker-compose.yaml +++ b/examples/basic-tracer-node/docker/ot/docker-compose.yaml @@ -3,8 +3,8 @@ 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: @@ -16,7 +16,7 @@ services: # 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 9a1de62fe8..d0b6d62e7c 100644 --- a/examples/otlp-exporter-node/docker/docker-compose.yaml +++ b/examples/otlp-exporter-node/docker/docker-compose.yaml @@ -2,9 +2,9 @@ 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: diff --git a/examples/otlp-exporter-node/metrics.js b/examples/otlp-exporter-node/metrics.js index baa2e3f460..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:4318/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');