Merge branch 'master' into simplify-traceparent-parsing

.github/workflows/canary.yaml

@@ -2,8 +2,7 @@ name: Deploy Canary Release
 
 on:
   push:
-    branches:
-      - master
+    branches: [master, main]
 
 jobs:
   build-and-test:

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: Lint
 
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 
 jobs:

.github/workflows/unit-test.yml

@@ -1,7 +1,7 @@
 name: Unit Tests
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 
 jobs:

.github/workflows/w3c-integration-test.yml

@@ -2,7 +2,7 @@ name: Run w3c tests on push
 
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 
 jobs:

CHANGELOG.md

@@ -4,6 +4,85 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.15.0
+
+### :boom: Breaking Change
+
+* `opentelemetry-api-metrics`, `opentelemetry-api`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-prometheus`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-sdk-node`
+  * [#1797](https://github.com/open-telemetry/opentelemetry-js/pull/1797) chore!: split metrics into its own api package ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-api`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-context-zone`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-node`, `opentelemetry-plugin-fetch`, `opentelemetry-plugin-grpc-js`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-tracing`, `opentelemetry-web`
+  * [#1764](https://github.com/open-telemetry/opentelemetry-js/pull/1764) chore: remove tracer apis not part of spec ([@Flarna](https://github.com/Flarna))
+* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`
+  * [#1725](https://github.com/open-telemetry/opentelemetry-js/pull/1725) Use new gRPC default port ([@jufab](https://github.com/jufab))
+* `opentelemetry-api`, `opentelemetry-core`, `opentelemetry-instrumentation-http`, `opentelemetry-node`, `opentelemetry-plugin-fetch`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-propagator-b3`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`
+  * [#1749](https://github.com/open-telemetry/opentelemetry-js/pull/1749) chore: improve naming of span related context APIs ([@Flarna](https://github.com/Flarna))
+
+### :rocket: (Enhancement)
+
+* `opentelemetry-instrumentation-http`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`
+  * [#1838](https://github.com/open-telemetry/opentelemetry-js/pull/1838) improv(instrumentation-http): supressInstrumentation when we get a request on ignoredPath [#1831] ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-web`
+  * [#1769](https://github.com/open-telemetry/opentelemetry-js/pull/1769) Allow zero/negative performance timings ([@johnbley](https://github.com/johnbley))
+* `opentelemetry-instrumentation-fetch`
+  * [#1662](https://github.com/open-telemetry/opentelemetry-js/pull/1662) fix(plugin-fetch): check if PerformanceObserver exists ([@mhennoch](https://github.com/mhennoch))
+  * [#1796](https://github.com/open-telemetry/opentelemetry-js/pull/1796) Convert fetch plugin to instrumentation ([@obecny](https://github.com/obecny))
+* `opentelemetry-exporter-zipkin`
+  * [#1789](https://github.com/open-telemetry/opentelemetry-js/pull/1789) feat(exporter-zipkin): per-span service name ([@sfishel-splunk](https://github.com/sfishel-splunk))
+* `opentelemetry-api-metrics`, `opentelemetry-api`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-prometheus`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-sdk-node`
+  * [#1797](https://github.com/open-telemetry/opentelemetry-js/pull/1797) chore!: split metrics into its own api package ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-exporter-collector`
+  * [#1822](https://github.com/open-telemetry/opentelemetry-js/pull/1822) chore: remove unused dependency ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-api`
+  * [#1815](https://github.com/open-telemetry/opentelemetry-js/pull/1815) chore: change SpanOptions startTime to TimeInput ([@dyladan](https://github.com/dyladan))
+  * [#1813](https://github.com/open-telemetry/opentelemetry-js/pull/1813) fix(api): add public 'fields' function to api.propagator ([@blumamir](https://github.com/blumamir))
+* `opentelemetry-instrumentation`
+  * [#1803](https://github.com/open-telemetry/opentelemetry-js/pull/1803) chore: adding async function for safe execute in instrumentation ([@obecny](https://github.com/obecny))
+  * [#1731](https://github.com/open-telemetry/opentelemetry-js/pull/1731) feat: creating one auto loader for instrumentation and old plugins ([@obecny](https://github.com/obecny))
+* `opentelemetry-instrumentation`, `opentelemetry-node`
+  * [#1807](https://github.com/open-telemetry/opentelemetry-js/pull/1807) perf(opentelemetry-node): plugin loader search required cache ([@blumamir](https://github.com/blumamir))
+* Other
+  * [#1785](https://github.com/open-telemetry/opentelemetry-js/pull/1785) Add CodeQL security scans ([@amanbrar1999](https://github.com/amanbrar1999))
+* `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation`
+  * [#1744](https://github.com/open-telemetry/opentelemetry-js/pull/1744) feat(grpc-instrumentation): migrate grpc to instrumentation #1656 ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-core`, `opentelemetry-tracing`
+  * [#1755](https://github.com/open-telemetry/opentelemetry-js/pull/1755) feat: batch span processor environment config ([@mwear](https://github.com/mwear))
+* `opentelemetry-instrumentation-http`
+  * [#1771](https://github.com/open-telemetry/opentelemetry-js/pull/1771) feat(http-instrumentation): add content size attributes to spans ([@vmarchaud](https://github.com/vmarchaud))
+* `opentelemetry-core`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-http`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
+  * [#1746](https://github.com/open-telemetry/opentelemetry-js/pull/1746) chore: remove NoopLogger from sdk and use from api ([@lonewolf3739](https://github.com/lonewolf3739))
+
+### :bug: (Bug Fix)
+
+* `opentelemetry-core`
+  * [#1784](https://github.com/open-telemetry/opentelemetry-js/pull/1784) fix(opentelemetry-core): fixed timeInputToHrTime when time is Date type ([@zoomchan-cxj](https://github.com/zoomchan-cxj))
+* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`
+  * [#1725](https://github.com/open-telemetry/opentelemetry-js/pull/1725) Use new gRPC default port ([@jufab](https://github.com/jufab))
+
+### :books: (Refine Doc)
+
+* `opentelemetry-exporter-collector`
+  * [#1791](https://github.com/open-telemetry/opentelemetry-js/pull/1791) docs: fix readme MetricProvider -> MeterProvider ([@aabmass](https://github.com/aabmass))
+
+### Committers: 17
+
+* Aaron Abbott ([@aabmass](https://github.com/aabmass))
+* Aman Brar ([@amanbrar1999](https://github.com/amanbrar1999))
+* Amir Blum ([@blumamir](https://github.com/blumamir))
+* Bartlomiej Obecny ([@obecny](https://github.com/obecny))
+* Daniel Dyla ([@dyladan](https://github.com/dyladan))
+* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
+* Jakub Malinowski ([@jtmalinowski](https://github.com/jtmalinowski))
+* John Bley ([@johnbley](https://github.com/johnbley))
+* Julien Fabre ([@jufab](https://github.com/jufab))
+* MartenH ([@mhennoch](https://github.com/mhennoch))
+* Matthew Wear ([@mwear](https://github.com/mwear))
+* Naseem ([@naseemkullah](https://github.com/naseemkullah))
+* Paul Draper ([@pauldraper](https://github.com/pauldraper))
+* Simon Fishel ([@sfishel-splunk](https://github.com/sfishel-splunk))
+* Srikanth Chekuri ([@lonewolf3739](https://github.com/lonewolf3739))
+* Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+* Zoom Chan ([@zoomchan-cxj](https://github.com/zoomchan-cxj))
+
 ## 0.14.0
 
 ### :boom: Breaking Change

CONTRIBUTING.md

@@ -143,22 +143,22 @@ This project uses a combination of `gts` and `eslint`. Just like tests and compi
 
 ```sh
 # Lint all modules
-npm lint
+npm run lint
 
 # Lint a single module
 cd packages/opentelemetry-module-name
-npm lint
+npm run lint
 ```
 
 There is also a script which will automatically fix many linting errors.
 
 ```sh
 # Lint all modules, fixing errors
-npm lint:fix
+npm run lint:fix
 
 # Lint a single module, fixing errors
 cd packages/opentelemetry-module-name
-npm lint:fix
+npm run lint:fix
 ```
 
 ### Adding a package
@@ -202,6 +202,7 @@ If all of the above requirements are met and there are no unresolved discussions
 
 ### Generating CHANGELOG documentation
 
+- Generate and export your [Github access token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token): `export GITHUB_AUTH=<your_token>`
 - `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
 
 ### Benchmarks

README.md

@@ -243,6 +243,20 @@ To request automatic tracing support for a module not on this list, please [file
 - `Tracer.withSpan(span)`: use `api.context.with(api.setSpan(api.context.active(), span))`
 - `Tracer.bind(target)`: use `api.context.bind(target)`
 
+[PR-1797](https://github.com/open-telemetry/opentelemetry-js/pull/1797) chore!: split metrics into its own api package:
+
+- Any references to `require("@opentelemetry/api").metrics` will need to be changed to `require("@opentelemetry/api-metrics").metrics`
+
+[PR-1725](https://github.com/open-telemetry/opentelemetry-js/pull/1725) Use new gRPC default port
+
+- The default port used by `@opentelemetry/exporter-collector-grpc` is changed from `55680` to `4317`
+
+[PR-1749](https://github.com/open-telemetry/opentelemetry-js/pull/1749) chore: improve naming of span related context APIs
+
+- Rename `[gs]etActiveSpan()` to `[gs]etSpan()`
+- Rename `setExtractedSpanContext()` to `setSpanContext()`
+- Rename `getParentSpanContext()` to `getSpanContext()`
+
 ## Useful links
 
 - For more information on OpenTelemetry, visit: <https://opentelemetry.io/>

backwards-compatability/node10/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node10",
-  "version": "0.14.0",
+  "version": "0.15.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.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/sdk-node": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "devDependencies": {
     "@types/node": "10.17.50",

backwards-compatability/node12/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node12",
-  "version": "0.14.0",
+  "version": "0.15.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.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/sdk-node": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "devDependencies": {
     "@types/node": "12.19.13",

backwards-compatability/node8/package.json

@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node8",
-  "version": "0.14.0",
+  "version": "0.15.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.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/sdk-node": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

examples/basic-tracer-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-basic-tracer-node",
   "private": true,
-  "version": "0.14.0",
+  "version": "0.15.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.14.0",
-    "@opentelemetry/exporter-jaeger": "^0.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/api": "^0.15.0",
+    "@opentelemetry/exporter-jaeger": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/collector-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-collector-exporter-node",
   "private": true,
-  "version": "0.14.0",
+  "version": "0.15.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.14.0",
-    "@opentelemetry/core": "^0.14.0",
-    "@opentelemetry/exporter-collector": "^0.14.0",
-    "@opentelemetry/exporter-collector-grpc": "^0.14.0",
-    "@opentelemetry/exporter-collector-proto": "^0.14.0",
-    "@opentelemetry/metrics": "^0.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/api": "^0.15.0",
+    "@opentelemetry/core": "^0.15.0",
+    "@opentelemetry/exporter-collector": "^0.15.0",
+    "@opentelemetry/exporter-collector-grpc": "^0.15.0",
+    "@opentelemetry/exporter-collector-proto": "^0.15.0",
+    "@opentelemetry/metrics": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

examples/grpc-js/package.json

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

examples/grpc/package.json

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

examples/http/package.json

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

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -29,12 +29,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.14.0",
-    "@opentelemetry/exporter-jaeger": "^0.14.0",
-    "@opentelemetry/exporter-zipkin": "^0.14.0",
-    "@opentelemetry/node": "^0.14.0",
-    "@opentelemetry/plugin-https": "^0.14.0",
-    "@opentelemetry/tracing": "^0.14.0"
+    "@opentelemetry/api": "^0.15.0",
+    "@opentelemetry/exporter-jaeger": "^0.15.0",
+    "@opentelemetry/exporter-zipkin": "^0.15.0",
+    "@opentelemetry/node": "^0.15.0",
+    "@opentelemetry/plugin-https": "^0.15.0",
+    "@opentelemetry/tracing": "^0.15.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {