From 365d502eaa0ba1f9799998f050d36073e943032e Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Sat, 7 Aug 2021 18:58:07 +0530 Subject: [PATCH 1/2] chore: update doc identifier names in readme (#2399) --- packages/opentelemetry-resources/README.md | 6 +++--- packages/opentelemetry-semantic-conventions/README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/opentelemetry-resources/README.md b/packages/opentelemetry-resources/README.md index 29c1c897ac..53a544629c 100644 --- a/packages/opentelemetry-resources/README.md +++ b/packages/opentelemetry-resources/README.md @@ -25,11 +25,11 @@ const resource = new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'api-service', }); -const another_resource = new Resource({ - 'service.version': 2.0.0, +const anotherResource = new Resource({ + 'service.version': '2.0.0', 'service.group': 'instrumentation-group' }); -const merged_resource = resource.merge(another_resource); +const mergedResource = resource.merge(anotherResource); ``` ## Useful links diff --git a/packages/opentelemetry-semantic-conventions/README.md b/packages/opentelemetry-semantic-conventions/README.md index ad77beb69a..b31500dd92 100644 --- a/packages/opentelemetry-semantic-conventions/README.md +++ b/packages/opentelemetry-semantic-conventions/README.md @@ -16,11 +16,11 @@ npm install --save @opentelemetry/semantic-conventions ## Usage ```ts -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const span = tracer.startSpan().startSpan(spanName, spanOptions) .setAttributes({ - [GeneralAttribute.NET_PEER_HOSTNAME]: 'localhost', + [SemanticAttributes.NET_PEER_NAME]: 'localhost', }); ``` From f18087030b3efe31fbc207c74af46e29264878e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= Date: Sat, 7 Aug 2021 15:38:18 +0200 Subject: [PATCH 2/2] chore: sort entries in tsconfig (#2402) Co-authored-by: Daniel Dyla Co-authored-by: Valentin Marchaud --- .../tsconfig.json | 4 ++-- .../tsconfig.json | 4 ++-- .../tsconfig.json | 4 ++-- .../tsconfig.json | 4 ++-- .../tsconfig.json | 4 ++-- .../tsconfig.json | 6 ++--- .../tsconfig.json | 6 ++--- .../tsconfig.json | 6 ++--- .../tsconfig.json | 6 ++--- packages/opentelemetry-sdk-node/tsconfig.json | 12 +++++----- .../tsconfig.json | 4 ++-- .../opentelemetry-sdk-trace-web/tsconfig.json | 4 ++-- .../tsconfig.json | 4 ++-- tsconfig.json | 22 +++++++++---------- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json index 4714f84a60..66f3f6fc26 100644 --- a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json @@ -19,10 +19,10 @@ "path": "../opentelemetry-exporter-collector" }, { - "path": "../opentelemetry-sdk-metrics-base" + "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-sdk-metrics-base" }, { "path": "../opentelemetry-sdk-trace-base" diff --git a/packages/opentelemetry-exporter-collector-proto/tsconfig.json b/packages/opentelemetry-exporter-collector-proto/tsconfig.json index 4714f84a60..66f3f6fc26 100644 --- a/packages/opentelemetry-exporter-collector-proto/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-proto/tsconfig.json @@ -19,10 +19,10 @@ "path": "../opentelemetry-exporter-collector" }, { - "path": "../opentelemetry-sdk-metrics-base" + "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-sdk-metrics-base" }, { "path": "../opentelemetry-sdk-trace-base" diff --git a/packages/opentelemetry-exporter-collector/tsconfig.json b/packages/opentelemetry-exporter-collector/tsconfig.json index bdfd2b795d..a555c90a2c 100644 --- a/packages/opentelemetry-exporter-collector/tsconfig.json +++ b/packages/opentelemetry-exporter-collector/tsconfig.json @@ -16,10 +16,10 @@ "path": "../opentelemetry-core" }, { - "path": "../opentelemetry-sdk-metrics-base" + "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-sdk-metrics-base" }, { "path": "../opentelemetry-sdk-trace-base" diff --git a/packages/opentelemetry-exporter-jaeger/tsconfig.json b/packages/opentelemetry-exporter-jaeger/tsconfig.json index 4c53104103..8b45d214a9 100644 --- a/packages/opentelemetry-exporter-jaeger/tsconfig.json +++ b/packages/opentelemetry-exporter-jaeger/tsconfig.json @@ -16,10 +16,10 @@ "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.json b/packages/opentelemetry-exporter-zipkin/tsconfig.json index 4c53104103..8b45d214a9 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.json @@ -16,10 +16,10 @@ "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/packages/opentelemetry-instrumentation-fetch/tsconfig.json index 9777441f0b..d2862ab2f9 100644 --- a/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ b/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -22,14 +22,14 @@ { "path": "../opentelemetry-propagator-b3" }, - { - "path": "../opentelemetry-semantic-conventions" - }, { "path": "../opentelemetry-sdk-trace-base" }, { "path": "../opentelemetry-sdk-trace-web" + }, + { + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/packages/opentelemetry-instrumentation-grpc/tsconfig.json index b883522e9b..798b42087c 100644 --- a/packages/opentelemetry-instrumentation-grpc/tsconfig.json +++ b/packages/opentelemetry-instrumentation-grpc/tsconfig.json @@ -22,13 +22,13 @@ "path": "../opentelemetry-instrumentation" }, { - "path": "../opentelemetry-sdk-trace-node" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-node" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-instrumentation-http/tsconfig.json b/packages/opentelemetry-instrumentation-http/tsconfig.json index 7af2f290b8..57e43387e4 100644 --- a/packages/opentelemetry-instrumentation-http/tsconfig.json +++ b/packages/opentelemetry-instrumentation-http/tsconfig.json @@ -19,13 +19,13 @@ "path": "../opentelemetry-instrumentation" }, { - "path": "../opentelemetry-sdk-trace-node" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-node" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json index 9777441f0b..d2862ab2f9 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ b/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -22,14 +22,14 @@ { "path": "../opentelemetry-propagator-b3" }, - { - "path": "../opentelemetry-semantic-conventions" - }, { "path": "../opentelemetry-sdk-trace-base" }, { "path": "../opentelemetry-sdk-trace-web" + }, + { + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-sdk-node/tsconfig.json b/packages/opentelemetry-sdk-node/tsconfig.json index 098bf1678a..61b56129ba 100644 --- a/packages/opentelemetry-sdk-node/tsconfig.json +++ b/packages/opentelemetry-sdk-node/tsconfig.json @@ -21,12 +21,6 @@ { "path": "../opentelemetry-instrumentation" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, - { - "path": "../opentelemetry-sdk-trace-node" - }, { "path": "../opentelemetry-resource-detector-aws" }, @@ -36,8 +30,14 @@ { "path": "../opentelemetry-resources" }, + { + "path": "../opentelemetry-sdk-metrics-base" + }, { "path": "../opentelemetry-sdk-trace-base" + }, + { + "path": "../opentelemetry-sdk-trace-node" } ] } diff --git a/packages/opentelemetry-sdk-trace-node/tsconfig.json b/packages/opentelemetry-sdk-trace-node/tsconfig.json index 7260da8804..5894551b3d 100644 --- a/packages/opentelemetry-sdk-trace-node/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-node/tsconfig.json @@ -25,10 +25,10 @@ "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.json b/packages/opentelemetry-sdk-trace-web/tsconfig.json index 2ef5276d19..f317cb38d1 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.json @@ -23,10 +23,10 @@ "path": "../opentelemetry-resources" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-shim-opentracing/tsconfig.json b/packages/opentelemetry-shim-opentracing/tsconfig.json index 002d5c04e7..a256765295 100644 --- a/packages/opentelemetry-shim-opentracing/tsconfig.json +++ b/packages/opentelemetry-shim-opentracing/tsconfig.json @@ -19,10 +19,10 @@ "path": "../opentelemetry-propagator-jaeger" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-sdk-trace-base" }, { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/tsconfig.json b/tsconfig.json index 256c709469..77def32559 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -100,12 +100,6 @@ { "path": "packages/opentelemetry-instrumentation" }, - { - "path": "packages/opentelemetry-sdk-metrics-base" - }, - { - "path": "packages/opentelemetry-sdk-trace-node" - }, { "path": "packages/opentelemetry-propagator-b3" }, @@ -122,20 +116,26 @@ "path": "packages/opentelemetry-resources" }, { - "path": "packages/opentelemetry-sdk-node" + "path": "packages/opentelemetry-sdk-metrics-base" }, { - "path": "packages/opentelemetry-semantic-conventions" + "path": "packages/opentelemetry-sdk-node" }, { - "path": "packages/opentelemetry-shim-opentracing" + "path": "packages/opentelemetry-sdk-trace-base" }, { - "path": "packages/opentelemetry-sdk-trace-base" + "path": "packages/opentelemetry-sdk-trace-node" }, { "path": "packages/opentelemetry-sdk-trace-web" }, + { + "path": "packages/opentelemetry-semantic-conventions" + }, + { + "path": "packages/opentelemetry-shim-opentracing" + }, { "path": "packages/template" }, @@ -143,4 +143,4 @@ "path": "integration-tests/propagation-validation-server" } ] -} \ No newline at end of file +}