Merge branch 'main' into feat/unify-with-bind

CHANGELOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.22.0
+
+### :rocket: (Enhancement)
+
+* `opentelemetry-tracing`
+  * [#2243](https://github.com/open-telemetry/opentelemetry-js/pull/2243) feat(tracing): auto flush BatchSpanProcessor on browser ([@kkruk-sumo](https://github.com/kkruk-sumo))
+* `opentelemetry-resource-detector-aws`, `opentelemetry-semantic-conventions`
+  * [#2268](https://github.com/open-telemetry/opentelemetry-js/pull/2268) feat(semantic-conventions): upgrade semantic conventions to version 1… ([@weyert](https://github.com/weyert))
+* `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
+  * [#2276](https://github.com/open-telemetry/opentelemetry-js/pull/2276) chore(deps): update dependency @opentelemetry/api to v1 ([@renovate-bot](https://github.com/renovate-bot))
+
+### :books: (Refine Doc)
+
+* [#2287](https://github.com/open-telemetry/opentelemetry-js/pull/2287) chore(doc): update compatibility matrix ([@vmarchaud](https://github.com/vmarchaud))
+
+### Committers: 3
+
+* Krystian Kruk ([@kkruk-sumo](https://github.com/kkruk-sumo))
+* Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+* Weyert de Boer ([@weyert](https://github.com/weyert))
+
 ## 0.21.0
 
 ### :rocket: (Enhancement)

README.md

@@ -48,7 +48,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | API Version | Core version | Contrib Version         |
 | ----------- |--------------|-------------------------|
-| 0.21.x      | 0.21.x       | ------                  |
+| 1.0.x       | 0.22.x       | ------                  |
+| 0.21.x      | 0.21.x       | 0.21.x                  |
 | 0.20.x      | 0.20.x       | 0.20.x                  |
 | v1.0.0-rc.3 | 0.19.x       | 0.16.x                  |
 | 0.18.x      | 0.18.x       | 0.14.x                  |

backwards-compatability/node10/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node10",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "10.17.59",

backwards-compatability/node12/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node12",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "12.20.11",

backwards-compatability/node8/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node8",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

examples/basic-tracer-node/index.js

@@ -1,14 +1,19 @@
 'use strict';
 
 const opentelemetry = require('@opentelemetry/api');
+const { Resource } = require('@opentelemetry/resources');
+const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 
-const provider = new BasicTracerProvider();
+const provider = new BasicTracerProvider({
+  resource: new Resource({
+    [ResourceAttributes.SERVICE_NAME]: 'basic-service',
+  }),
+});
 
 // Configure span processor to send spans to the exporter
 const exporter = new JaegerExporter({
-  serviceName: 'basic-service',
   endpoint: 'http://localhost:14268/api/traces',
 });
 provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

examples/basic-tracer-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-basic-tracer-node",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/tracing in Node.js",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/collector-exporter-node/metrics.js

@@ -5,18 +5,22 @@ const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector')
 // const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-grpc');
 // const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
 const { MeterProvider } = require('@opentelemetry/metrics');
+const { Resource } = require('@opentelemetry/resources');
+const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
 
 // Optional and only needed to see the internal diagnostic logging (during development)
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
 
 const metricExporter = new CollectorMetricExporter({
-  serviceName: 'basic-metric-service',
   // url: 'http://localhost:55681/v1/metrics',
 });
 
 const meter = new MeterProvider({
   exporter: metricExporter,
   interval: 1000,
+  resource: new Resource({
+    [ResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
+  }),
 }).getMeter('example-exporter-collector');
 
 const requestCounter = meter.createCounter('requests', {

examples/collector-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-collector-exporter-node",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/core": "0.21.0",
-    "@opentelemetry/exporter-collector": "0.21.0",
-    "@opentelemetry/exporter-collector-grpc": "0.21.0",
-    "@opentelemetry/exporter-collector-proto": "0.21.0",
-    "@opentelemetry/metrics": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/core": "0.22.0",
+    "@opentelemetry/exporter-collector": "0.22.0",
+    "@opentelemetry/exporter-collector-grpc": "0.22.0",
+    "@opentelemetry/exporter-collector-proto": "0.22.0",
+    "@opentelemetry/metrics": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/collector-exporter-node/tracing.js

@@ -3,6 +3,8 @@
 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 { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
 // const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');
 
@@ -12,13 +14,16 @@ const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
 // );
 
 const exporter = new CollectorTraceExporter({
-  serviceName: 'basic-service',
   // headers: {
   //   foo: 'bar'
   // },
 });
 
-const provider = new BasicTracerProvider();
+const provider = new BasicTracerProvider({
+  resource: new Resource({
+    [ResourceAttributes.SERVICE_NAME]: 'basic-service',
+  }),
+});
 provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
 provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.register();

examples/grpc-js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "grpc-js-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of @grpc/grpc-js integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-grpc": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-grpc": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
     "google-protobuf": "^3.9.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

examples/grpc-js/tracer.js

@@ -3,6 +3,8 @@
 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 { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -11,17 +13,17 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
-  const provider = new NodeTracerProvider();
+  const provider = new NodeTracerProvider({
+    resource: new Resource({
+      [ResourceAttributes.SERVICE_NAME]: serviceName,
+    }),
+  });
 
   let exporter;
   if (EXPORTER.toLowerCase().startsWith('z')) {
-    exporter = new ZipkinExporter({
-      serviceName,
-    });
+    exporter = new ZipkinExporter();
   } else {
-    exporter = new JaegerExporter({
-      serviceName,
-    });
+    exporter = new JaegerExporter();
   }
 
   provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

examples/grpc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "grpc-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of gRPC integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-grpc": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-grpc": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
     "google-protobuf": "^3.9.2",
     "grpc": "^1.23.3",
     "node-pre-gyp": "0.14.0"

examples/grpc/tracer.js

@@ -3,6 +3,8 @@
 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 { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -11,17 +13,17 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
-  const provider = new NodeTracerProvider();
+  const provider = new NodeTracerProvider({
+    resource: new Resource({
+      [ResourceAttributes.SERVICE_NAME]: serviceName,
+    }),
+  });
 
   let exporter;
   if (EXPORTER.toLowerCase().startsWith('z')) {
-    exporter = new ZipkinExporter({
-      serviceName,
-    });
+    exporter = new ZipkinExporter();
   } else {
-    exporter = new JaegerExporter({
-      serviceName,
-    });
+    exporter = new JaegerExporter();
   }
 
   provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-http": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-http": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {