Merge branch 'main' into add-quickstart-example

open-telemetry · Jul 26, 2021 · b5c1e09 · b5c1e09
2 parents ac2380a + 3bc3452
commit b5c1e09
Show file tree

Hide file tree

Showing 99 changed files with 574 additions and 313 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,4 +12,4 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @dyladan @mayurkale22 @OlivierAlbertini @vmarchaud @markwolff @obecny @mwear @naseemkullah @legendecas @Flarna @johnbley @MSNev
+* @dyladan @mayurkale22 @OlivierAlbertini @vmarchaud @markwolff @obecny @mwear @naseemkullah @legendecas @Flarna @johnbley @MSNev @Rauno56
diff --git a/README.md b/README.md
@@ -184,6 +184,7 @@ Approvers ([@open-telemetry/js-approvers](https://github.com/orgs/open-telemetry
 - [Naseem K. Ullah](https://github.com/naseemkullah), Transit
 - [Neville Wylie](https://github.com/MSNev), Microsoft
 - [Olivier Albertini](https://github.com/OlivierAlbertini), Ville de Montréal
+- [Rauno Viskus](https://github.com/Rauno56), Splunk
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
@@ -281,6 +282,10 @@ To request automatic tracing support for a module not on this list, please [file
 
 ## Upgrade guidelines
 
+### 0.23.x to x
+
+- `ResourceAttributes` renamed to `SemanticResourceAttributes` in the `@opentelemetry/semantic-conventions` package
+
 ### 0.20.x to x
 
 ### 0.19.x to 0.20.0

diff --git a/eslint.config.js b/eslint.config.js
@@ -10,6 +10,7 @@ module.exports = {
     "project": "./tsconfig.json"
   },
   rules: {
+    "quotes": [2, "single", { "avoidEscape": true }],
     "@typescript-eslint/no-floating-promises": 2,
     "@typescript-eslint/no-this-alias": "off",
     "brace-style": ["error", "1tbs"],

diff --git a/examples/basic-tracer-node/index.js b/examples/basic-tracer-node/index.js
@@ -2,13 +2,13 @@
 
 const opentelemetry = require('@opentelemetry/api');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 
 const provider = new BasicTracerProvider({
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: 'basic-service',
+    [SemanticResourceAttributes.SERVICE_NAME]: 'basic-service',
   }),
 });
 

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/tracing": "0.23.0"
   },

diff --git a/examples/collector-exporter-node/README.md b/examples/collector-exporter-node/README.md
@@ -24,14 +24,14 @@ npm install
 
     ```shell script
     # from this directory
-    npm start:tracing
+    npm run start:tracing
     ```
 
 3. Run metrics app
 
     ```shell script
     # from this directory
-    npm start:metrics
+    npm run start:metrics
     ```
 
 4. Open page at <http://localhost:9411/zipkin/> -  you should be able to see the spans in zipkin

diff --git a/examples/collector-exporter-node/metrics.js b/examples/collector-exporter-node/metrics.js
@@ -6,7 +6,7 @@ const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector')
 // const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
 const { MeterProvider } = require('@opentelemetry/metrics');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 
 // Optional and only needed to see the internal diagnostic logging (during development)
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
@@ -19,7 +19,7 @@ const meter = new MeterProvider({
   exporter: metricExporter,
   interval: 1000,
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
+    [SemanticResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
   }),
 }).getMeter('example-exporter-collector');
 

diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/core": "0.23.0",
     "@opentelemetry/exporter-collector": "0.23.0",
     "@opentelemetry/exporter-collector-grpc": "0.23.0",

diff --git a/examples/collector-exporter-node/tracing.js b/examples/collector-exporter-node/tracing.js
@@ -4,7 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 // const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
 // const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');
 
@@ -21,7 +21,7 @@ const exporter = new CollectorTraceExporter({
 
 const provider = new BasicTracerProvider({
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: 'basic-service',
+    [SemanticResourceAttributes.SERVICE_NAME]: 'basic-service',
   }),
 });
 provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/exporter-zipkin": "0.23.0",
     "@opentelemetry/instrumentation": "0.23.0",

diff --git a/examples/grpc-js/tracer.js b/examples/grpc-js/tracer.js
@@ -4,7 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -15,7 +15,7 @@ const EXPORTER = process.env.EXPORTER || '';
 module.exports = (serviceName) => {
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [ResourceAttributes.SERVICE_NAME]: serviceName,
+      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
     }),
   });
 

diff --git a/examples/grpc/package.json b/examples/grpc/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/exporter-zipkin": "0.23.0",
     "@opentelemetry/instrumentation": "0.23.0",

diff --git a/examples/grpc/tracer.js b/examples/grpc/tracer.js
@@ -4,7 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -15,7 +15,7 @@ const EXPORTER = process.env.EXPORTER || '';
 module.exports = (serviceName) => {
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [ResourceAttributes.SERVICE_NAME]: serviceName,
+      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
     }),
   });
 

diff --git a/examples/http/package.json b/examples/http/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/exporter-zipkin": "0.23.0",
     "@opentelemetry/instrumentation": "0.23.0",

diff --git a/examples/http/tracer.js b/examples/http/tracer.js
@@ -4,7 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -15,7 +15,7 @@ const EXPORTER = process.env.EXPORTER || '';
 module.exports = (serviceName) => {
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [ResourceAttributes.SERVICE_NAME]: serviceName,
+      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
     }),
   });
 

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -29,7 +29,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/exporter-zipkin": "0.23.0",
     "@opentelemetry/instrumentation": "0.23.0",

diff --git a/examples/https/tracer.js b/examples/https/tracer.js
@@ -4,7 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -17,7 +17,7 @@ module.exports = (serviceName) => {
   let exporter;
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [ResourceAttributes.SERVICE_NAME]: serviceName,
+      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
     }),
   });
 

diff --git a/examples/metrics/package.json b/examples/metrics/package.json
@@ -26,6 +26,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/core": "0.23.0",
     "@opentelemetry/exporter-prometheus": "0.23.0",
     "@opentelemetry/metrics": "0.23.0"

diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -29,6 +29,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-jaeger": "0.23.0",
     "@opentelemetry/exporter-zipkin": "0.23.0",
     "@opentelemetry/instrumentation": "0.23.0",

diff --git a/examples/opentracing-shim/shim.js b/examples/opentracing-shim/shim.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { Resource } = require('@opentelemetry/resources');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
@@ -10,7 +10,7 @@ const { TracerShim } = require('@opentelemetry/shim-opentracing');
 
 function shim(serviceName) {
   const provider = new NodeTracerProvider({
-    resource: new Resource({ [ResourceAttributes.SERVICE_NAME]: serviceName }),
+    resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: serviceName }),
   });
 
   provider.addSpanProcessor(new SimpleSpanProcessor(getExporter(serviceName)));

diff --git a/examples/prometheus/package.json b/examples/prometheus/package.json
@@ -9,6 +9,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "dependencies": {
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/exporter-prometheus": "0.23.0",
     "@opentelemetry/metrics": "0.23.0"
   }

diff --git a/examples/tracer-web/examples/metrics/index.js b/examples/tracer-web/examples/metrics/index.js
@@ -4,7 +4,7 @@ const { DiagConsoleLogger, DiagLogLevel, diag } = require('@opentelemetry/api');
 const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');
 const { MeterProvider } = require('@opentelemetry/metrics');
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 
 // Optional and only needed to see the internal diagnostic logging (during development)
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
@@ -26,7 +26,7 @@ function startMetrics() {
     exporter: metricExporter,
     interval: 1000,
     resource: new Resource({
-      [ResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
+      [SemanticResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
     }),
   }).getMeter('example-exporter-collector');
 

diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json
@@ -34,7 +34,7 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/context-zone": "0.23.0",
     "@opentelemetry/core": "0.23.0",
     "@opentelemetry/exporter-collector": "0.23.0",

diff --git a/getting-started/README.md b/getting-started/README.md
@@ -126,7 +126,7 @@ After you install these dependencies, initialize and register them. Modify `trac
 const { diag, DiagConsoleLogger, DiagLogLevel } = require("@opentelemetry/api");
 const { NodeTracerProvider } = require("@opentelemetry/node");
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { SimpleSpanProcessor } = require("@opentelemetry/tracing");
 const { ZipkinExporter } = require("@opentelemetry/exporter-zipkin");
 const { registerInstrumentations } = require("@opentelemetry/instrumentation");
@@ -135,7 +135,7 @@ const { GrpcInstrumentation } = require("@opentelemetry/instrumentation-grpc");
 
 const provider = new NodeTracerProvider({
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: "getting-started",
+    [SemanticResourceAttributes.SERVICE_NAME]: "getting-started",
   })
 });
 

diff --git a/getting-started/traced-example/tracing.js b/getting-started/traced-example/tracing.js
@@ -3,15 +3,15 @@
 const { NodeTracerProvider } = require("@opentelemetry/node");
 const { SimpleSpanProcessor } = require("@opentelemetry/tracing");
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { ZipkinExporter } = require("@opentelemetry/exporter-zipkin");
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
 const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 
 const provider = new NodeTracerProvider({
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: "getting-started",
+    [SemanticResourceAttributes.SERVICE_NAME]: "getting-started",
   })
 });
 

diff --git a/getting-started/ts-example/README.md b/getting-started/ts-example/README.md
@@ -131,11 +131,12 @@ import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 
 const provider: NodeTracerProvider = new NodeTracerProvider({
   logLevel: LogLevel.ERROR,
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: 'getting-started',
+    [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started',
   }),
 });
 

diff --git a/getting-started/ts-example/traced-example/tracing.ts b/getting-started/ts-example/traced-example/tracing.ts
@@ -1,6 +1,6 @@
 import { NodeTracerProvider } from '@opentelemetry/node';
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 
 import { SimpleSpanProcessor } from '@opentelemetry/tracing';
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
@@ -13,7 +13,7 @@ const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 
 const provider: NodeTracerProvider = new NodeTracerProvider({
   resource: new Resource({
-    [ResourceAttributes.SERVICE_NAME]: 'getting-started',
+    [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started',
   }),
 });
 provider.addSpanProcessor(

diff --git a/package.json b/package.json
@@ -47,11 +47,11 @@
   "devDependencies": {
     "@commitlint/cli": "12.1.4",
     "@commitlint/config-conventional": "12.1.4",
-    "@typescript-eslint/eslint-plugin": "4.28.3",
-    "@typescript-eslint/parser": "4.28.3",
+    "@typescript-eslint/eslint-plugin": "4.28.4",
+    "@typescript-eslint/parser": "4.28.4",
     "beautify-benchmark": "0.2.4",
     "benchmark": "2.1.4",
-    "eslint": "7.30.0",
+    "eslint": "7.31.0",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.23.4",
@@ -60,8 +60,8 @@
     "husky": "4.3.8",
     "lerna": "3.22.1",
     "lerna-changelog": "1.0.1",
-    "markdownlint-cli": "0.27.1",
-    "typedoc": "0.21.2",
+    "markdownlint-cli": "0.28.1",
+    "typedoc": "0.21.4",
     "typescript": "4.3.5",
     "update-ts-references": "2.4.0"
   },

diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json
@@ -60,7 +60,7 @@
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.5",
     "@types/webpack-env": "1.16.2",
-    "codecov": "3.8.2",
+    "codecov": "3.8.3",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma": "5.2.3",
     "karma-chrome-launcher": "3.1.0",