diff --git a/.github/workflows/peer-api.yaml b/.github/workflows/peer-api.yaml index 6631d8562cd..d1995d86e52 100644 --- a/.github/workflows/peer-api.yaml +++ b/.github/workflows/peer-api.yaml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - + - name: Install lerna run: npm install -g lerna diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index c03257d5d8c..5c9b3f0faae 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - container: ["node:8", "node:10", "node:12", "node:14"] + container: ["node:8", "node:10", "node:12", "node:14", "node:16"] runs-on: ubuntu-latest container: image: ${{ matrix.container }} @@ -34,11 +34,11 @@ jobs: packages/*/package-lock.json integration-tests/*/package-lock.json key: ${{ runner.os }}-unit_test-${{ matrix.container }}-${{ hashFiles('**/package.json') }} - - name: Install and Build (cache miss) 🔧 if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts + chown -R 1001:121 "/github/home/.npm" # fix npm cache permissions for npm v7 npx lerna bootstrap --no-ci npm run compile @@ -53,11 +53,11 @@ jobs: run: npm run test - name: Report Coverage run: npm run codecov - if: ${{ matrix.container }} == 'node:12' + if: ${{ matrix.container == 'node:14' }} browser-tests: runs-on: ubuntu-latest container: - image: circleci/node:12-browsers + image: circleci/node:14-browsers env: NPM_CONFIG_UNSAFE_PERM: true steps: @@ -65,7 +65,6 @@ jobs: uses: actions/checkout@v1 - name: Permission Setup run: sudo chmod -R 777 /github /__w - - name: restore lock files uses: actions/cache@master # must use unreleased master to cache multiple paths id: cache diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml index 14dea976cd5..38afe216245 100644 --- a/.github/workflows/w3c-integration-test.yml +++ b/.github/workflows/w3c-integration-test.yml @@ -39,9 +39,9 @@ jobs: run: | npm ci --ignore-scripts npx lerna bootstrap --scope=propagation-validation-server --include-dependencies - + - name: Build 🔧 - run: npm run compile + run: npm run compile working-directory: ./integration-tests/propagation-validation-server - name: Run W3C Test harness diff --git a/CHANGELOG.md b/CHANGELOG.md index a0f90fe94f1..66919b244a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,54 @@ 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) + +* `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation` + * [#2261](https://github.com/open-telemetry/opentelemetry-js/pull/2261) Adding ComponentLogger into instrumentations ([@obecny](https://github.com/obecny)) +* `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` + * [#2255](https://github.com/open-telemetry/opentelemetry-js/pull/2255) chore: update API to 0.21.0 ([@dyladan](https://github.com/dyladan)) + +### :books: (Refine Doc) + +* [#2263](https://github.com/open-telemetry/opentelemetry-js/pull/2263) docs(README): update link to @opentelemetry/api package ([@nvenegas](https://github.com/nvenegas)) +* [#2254](https://github.com/open-telemetry/opentelemetry-js/pull/2254) chore: update compatibility matrix ([@dyladan](https://github.com/dyladan)) +* [#2253](https://github.com/open-telemetry/opentelemetry-js/pull/2253) chore: add missing changelog entry ([@dyladan](https://github.com/dyladan)) + +### :house: (Internal) + +* `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-context-zone`, `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-semantic-conventions`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`, `template` + * [#2244](https://github.com/open-telemetry/opentelemetry-js/pull/2244) chore: add node:16 to the test matrix ([@Rauno56](https://github.com/Rauno56)) + +### Committers: 4 + +* Bartlomiej Obecny ([@obecny](https://github.com/obecny)) +* Daniel Dyla ([@dyladan](https://github.com/dyladan)) +* Nicolas Venegas ([@nvenegas](https://github.com/nvenegas)) +* Rauno Viskus ([@Rauno56](https://github.com/Rauno56)) + ## 0.20.0 ### :boom: Breaking Change diff --git a/README.md b/README.md index 163c51a32b5..ec804f8d298 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a | API Version | Core version | Contrib Version | | ----------- |--------------|-------------------------| +| 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 | @@ -426,7 +428,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [otel-shim-opentracing]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing [otel-tracing]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-tracing [otel-web]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-web -[otel-api]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-api +[otel-api]: https://github.com/open-telemetry/opentelemetry-js-api [otel-core]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core [generate-api-documentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md#generating-api-documentation diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json index b6e7cc1ff55..da091cba101 100644 --- a/backwards-compatability/node10/package.json +++ b/backwards-compatability/node10/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node10", - "version": "0.20.0", + "version": "0.22.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -8,8 +8,8 @@ "test:backcompat": "tsc --noEmit index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/sdk-node": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "devDependencies": { "@types/node": "10.17.59", diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json index 3ba9d93d78d..507f8bf3c3c 100644 --- a/backwards-compatability/node12/package.json +++ b/backwards-compatability/node12/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node12", - "version": "0.20.0", + "version": "0.22.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -8,8 +8,8 @@ "test:backcompat": "tsc --noEmit index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/sdk-node": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "devDependencies": { "@types/node": "12.20.11", diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json index 36d309111b2..49de73ef7e2 100644 --- a/backwards-compatability/node8/package.json +++ b/backwards-compatability/node8/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node8", - "version": "0.20.0", + "version": "0.22.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -8,8 +8,8 @@ "test:backcompat": "tsc --noEmit index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/sdk-node": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "devDependencies": { "@types/node": "8.10.66", diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json index 312e7cc987a..3ddc49a8de6 100644 --- a/examples/basic-tracer-node/package.json +++ b/examples/basic-tracer-node/package.json @@ -1,7 +1,7 @@ { "name": "example-basic-tracer-node", "private": true, - "version": "0.20.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.20.0", - "@opentelemetry/tracing": "0.20.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" } diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json index 9ee76ab0a9a..7f4a8cc1784 100644 --- a/examples/collector-exporter-node/package.json +++ b/examples/collector-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-collector-exporter-node", "private": true, - "version": "0.20.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.20.0", - "@opentelemetry/exporter-collector": "0.20.0", - "@opentelemetry/exporter-collector-grpc": "0.20.0", - "@opentelemetry/exporter-collector-proto": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/tracing": "0.20.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" } diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json index 94ff11c104f..0ceb2392f85 100644 --- a/examples/grpc-js/package.json +++ b/examples/grpc-js/package.json @@ -1,7 +1,7 @@ { "name": "grpc-js-example", "private": true, - "version": "0.20.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.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/instrumentation-grpc": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.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", diff --git a/examples/grpc/package.json b/examples/grpc/package.json index 868d56d457e..978adcbceda 100644 --- a/examples/grpc/package.json +++ b/examples/grpc/package.json @@ -1,7 +1,7 @@ { "name": "grpc-example", "private": true, - "version": "0.20.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.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/instrumentation-grpc": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.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" diff --git a/examples/http/package.json b/examples/http/package.json index 9851b525063..dd743de1d43 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.20.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.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/instrumentation-http": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.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": { diff --git a/examples/https/package.json b/examples/https/package.json index 3099fffcc74..3c1aeae0e37 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.20.0", + "version": "0.22.0", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -29,13 +29,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/exporter-jaeger": "0.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/instrumentation-http": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.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": { diff --git a/examples/https/server-cert.pem b/examples/https/server-cert.pem index e2b79024da4..4dd904f0882 100644 --- a/examples/https/server-cert.pem +++ b/examples/https/server-cert.pem @@ -1,11 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIBqzCCARQCCQDLcUeJsLDL5jANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJD -QTELMAkGA1UECAwCUUMwHhcNMTkwOTI5MjIwMDI2WhcNMTkxMDI5MjIwMDI2WjAa -MQswCQYDVQQGEwJDQTELMAkGA1UECAwCUUMwgZ8wDQYJKoZIhvcNAQEBBQADgY0A -MIGJAoGBALhfi1dwIyC1Jha4N/j/VtlPPi+j+SZQGZqLNVVgzzGY7+cc3VkCySZD -yXh3Z+/ftp9DDKdHRutJQE0R4peSDussC/IQDJKzuKN/O9S6tnNlgUr5YZLRENxL -FSJIY5cIkty50IrEhlN5QeDJP8p4yrYq9J6M0yzyfdqIWI3CBqbzAgMBAAEwDQYJ -KoZIhvcNAQEFBQADgYEArnOeXmXXJTK39Ma25elHxlYUZiYOBu/truy5zmx4umyS -GyehAv+jRIanoCRWtOBnrjS5CY/6cC64aIVLMoqXEFIL7q/GD0wEM/DS8rN7KTcp -w+nIX98srYaAFeQZScPioS6WpXz5AjbTVhvAwkIm2/s6dOlX31+1zu6Zu6ASSuQ= +MIIDozCCAougAwIBAgIUZdBdHwmbcYbMUvOesYRyYlg11JMwDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs +ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE +AwwCY2EwHhcNMjEwNjA4MDgxNTE2WhcNMzEwNjA2MDgxNTE2WjBhMQswCQYDVQQG +EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w +CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALw9Shaqp1O1zgYK8z5pnvuHK3o9cUNT ++EJz5KLADn11HSgfj5S96s6lDP9mUy8oDXdk9zSH8QsPp/maVh0AM1WrPDDTBJT5 +vdPyUezzn4wvBrJSG/mmy/p4QU1srmE0ueuhgot97GZa9qu+gOqGei3YTjrbx14H +jyvexx+QhqrpUg46qAm67pJHC5jN6LmufoIvepyvQCEbKN+n2B2tAn9on1wo7UmB +igTEiWxk1Gn70IJuyTEbpHoLFviQ5kvTYXM/2KHMOXjZM9fQxtbseNUmj8VK3+tS +5jBdIROZxKxh3r9rV7SBHrblTWB3CZ/NsJblZuzMazLWkYS1/JZud9ECAwEAAaNT +MFEwHQYDVR0OBBYEFP6+DMoQBCg7tOYrSUpWKQrbfJ5yMB8GA1UdIwQYMBaAFP6+ +DMoQBCg7tOYrSUpWKQrbfJ5yMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBAGbkwraWuKnhcE8GrLCO0qLq5GaF+WvxqVzgPvG3G6bQJuEnS6LT65nR +ICU82vCQBikW6lDfpsiwcVqOmgefUmjI99Aw5S1dkYy2J+WZrU/EgX445JLGJMpB +Bh0QajFT6gdQiuURqTmxAhNj4VrUqtrNapP8vFKerR7nTrORG0ELEcvzVYCLNvDm +OYWvLEMZifNWKY6hRdhZXho5hfu7/YPUhZUpcSxkTUsDnG3gzkTyX1TzeWe7wlJr +dtNIk50lUCR6TlSpTaVB+6uhVjaLZpZwBAT5H0dWQXm0Ww5AYsEAT9Uzh9fZYu4m +iMhztKH3PWjDB+jSzcOv9FXeYWgprWk= -----END CERTIFICATE----- diff --git a/examples/https/server-key.pem b/examples/https/server-key.pem index 405c5fa0d7f..267ed0464e2 100644 --- a/examples/https/server-key.pem +++ b/examples/https/server-key.pem @@ -1,15 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC4X4tXcCMgtSYWuDf4/1bZTz4vo/kmUBmaizVVYM8xmO/nHN1Z -AskmQ8l4d2fv37afQwynR0brSUBNEeKXkg7rLAvyEAySs7ijfzvUurZzZYFK+WGS -0RDcSxUiSGOXCJLcudCKxIZTeUHgyT/KeMq2KvSejNMs8n3aiFiNwgam8wIDAQAB -AoGBAKBztcYQduGeBFm9VCjDvgc8KTg4kTlAeCfAglec+nOFTzJoMlGmVPuR/qFx -+OgOXtXW+goRw6w7gVQQ/os9tvCCp7awSC5UCfPejHh6bW2B0BF2lZJ6B9y+u5Fa -/p8oKoJGcC4eagVnDojuoYJHSqWBf7d7V/U54NpxwgBTsHAhAkEA8PJROgWzjMl2 -Gs5j8oBldEqzrC/d4K1uMEvCTb4RJ+t6jWq+Ug/vqvCfIcLfxHbOmTbOHTfhpv/d -NUf9eDyBGwJBAMPkZaHP5vPDd900MqypLVasollzxgPnMUg35EEQJLAbb/5xG3X9 -ZbaVDTRtLQYNFvDZLlTpRpCPxZCgrn9hJwkCQQDPEVChLrkpqxFm5CydAZ8vG+vh -dJmYNzPVKaZorYmM5yBBXJUHbU6pd3UqzJEGBJx0q9bi4V156bYvzhiVNlo1AkBu -1hbvFCwPtoRmg3c8nEhL50fApzHd2XzX6M/cRF8Nyah3ZdXsz6AyS2l6RV+ZMeTO -B4QghRDpEH/vUgsJhZXJAkB5GQZPJh6/kozc5+Ffc60ThN/58SX0KEFeKnWRlzfr -vfBXwcmaz1oNXN+kcWdLnKbr/tx+3UQ6weRRmeYX/hOi ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8PUoWqqdTtc4G +CvM+aZ77hyt6PXFDU/hCc+SiwA59dR0oH4+UverOpQz/ZlMvKA13ZPc0h/ELD6f5 +mlYdADNVqzww0wSU+b3T8lHs85+MLwayUhv5psv6eEFNbK5hNLnroYKLfexmWvar +voDqhnot2E4628deB48r3scfkIaq6VIOOqgJuu6SRwuYzei5rn6CL3qcr0AhGyjf +p9gdrQJ/aJ9cKO1JgYoExIlsZNRp+9CCbskxG6R6Cxb4kOZL02FzP9ihzDl42TPX +0MbW7HjVJo/FSt/rUuYwXSETmcSsYd6/a1e0gR625U1gdwmfzbCW5WbszGsy1pGE +tfyWbnfRAgMBAAECggEAP1YT7qp+4ICkkI3wqEhbkOA7Ncckq/W964YZINWkSnw0 +UkLESdTZA6yvQeQJCy3b0hdrwgYXiZQ7/ZT7coiVvTZ/ayIlQYcCYyT+gc67GSzd +gPR1qzt/GIiL2GRADD70a58NUKgO+aWTp9fSgpa612AXemBmpXG/r5Amya0UUr7Y +KdSpBuOgomZMqEm2mYDdI4LRw2xbWoWTVvCndhypbXTJ2D8/QhbNfliWTG9MBy90 +UAQpaQGNwHzmCgwBJ03QJuE+OXjX80XcOOIYh6l68wkDeSfqaYx95OQZ3oOr6QT8 +TLYv08M9Grrrj5rPttpycBoxVbtLxkhE0Rt0q9K4HQKBgQD0EuR35CNTIIx/gikO +CxdbSroPW9r92+IXCWcbbtRbVruHBpXzsMeHse4uqhtYmFNbgfgh12dC6OX7NzJx +3Ds4NW8DvcZ3mVq8iEiOZnX5ydeeYMetlDWhXx2/0be5vqmrUkkWdfXsFUCyS8Lw +vGRc9BiNqFePg2HsoVd2tezrwwKBgQDFb/eef/nOM1Eq5h+u+0Pyyg07iRuxxNup +YXY9hwNJyF+NUoIWx2Jfyh+dQfMC18g/4hN4Hwfm/nC85SkPheKJnXYgMWMXp2Y7 +PBgdZGCX/546xiS5VGAoRuLd8oO2AlDfgU4tw6U0WZguJ6hMXlePlKz/uAJ237FB +gcPyGNeY2wKBgQDOD4038zInolk75YYHxzFm78X55ZETtipBTLzyGjXLD4SvUM4U +uXEbjQsL9q2ztJbbsPTujU8u3DYeS9GY81hD8kjRnc0LeDt05JJtNu/vfYs+uXKb +h39nyEfzhHlapi/U5lmyTtDbCm5emTvxxvvsxmBcaH3UOhXYk7amEJ3/xQKBgA+s +svj3agqv0krYmD1ZH2zgE6rdWMCFQ3cwEKYT2PP7n3Jl0YQjcjDuqBHhEXzxSqmf +tjH8LLFvE947R0Y/N9v7D0zA/v/6v0gGnld/B5gpqBM8dd/szfGEpzA9t600g90q +s904Qh5k2osXhOoDN2pjwFRQ9Ikhez4bIkZPKJavAoGAV2YPXyw5rrAZtCtybqsO +B+15Lh+KC+vs0rBBhb0MUpXQPgQ6SX8ozpLHtqlsUpNfHwOk5K958jMrM9Rx4dhS +Z6WuTa+9QpmXzYTnCDBbEU06+YB1QR2QfU4BlAAu1RtUbbt84/7OAoNh2IqOO4XJ +THlhj8odimsk4R1B0RipBis= +-----END PRIVATE KEY----- diff --git a/examples/metrics/package.json b/examples/metrics/package.json index 5cc57364849..88153270000 100644 --- a/examples/metrics/package.json +++ b/examples/metrics/package.json @@ -1,7 +1,7 @@ { "name": "example-metrics", "private": true, - "version": "0.20.0", + "version": "0.22.0", "description": "Example of using @opentelemetry/metrics", "main": "index.js", "scripts": { @@ -26,9 +26,9 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-prometheus": "0.20.0", - "@opentelemetry/metrics": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-prometheus": "0.22.0", + "@opentelemetry/metrics": "0.22.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json index f293ee1278c..b517f09eeb5 100644 --- a/examples/opentracing-shim/package.json +++ b/examples/opentracing-shim/package.json @@ -1,7 +1,7 @@ { "name": "opentracing-shim", "private": true, - "version": "0.20.0", + "version": "0.22.0", "description": "Example of using @opentelemetry/shim-opentracing in Node.js", "main": "index.js", "scripts": { @@ -29,12 +29,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/exporter-jaeger": "0.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/shim-opentracing": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/exporter-jaeger": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/node": "0.22.0", + "@opentelemetry/shim-opentracing": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/prometheus/package.json b/examples/prometheus/package.json index 16ceeea8090..31e66ddade2 100644 --- a/examples/prometheus/package.json +++ b/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.20.0", + "version": "0.22.0", "description": "Example of using @opentelemetry/metrics and @opentelemetry/exporter-prometheus", "main": "index.js", "scripts": { @@ -9,7 +9,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/exporter-prometheus": "0.20.0", - "@opentelemetry/metrics": "0.20.0" + "@opentelemetry/exporter-prometheus": "0.22.0", + "@opentelemetry/metrics": "0.22.0" } } diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json index b4f505de403..f591deae097 100644 --- a/examples/tracer-web/package.json +++ b/examples/tracer-web/package.json @@ -1,7 +1,7 @@ { "name": "web-tracer-example", "private": true, - "version": "0.20.0", + "version": "0.22.0", "description": "Example of using @opentelemetry/web in browser", "main": "index.js", "scripts": { @@ -34,18 +34,18 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-zone": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-collector": "0.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/instrumentation-fetch": "0.20.0", - "@opentelemetry/instrumentation-xml-http-request": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/tracing": "0.20.0", - "@opentelemetry/web": "0.20.0" + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-collector": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/instrumentation-fetch": "0.22.0", + "@opentelemetry/instrumentation-xml-http-request": "0.22.0", + "@opentelemetry/metrics": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/tracing": "0.22.0", + "@opentelemetry/web": "0.22.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/getting-started/README.md b/getting-started/README.md index e3abdd231a8..6a4cc827f39 100644 --- a/getting-started/README.md +++ b/getting-started/README.md @@ -61,7 +61,8 @@ $ npm install \ @opentelemetry/core \ @opentelemetry/node \ @opentelemetry/instrumentation-http \ - @opentelemetry/instrumentation-express + @opentelemetry/instrumentation-express \ + @opentelemetry/instrumentation-grpc ``` #### Initialize a global tracer diff --git a/getting-started/example/package.json b/getting-started/example/package.json index 32bdfa6be3c..04b13fe3efd 100644 --- a/getting-started/example/package.json +++ b/getting-started/example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-example", - "version": "0.20.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.js", "scripts": { diff --git a/getting-started/monitored-example/package.json b/getting-started/monitored-example/package.json index 6bd558f200c..136b505aaf7 100644 --- a/getting-started/monitored-example/package.json +++ b/getting-started/monitored-example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-monitored-example", - "version": "0.20.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.js", "scripts": { @@ -9,8 +9,8 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/exporter-prometheus": "0.20.0", - "@opentelemetry/metrics": "0.20.0", + "@opentelemetry/exporter-prometheus": "0.22.0", + "@opentelemetry/metrics": "0.22.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/traced-example/package.json b/getting-started/traced-example/package.json index 6caf816e716..e43de3a1861 100644 --- a/getting-started/traced-example/package.json +++ b/getting-started/traced-example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-traced-example", - "version": "0.20.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.js", "scripts": { @@ -9,13 +9,13 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/node": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", "@opentelemetry/instrumentation-express": "^0.16.0", - "@opentelemetry/instrumentation-http": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/instrumentation-http": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/ts-example/example/package.json b/getting-started/ts-example/example/package.json index 4aae845d152..255fb6b889e 100644 --- a/getting-started/ts-example/example/package.json +++ b/getting-started/ts-example/example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-ts-example", - "version": "0.15.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.ts", "scripts": { diff --git a/getting-started/ts-example/monitored-example/package.json b/getting-started/ts-example/monitored-example/package.json index 78d7e23c14b..426ed4a90b0 100644 --- a/getting-started/ts-example/monitored-example/package.json +++ b/getting-started/ts-example/monitored-example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-monitored-ts-example", - "version": "0.20.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.ts", "scripts": { @@ -14,8 +14,8 @@ "ts-node": "8.10.2" }, "dependencies": { - "@opentelemetry/exporter-prometheus": "0.20.0", - "@opentelemetry/metrics": "0.20.0", + "@opentelemetry/exporter-prometheus": "0.22.0", + "@opentelemetry/metrics": "0.22.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/ts-example/traced-example/package.json b/getting-started/ts-example/traced-example/package.json index 3805f4b6210..c46a2423ee9 100644 --- a/getting-started/ts-example/traced-example/package.json +++ b/getting-started/ts-example/traced-example/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/getting-started-traced-ts-example", - "version": "0.20.0", + "version": "0.22.0", "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide", "main": "app.ts", "scripts": { @@ -14,13 +14,13 @@ "ts-node": "9.1.1" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-zipkin": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/node": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/node": "0.22.0", "@opentelemetry/instrumentation-express": "^0.16.0", - "@opentelemetry/instrumentation-http": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/instrumentation-http": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 132d9d79c21..04a44491678 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "0.20.0", + "version": "0.22.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -11,18 +11,18 @@ "compile": "tsc --build" }, "dependencies": { - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/context-async-hooks": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "axios": "0.21.1", "body-parser": "1.19.0", "express": "4.17.1" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } } diff --git a/lerna.json b/lerna.json index 35849960597..f57f5914c28 100644 --- a/lerna.json +++ b/lerna.json @@ -8,7 +8,7 @@ "packages/*", "integration-tests/*" ], - "version": "0.20.0", + "version": "0.22.0", "changelog": { "repo": "open-telemetry/opentelemetry-js", "labels": { diff --git a/package.json b/package.json index 338d235fc77..7397f059047 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "opentelemetry-base", - "version": "0.18.2", + "name": "opentelemetry", + "version": "0.22.0", "description": "OpenTelemetry is a distributed tracing and stats collection framework.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json index 8c289df471d..7056e479dba 100644 --- a/packages/opentelemetry-api-metrics/package.json +++ b/packages/opentelemetry-api-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-metrics", - "version": "0.20.0", + "version": "0.22.0", "description": "Public metrics API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -53,14 +53,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/webpack-env": "1.16.0", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", diff --git a/packages/opentelemetry-api-metrics/src/version.ts b/packages/opentelemetry-api-metrics/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-api-metrics/src/version.ts +++ b/packages/opentelemetry-api-metrics/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 3e3b7c8e69b..b40f630371b 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,11 +40,11 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/shimmer": "1.0.1", - "codecov": "3.8.1", + "codecov": "^3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -53,6 +53,6 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } } diff --git a/packages/opentelemetry-context-async-hooks/src/version.ts b/packages/opentelemetry-context-async-hooks/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-context-async-hooks/src/version.ts +++ b/packages/opentelemetry-context-async-hooks/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 3319dcdd575..8485150d016 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -46,14 +46,14 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "@types/zone.js": "0.5.12", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -74,7 +74,7 @@ "zone.js": "0.11.4" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "zone.js": "^0.10.2 || ^0.11.0" }, "sideEffects": false diff --git a/packages/opentelemetry-context-zone-peer-dep/src/version.ts b/packages/opentelemetry-context-zone-peer-dep/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-context-zone-peer-dep/src/version.ts +++ b/packages/opentelemetry-context-zone-peer-dep/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index ad9b7a9207a..3081e65b3f2 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -48,7 +48,7 @@ "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", "karma-mocha": "2.0.1", @@ -67,7 +67,7 @@ "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "0.20.0", + "@opentelemetry/context-zone-peer-dep": "0.22.0", "zone.js": "^0.11.0" }, "sideEffects": true diff --git a/packages/opentelemetry-context-zone/src/version.ts b/packages/opentelemetry-context-zone/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-context-zone/src/version.ts +++ b/packages/opentelemetry-context-zone/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 221d6d6816e..78c068ef786 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Core provides default and no-op implementations of the OpenTelemetry types for trace and metrics", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -55,13 +55,13 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -80,10 +80,10 @@ "webpack": "4.46.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "0.20.0", + "@opentelemetry/semantic-conventions": "0.22.0", "semver": "^7.1.3" } } diff --git a/packages/opentelemetry-core/src/version.ts b/packages/opentelemetry-core/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-core/src/version.ts +++ b/packages/opentelemetry-core/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json index 12cb1186e75..1787a4a275f 100644 --- a/packages/opentelemetry-exporter-collector-grpc/package.json +++ b/packages/opentelemetry-exporter-collector-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-collector-grpc", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,12 +46,12 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/api-metrics": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/api-metrics": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "cpx": "1.5.0", "mocha": "7.2.0", "nyc": "15.1.0", @@ -63,15 +63,15 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@grpc/grpc-js": "^1.2.12", "@grpc/proto-loader": "^0.6.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-collector": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-collector": "0.22.0", + "@opentelemetry/metrics": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } } diff --git a/packages/opentelemetry-exporter-collector-grpc/src/version.ts b/packages/opentelemetry-exporter-collector-grpc/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-collector-grpc/src/version.ts +++ b/packages/opentelemetry-exporter-collector-grpc/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.crt b/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.crt index 10315abf524..b6db7d0dd2c 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.crt +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.crt @@ -1,31 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFPjCCAyYCCQDg5CS2pIzGqjANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJD -TDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYD -VQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yMTA1MTky -MDA2MjhaFw0yMjA1MTkyMDA2MjhaMGExCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJS -TTEaMBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFJvb3QxDTAL -BgNVBAsMBFRlc3QxCzAJBgNVBAMMAmNhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEA0+Zk811ox15L6wnMn24/wVBS6WPIPUAk421SLwXd5oxjFsJk74Kl -YTZ/BEG6uyEcFcY2cEYyupZL1YCR6nXbbHazBQD4X6QKVpYlSGnK62s8kk9qZkoc -pcqh4rpud6KHkmoJPi1g8oNU1+mSuLYoeoz3DEe79tViBMAq1s8HmCtX0ec9sEfm -1VJL0+TZOa5tYOniVp9xfAky026JOlifR01fdUrrgwrtFFVqBEhIqG42e4uS5qbf -ag65PBQdzWDpAwYJgbcJaw/dmWYZ9w9hbleZuTUGAlBj0UDC7U6oelI0jYVjchHR -gyo9hG+2qDrUOF9jirAqEAWD6F/Yf2HpDBJu67lGB7KKxOtnfZrj6i/FDPVyEV88 -GYZvxS7CW8Tlx0lFgGZMd6IPmLafiCB5MDUNYeP/LBOJ90S7IqRZ8CiLAe9oZ6mM -cH/FS722pUME1LrVwDQvfPOpVqfQQH0AsOPnsoG8LRGfXbNe8iVG7fR8hWZyyNaj -QIJmwwhvJoQL+8VgaDxht/7qtMW/+cbxN2RBt3+PaMhMFXcT8O7AYMsjrRRqK3h1 -ZEUalAT1yTv/F7IPyFHESfhmbisSZOCTytMY+kcPaQy3T5gEXwW45KIqXMGJoTvz -vsE00kfoqhNfk2kCV/uImdyXllBEzO48H+1OFSFsje3tB/Ds2qHhRM0CAwEAATAN -BgkqhkiG9w0BAQsFAAOCAgEAh+iN05bNuWx0gSKfTChivRQHjgW1OQyv22+6LB92 -S0PwqSnnvsviDbzeOkAEEu8JPOT20AP+FxFcAnTVUSixvnENkokjqQST56AMF+am -n75FrfEbXCrHquFEMfwL00fHjSJ5yRDRYyskyjoxYlMdw8rR8XgM6G9V3eXuUpSp -znv8ExgL4P3+1YRDVX8NaoYjT7MYr7nou3U0Jeojz6E4cXJHWnTFcFyuKIARoBz6 -fCd2FR0Yjk5rsRmlmLJ7WV4KovWZAvIkpTAjzS/Gkvuq0lHdunxhghnYdFuFz+b3 -z54QNZj0RnVihOnSR8Ze86EVyvsgx1b+p9uYD5Dsmwv/g7LHSRk5wn/Z/C6keuV7 -47Gjf22mtRAiuTyKgM230lwViG76veJ7DZYYgR5jrKx+tkL3EWcpFeXS4ph+CPY8 -zN+rMzdFxUsi9n6zH8U5hrEtd1mofP+7Eo9HkLpj/KWfZiBcqXFovB4jS7lss8ld -weeEZuQA4UF+/lDHuX4ilH8dIDiFNhNXFIafNpMf2XhU94J48K/iukCSxGOKwJZM -tI7gIhMcMnTNoqe6Oy213G8klhAYG7sbxr+Vljw+rhgDkBpkwCDRVvCyh2Xc8yT0 -Ij6HiyCp7bKo1cO2AC9S9g6q31A+TVbzQ6AgkaD4c4ZQQ2hpL5aupqUcBuF7HBeU -tUc= +MIIFozCCA4ugAwIBAgIUCdllngMpqYtsqRCpqdXxPZiSbGEwDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs +ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE +AwwCY2EwHhcNMjEwNjA3MjAyNzMyWhcNMjIwNjA3MjAyNzMyWjBhMQswCQYDVQQG +EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w +CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKS4d8790qpxSOMAMNSxlvFxZvxZKih5 +BjKDefa3sPL8iSOZ12mSZyWqPifjU+fnb3PDLWJPEFYQiwpyMctlXoXo5qiDm1D5 +mLZPTc7/qbiyu33YZHW+iE23GiOQBfvgKHTqh2+ejWs9h/txlWlQuKm0NEDPnA2P +kHiIjudSkWCT1w0WOnlJXd/9CWq6gW0nCTeOmwGYaY7T/i1W500qQyv5j1xHrJCu +m9amRzZEc1I4L2XF8Lnz2vDuEEs2W1vjcO++sXODlSC78dIyGnDWxGuK+V7dhccB +jj/Q5V96CMUoY7RGl18hwn/MSkzmWghsQFkfYWw1Xvez8/IWh7AlEtB/hDn2Dqw7 +lr6lvn1cOUmhHAgYV+v/0gWFN482qi3OaR0z2cCdmfSxRlxhtrq0jH7B3dW5YXcf +ke9e4gh7P980HWeHPwanBlV7BAsPxJY7N+je1LsjHVkwv2OnpkAzGQqJycOzPAzn +tib/lxmhBYVV4eWhCKvLrDqkgp5J3Cp99wIovW6TEfg2PJG4jZI9PKztPQb/OHZp +995oEAG8lmgcCA6kpvwVvle/m3wXj4eKQ1U0mQLGfJja2ripSBk7aAlr7qxWbvjv +4kxe5dJPMRmVB3PRZvnNilfM78Pbn+du0X8TiSwXeG5Og8uSvGwBzQNeW0EZ//b0 +fHNgQlyp4OL9AgMBAAGjUzBRMB0GA1UdDgQWBBSsdECnQyhXkgqyNWFlhkSGlUJd +MzAfBgNVHSMEGDAWgBSsdECnQyhXkgqyNWFlhkSGlUJdMzAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAAfgD6lqyOyEOfGMAhtb5OVLpn5hG6WLfd +wyjIYzMNW5DScV9hrgB1ycfA9OIqBECWY3zP76X41KVI0siu7qg3bkaPM2qh7sbO +LXYCkDHNYF69Tlf0JR+Wpr740DIqoITcZRLy+/FMFWij9tNAsY1EcLrSYuiEd8/L +OanlD9AaA3fL1pOsfiNM7Ec6nUFl537+yNFGxU+Q9T7EMb/ypz/FwN3/zBbO0xdk +ZqPh/jDETKorBH87QnFRidmK5DiXRwh323+l+cWEEe79ssGzLBcLr+rzOvDH0qbo +fLBWkRbBtAcRGJAgM0F9dLG4/hQisELobNSCZ4aITHmr1J6MFiVxaaEvIXQ94zgj +xVtAv2Fp4lvpJWMjk/iKc8IR56VkvK6bui7BYEFc+DmtJLw0ryFZDD1wEzbQ5Gzl +W7JBC3vR8zQPo7kVl99BKAsNLhC+tCGdbLLOJROyFWHai/bkcRPHOLOMY1/lM/Wf +rlIcc46pSIOzlsxnlrDzoQihjtg3SrNBkPaRaJE12WFHYELHBX+65HRGlkaXnxaY +HOqPN6NiHVB0i5C4+l0M7JdOx2kEYVQiprm4kBiM3BNMdRpThn4Vt12TnEyq/Cyz +khz4FAMw/ytbEWMxFvEQJdOK1vjmPHAMDSFXiixeklVUD5Th/9so4kRTu97j8fq/ +T0JDHso8+A== -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.key b/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.key index 7ac87f77325..3a12f603d4e 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.key +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/ca.key @@ -1,54 +1,54 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,7BE11F6CEA0F028E +DEK-Info: DES-EDE3-CBC,723F7ADBF5E86DF0 -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.crt b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.crt index 8463ec66d7d..cbd324625f4 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.crt +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNTE5MjAwNjI5WhcN -MjIwNTE5MjAwNjI5WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAyNzMzWhcN +MjIwNjA3MjAyNzMzWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZD bGllbnQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBAMBdLWJnDsP2mLy4JMdCqTIaqtNx+XEzp/TUnUJaPfZ0u+O3mzQT -IMDLdwjjHXteCE4924it+VwrVMtbAZgbZu0mRjCSl1CrvFElFHZ+s9dD5Fy91plw -aooc7arPibS4nwMIL9oIoH1SH5ZmhGt1bjnCB4XzSNHjEesycX2pjLyfWtEccbZy -fR7WsNXirV2lNqmJVkuwOeLKJKCmHhvODVRigQNadGUhvXXLJ45pvW6NEKNfXHgM -/QvadTIGs5dtGF1DrcNOYrtYNSDf1iUm0Yo97ozlXXQ2D/STmo0Bqv6yDFORiF/+ -WRbC7jRpgezv94Vy39SJqRCdSQjzXUHikTG451Kg/7JM4uunYVQ4I/ZrPjiKXV/a -wn/JrovZqaKuvvQGBcF+vI5QD5WYqb33eb14iglLWFmsz7r+6wg0HJUgf0Wy/xsU -kMWi7QUgrKnVEtmrBh1685msGrX2HpBaUhstu77UdXNQjXhMrI3YHKSYxbFpVoZP -IGJ96qA4uFxY8fIkCLOoKKJN4K44y6LW8i2SnIP35ITxMdEr1m9X7cCUTTl0w12X -51ieV3ZFLuYkbQLeTaqRq3+3bZ9ABxeqpiDZ9I/q3ZlQmWJzrdpDlmw5DXXliKJP -kw0lXMdxFomTlQI3q5Jzadk70aw5IOoTXtK2eMWm7qgF8kTLmk3Hy0AdAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBALQbYWlVJemk4AWAnr9U940unLhJgM3dp0y6hT6W -ms0s0hGgvNiwwdFUL2XTt2nhkRQPVvdQSu0nMbfqm7PAmXKkvG4CUJyqOYpvcT4R -uwwAITAX6pfPrtgQfrws2KfmWLq0k/9e8QN2Ecfsjnj5W0KQFvRyHg4WATv9+pTz -7xBP/DyG/kCLuTxfUW0A6kTAzvgBDLPrJWc8vcU8tufIg1kalT6fut/Tf1msNYKP -uIzkNxNboCazkC4YNuocnMOuxnbtGRDNal8vi/tNq3ymgUi91i7HHc6+5ekTutz7 -fcCSCIkY9HFq4fNQ5y//yLhhskwBIXghecf5XiV5NGe+qvxfRPl7lZ/zBjaQ/LM3 -N1bYaChUJCrmDq+MNGWtJrziOtVWuKa8dqzfd18z9oSCDR/p0VxfY4KV9YreCOA/ -kUaUpPPoDQmQdbqKsAXZxdm4l4dmSxkcdkVs6GN2NybuqX/0q2RvxpxoFG1tymjd -ReCHCXsBLTtqFJjiRa6IYu/JWV86F9HOooMFxCxMOZkAvpCRg90UCJuLEl5lhpwB -PDJDRssto/Hm5qgSHL3/EHJgtCi0ytVPT6w2AE+lQFx4v4zxupz5ElN2wpnlu/Ai -qpub1J6vTo/84WmO0rnahRtQb+020ijaNeaGZOBarwzeuV4S3FBAg8D07f2Hi5vp -z6cY +ADCCAgoCggIBAMBc1F9O8OcCu8xspnN1MNwccUZCx+lsh1F50T5D0INmxz3rXxin +TkM+QjFsJ09iF8MmgouI+yxmTayMlW733dUc/XQ9cV9GRwWVlF1RnoYp7mXVwMnz +o80s7CGWc+geliqeLUgzGIoq4bGTp1eEeB2KGJ/w8E2bTLs5a6B0pHhQuVXZ+Pq0 +E0Uzl2wPc+WwjeZyGRU4PbWzX6bN+R05Pfxq8PXhJ6Jnt0j8pNoF/XU6mOIYQyQb +THEKR8qB2SXo5+D1JOlRiofWtK4wsRH/wNm7j7tq75UezhOeqp6YU6MwGnea1loa +65K+DDG/rFyvxSlDS/53gjyKGSqYod8pevvytKjtUmw6xX5i5nFnf+wrKmMH6EDe +Hm63LReBv/CqCErYt4kV3NkdIuHmv7ZIdRfhDPdK8Q/kzAlRTX25wK/xWn5CqpSK +KCUwukEzccV266KU4sG63/4byv6zE62z8472P6u+OGSZlDxznL0BBg9iiHFYiopw +shBfFcszPCSOs1SO8XZH+6J5ypKBzBP7aAsyJflPHWGTUBACY9ZCU/7iwIF7YFPb +a/temVMLkg75oYGVow0Dlp55jQvrzMr7IaSBCxFUJEKf5u6GSNotJWmQdHYta5SH +Kj/rryFQV5qp9mBfia5DWnjHijFZTo+c/KLrgkmzfgbT4qVpnuxKahXNAgMBAAEw +DQYJKoZIhvcNAQELBQADggIBAA2nZTbaa9z/LTNJijf0clu4ULPG4RrqHgQ1q/Wh +NbrNemrxTJ+ZAwCR1gTv4oZe9NBd+V1pDXDQBid8mBTbttVrQCHdjgHFpQKNeyiK +nd2OI4awYiTvGbgDCMHAW/yf+XKCocuSkyNRnmfe8PihFD9wx6+kl6XCJuIkF3Vw +MGKEIrW2WLAARtBZeKV2yhtuVhkNm2TNFPfNrNtk2gdGO8TkX0orOllAENopR+GV +uffuLiIi9KWj9XP9T+6bdZbG2eMJX8wUNIIma54/3XN3RMi2iV9ZxW+F0j6d9ryo +j8pJJfpiW4qh6Eqi6HyvrzgdndKhkVYiIwbX5S60mqL+KcaPghX2goWexMW94QlQ +Re3/IvOAzGpu5fLn//y2tAaO9hDUsyoIJtXcFJKLbfM+mK/Bac2niEyBpr9Rzqur +N43Ga2pOsM4P/4YcAO6tvs5htvh2ala6UDXeEZV9Z1Bc5bOHAWNp13BfWE01iLNC +5rIu0XuVo1aa0FeVdJL6IpVeEwnkzDDt/9LKgp2K8w71VAtUSOg23AEYJu+GFr4D +y+0bahUiNETrFaiCsXQYa9HHFrqhA/PGOGpyq6GrBkJxWpzuL3rQQicpHzVIQEmb +3aCcIBdA2RQwQk7Z3YI2EuFMkHAElCXXZBulvxY6kl1n+2UwWRlocDMYZdkzI3+X +Tw8x -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.csr b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.csr index fafc1091dd9..e5de7b19123 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.csr +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDAXS1iZw7D9pi8uCTHQqkyGqrTcflxM6f01J1CWj32dLvjt5s0EyDA -y3cI4x17XghOPduIrflcK1TLWwGYG2btJkYwkpdQq7xRJRR2frPXQ+RcvdaZcGqK -HO2qz4m0uJ8DCC/aCKB9Uh+WZoRrdW45wgeF80jR4xHrMnF9qYy8n1rRHHG2cn0e -1rDV4q1dpTapiVZLsDniyiSgph4bzg1UYoEDWnRlIb11yyeOab1ujRCjX1x4DP0L -2nUyBrOXbRhdQ63DTmK7WDUg39YlJtGKPe6M5V10Ng/0k5qNAar+sgxTkYhf/lkW -wu40aYHs7/eFct/UiakQnUkI811B4pExuOdSoP+yTOLrp2FUOCP2az44il1f2sJ/ -ya6L2amirr70BgXBfryOUA+VmKm993m9eIoJS1hZrM+6/usINByVIH9Fsv8bFJDF -ou0FIKyp1RLZqwYdevOZrBq19h6QWlIbLbu+1HVzUI14TKyN2BykmMWxaVaGTyBi -feqgOLhcWPHyJAizqCiiTeCuOMui1vItkpyD9+SE8THRK9ZvV+3AlE05dMNdl+dY -nld2RS7mJG0C3k2qkat/t22fQAcXqqYg2fSP6t2ZUJlic63aQ5ZsOQ115YiiT5MN -JVzHcRaJk5UCN6uSc2nZO9GsOSDqE17StnjFpu6oBfJEy5pNx8tAHQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAGsdDPQvmtxlp279xC5gXYdaX2jXkClWCzxk5cHK -QGpwMQydE/SYkzX0LxuDPkzCExb6NE+yNmQ13JhiEITOKI0BjV2PZoe3Et5Wg6W5 -hKRcLxPijaUzvr7sXuVJ2dSdAqaSK8H8J8BK1PIG/tHOQr2zNd4WK/PRdKAzd8FI -fbW/ncyCROaflbcEnNzKKLvrsLA4W6sf0IT//hYYcGshLU6ja302YjBiH3oYKoLX -c5tkXy0815StNt/yjYlagTvcnOZGFdopxvPZ6FXt7261LxpzKBG6awb7gbbllDg0 -eLeRp5IQOR0IAnssvCxYbTBFpPu6foVN9DYLdChFCfbV3oa7Rr6fhzI4l0THtE8s -UpeOhcrZFU9mXa/G3qf79+ruhcAfxcw8FIVpJe60EMlg5v7CnbfKeDlwfk0/rVva -h+6hfre/VdLtdyCvNt5CyahmonxBkpAa+hFem6hEtojqEMMg5Bm6QdNPvKWP4mpM -wVM7K+BDq8GH8WhR+BENc69Gg994lQ/dxNGbQVDUoVey5+YBfIFipDZlNgUz9x9U -8i/lHnJDNxR6/4ZuSMm7G0STzBObM4/BSNIKTyCXPlDPE6MZTVyxPyzZ44o9StdQ -6HZvHQ3j27iTif2UY3k/yvbaO13z1ZP8tcf8SUqKe+Bt8p6RfSZKqBW0Yzl0Pwto -4z3r +ggIKAoICAQDAXNRfTvDnArvMbKZzdTDcHHFGQsfpbIdRedE+Q9CDZsc9618Yp05D +PkIxbCdPYhfDJoKLiPssZk2sjJVu993VHP10PXFfRkcFlZRdUZ6GKe5l1cDJ86PN +LOwhlnPoHpYqni1IMxiKKuGxk6dXhHgdihif8PBNm0y7OWugdKR4ULlV2fj6tBNF +M5dsD3PlsI3mchkVOD21s1+mzfkdOT38avD14SeiZ7dI/KTaBf11OpjiGEMkG0xx +CkfKgdkl6Ofg9STpUYqH1rSuMLER/8DZu4+7au+VHs4TnqqemFOjMBp3mtZaGuuS +vgwxv6xcr8UpQ0v+d4I8ihkqmKHfKXr78rSo7VJsOsV+YuZxZ3/sKypjB+hA3h5u +ty0Xgb/wqghK2LeJFdzZHSLh5r+2SHUX4Qz3SvEP5MwJUU19ucCv8Vp+QqqUiigl +MLpBM3HFduuilOLBut/+G8r+sxOts/OO9j+rvjhkmZQ8c5y9AQYPYohxWIqKcLIQ +XxXLMzwkjrNUjvF2R/uiecqSgcwT+2gLMiX5Tx1hk1AQAmPWQlP+4sCBe2BT22v7 +XplTC5IO+aGBlaMNA5aeeY0L68zK+yGkgQsRVCRCn+buhkjaLSVpkHR2LWuUhyo/ +668hUFeaqfZgX4muQ1p4x4oxWU6PnPyi64JJs34G0+KlaZ7sSmoVzQIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAAtbvw2rrtnO5EeOF1Z+mJc9o3036liNbmCQTaC7 +Pf2yqo3Zk44L80R99sX5rDoq79MKEr//ED5C410EiCvzX42w330p7dasuoYRAwLw +YB0UwWnrKhm4SU20SC8zpnCUBL6K9lmXF2PJtkoMgFAnB8tIEc+DAr4hBIqh45vD +VgZ06GHH94/G6tIW3qNvi1mmvUYV0i6D3xBhcNAu6R/zopEYM3png24ZE2IlzZCX +x8hbYuMAqeQXSHQM9sKhXeb60GT8ns7d3P17S/TfpkTI7zRMkPhzsHC/Vp97xN/n +ojEEBY3MZJBPZj/q/buDfbp5x6H7/YxYdOKQKaGVWECGabISBcsg8NxaY++GKc+u +10C8O9KILRCJKGh8ze7chXx5n5+BPEoVVwhLn58eV7sOODvb4kZySUJHvFBb0ZM/ +7626K3443e5ZRkGXydvDIwPZgoiJ3L1L9+olL1cJ5rsRE6L5k6vPuJOeZITm4au2 +pE0THMHx/RjCMA1Lb/0BiDqbBHSh8hh+mHU7YXTq1Fxi2dSas0wAxcTBRs8TULsV +o57TmJqF+byiqwQvugyN7tndvWg9c+LDJHqitA5QC1GDXEi/bdjd7YeHRiL+ciVM +ZXXU9GT1O78O+84wbIDebahn8cifdGa7Kft7GftS3pCIyAjU9+eMXyT1JG3nssLr +4/ht -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.key b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.key index e351295949d..9219944ca47 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/client.key +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/client.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJKQIBAAKCAgEAwF0tYmcOw/aYvLgkx0KpMhqq03H5cTOn9NSdQlo99nS747eb -NBMgwMt3COMde14ITj3biK35XCtUy1sBmBtm7SZGMJKXUKu8USUUdn6z10PkXL3W -mXBqihztqs+JtLifAwgv2gigfVIflmaEa3VuOcIHhfNI0eMR6zJxfamMvJ9a0Rxx -tnJ9Htaw1eKtXaU2qYlWS7A54sokoKYeG84NVGKBA1p0ZSG9dcsnjmm9bo0Qo19c -eAz9C9p1Mgazl20YXUOtw05iu1g1IN/WJSbRij3ujOVddDYP9JOajQGq/rIMU5GI -X/5ZFsLuNGmB7O/3hXLf1ImpEJ1JCPNdQeKRMbjnUqD/skzi66dhVDgj9ms+OIpd -X9rCf8mui9mpoq6+9AYFwX68jlAPlZipvfd5vXiKCUtYWazPuv7rCDQclSB/RbL/ -GxSQxaLtBSCsqdUS2asGHXrzmawatfYekFpSGy27vtR1c1CNeEysjdgcpJjFsWlW -hk8gYn3qoDi4XFjx8iQIs6gook3grjjLotbyLZKcg/fkhPEx0SvWb1ftwJRNOXTD -XZfnWJ5XdkUu5iRtAt5NqpGrf7dtn0AHF6qmINn0j+rdmVCZYnOt2kOWbDkNdeWI -ok+TDSVcx3EWiZOVAjerknNp2TvRrDkg6hNe0rZ4xabuqAXyRMuaTcfLQB0CAwEA -AQKCAgEAh60wpYcq0uzLLdBzoFdUHxLQCfMJjN5ySCzt/i7IJVyQaTzHKyOSpmjb -vFj0Il9gXE8k2HJcvrWRSR0XMsGhBwNH3lqGf0+hs1oD5M/Y6KvqFb+P7QltG5zr -xN48skrFXM4Zch9DkyCpRttn6qMY64P+6mt9oQwXR1x8z7UWnrOGypbVXWnC9k1W -zITk4nf05f8H7rqNGXiZ/PUtp07d9/bCKCtUjUAO8VYowDm0cpTsd057WfFPSVz7 -7Bzt7o/z71Qc6vQOjzTXxCgcUnfeszKbXqUoFR9MgaTaDTpv8NSD/S1YktxC2dsD -R9Ri30shue4cETxHEoDdUoLT8/Rpkv9TNLJogTS3WGKOou8wtX+SFjSqzfwcKtl1 -GWRFRkKD6GDHIYp9dhH/ysZ3TGadm/toSrxstQwr2QvVzZy/Aqm3w7Vfc260/G6g -Mn1QL/r1uTceyH6VRcuLjUIR0fRo4UqnN0waK270HhPdWq7zWC2sUspMZ9FzfPib -XV0SGIr78Tw7i9fGYrfdxpr8HnMBo6UeqYAFzxglWC7yLa9IivC2tmc2wHqEjNqt -JWFe4pJvFh7I0eKIgZifVOjyNWn++CNM9m1ZdpsfZtnz05DLmcme785qG6tdvrM5 -NIKYWcbaiuCgwPlX7OqgO/alvY76O3SJKWzWlA6+8iUj6mQFugECggEBAOF/J9wn -e8gCn8l7UOsVrqQ71DpSB7KGRcd0EdSq+GFCcegJy3R6cfFBnV4c0oCh2zBgJeBo -cO/jDJ+rXuPIiGy8h6P21jWDp2D5SOP9tWVZ3T4XZh1sKiL4AYQXXqkx+pba7CJ9 -07hL3NEZbrxXH8ESYqslsMbgxeMNmLwhGf4FvNbQrtTN7Bwk1N/2VKbmh/oQRUTz -OpKrAQBMBxpqQmWUnp0CHWDoBJMNGlPkrg+OIWp1Ac2fQMRTv+ScmJOkBS7a9lmU -E5F8Sicl4K6eeUyneczNsuSvzLxGBqAWiCthb6HsdP/x1KAeNflNejJmXLVM/QjR -Vr06U9SC4F+H/zUCggEBANpipp4MS/qBaLMPXUESr1z8xv0vv8t9rBwaeNDPScLX -RnSPk2ftN6pyXNt1VUdKte0L/fmmWmDDW+udzbgclPBm9GTKi9wUlqlK1a62UxnT -dTibbFNZ3Wj2QvJX5beIvxi8ezd/VdGt6FqMN8NZBLQ7Dv6HCrYWPRpUcfOZiDKU -U3kZfdnmN6qCWSpirYn8dRZz4l9ioU8VY1SwFgASMK8zBvX8wWdwtfbxZHUe9F/q -cQQGHQzq/lhhIVPBhcG9PqhTJM72NI11Kg7i/kC0A3cHHiNluSgcWb+Hx3xN6l9Q -+3CNv9IlTvCEuhaF94SBTwWqJ9efqShbx6Y+a1NC0kkCggEAOPYw8Hj82LJpALFo -6GmKuyvt2WmdTiiC+fZFBs7FfXQWaAIJZfwESmhDw2FOf3Xjc53mE4DufnqBVtgo -WSvv4l/hd7bDt7LxFhsCoa0WJGsF60hn4CjRoBG7+E0a+WyJm4/jtHbKg7SOLDfb -dDIh8FifmhIkTKi89DUcDvHhqfxzDmSatWDrMtTO/WAxVBPJ544yoU87zY7q6tNJ -vA95hEV9p7XADBmwBiF6NBUBLya9JDI4aWPALZfmUm6IUEtPj915+3jfVJHr/WWh -ExsvEwD/UI/pj8Ek265owAnRDfxIAcREbd790hCvm7FJm++lnZq8FH0lBxnz0Sva -V+d3vQKCAQEAjgYML8r1epPAgHrkfdZl/4ZQ7wWnqPIxBRHeMoYshS81ncZl6fem -9Q1tADg9XqDi0aez4zDho/5JAGFfEXZdEj8Sf54N+PHWzYBimT3vq2MO3+KMP2S5 -DnLhNPQe7A5doPuq8nu4VyXPb1uzRDLXUVL7PGKcf7DUyhPTC8Z0gdhetOn0I8qJ -tzUQQfVswMlTaGey96+QEntpXwEpPaCW0snPpBhduyTc4h045MZdzScNmr1TFTya -buW0I+E+WLH3VsbDsGkD4l8pHAdZrMClZDpXylN0Z/aQE3R9MoUFgDmNXDSDZGpo -/RiEYPN89kqWFqwDP0KRYzLVE3OSntJdKQKCAQAaRm0Hrksal37NYG7Bk//3AjOg -SaD8fAxmI5HCwBDvn2ic2PRIk5AdabJcVExsgk3SWN8jQTbTWDKDvJr6lGTr225V -bhnEkMseKFm3RNLW388y8jI/1sr8XETYWoxVp5m7nACTmbFqCXj2MasgzJmP1D7k -JGaV1SWz+SSQ4s4mMiIA3Ep81lHJZy1u5ruvTHBKrTkJjRjdZFYlWUvG/jGjomTo -ZvozuyMt1Wag4JNXs2omcMURkel3KjTxq6LPHoujVCy5J8mY3flvRJmottqzlxWY -YIXShnDhnB03w7miUzmXgiDMjAIE+KaY5/hRcsuJsUiPOEUOinikw5/dVbhN +MIIJKAIBAAKCAgEAwFzUX07w5wK7zGymc3Uw3BxxRkLH6WyHUXnRPkPQg2bHPetf +GKdOQz5CMWwnT2IXwyaCi4j7LGZNrIyVbvfd1Rz9dD1xX0ZHBZWUXVGehinuZdXA +yfOjzSzsIZZz6B6WKp4tSDMYiirhsZOnV4R4HYoYn/DwTZtMuzlroHSkeFC5Vdn4 ++rQTRTOXbA9z5bCN5nIZFTg9tbNfps35HTk9/Grw9eEnome3SPyk2gX9dTqY4hhD +JBtMcQpHyoHZJejn4PUk6VGKh9a0rjCxEf/A2buPu2rvlR7OE56qnphTozAad5rW +Whrrkr4MMb+sXK/FKUNL/neCPIoZKpih3yl6+/K0qO1SbDrFfmLmcWd/7CsqYwfo +QN4ebrctF4G/8KoISti3iRXc2R0i4ea/tkh1F+EM90rxD+TMCVFNfbnAr/FafkKq +lIooJTC6QTNxxXbropTiwbrf/hvK/rMTrbPzjvY/q744ZJmUPHOcvQEGD2KIcViK +inCyEF8VyzM8JI6zVI7xdkf7onnKkoHME/toCzIl+U8dYZNQEAJj1kJT/uLAgXtg +U9tr+16ZUwuSDvmhgZWjDQOWnnmNC+vMyvshpIELEVQkQp/m7oZI2i0laZB0di1r +lIcqP+uvIVBXmqn2YF+JrkNaeMeKMVlOj5z8ouuCSbN+BtPipWme7EpqFc0CAwEA +AQKCAgBSCERY0KVTHotPxhXFrvhDJa34tInkNXAPgs+Eqg7FupLFCRbowJBThL1d +ri2lYMOZaVbKgoP6jzYYm2sug22KcG51n641XxbyfrNiiGf99uu/acRpWwlDeiDI +wgxztHd9fS76Vy/j3B2bSMhYPhmrHzUZH/qaXdv/C6GmL5fj5yjiP64524lMPZAZ +eQ2Hqh8ZYxbnQbCvR+tGixftKngQqNpRQM9SJsC202bJwzwvPensoUQgpbOXkTbE +WVNtI0GfYWt4RFm7TAiJMCKS9mobcCz/U78P7K8dFtDUCUnBkcX3s4QtsMU9Muao +YID0ldCSpCxIPFbB0nKhA64kKOBUylTnAjwfTKp6F/PPl/RLxT3xxHG8oTW9OWyD +3CjnG+EjLYnOypPKxVj8azs/K18AxyIOk+8imtqde9IHLV7OZC+jtKjTwqcVn0bi +rselH/S0NTdp1ksY2mfYQ1lkUMyfiohPMLSf6HJFZkpjWRICltLjpMbiNDuW7XdM +bUpE57yqXt1NSRqu1S8PaKI2qQQYotajdo2w4Ew511zwmtQwYI+TxaYvQI+Yl1tS +hU1sGJaCcojfKx0T/27SfKaKrjzGqebt4ag+LarZGvjVf4C7DiA6aw4zOGn8PMJl +1tr2GXx9hE9osrEgJP7VHw+6RlltDMjBqVvLa6oBDivBdBukAQKCAQEA/dG93DkQ +CeSdmWjGc1MTngLpERt/EAs2KJ+gGw37yRN/By3/Z52lVwfyzSfVxEZEWHzAj3rx +DGPsXTr7rEtyXISZdtloP0/nHQn1Tv0YoOpjKi8QsfirgghRwUYyXAcnFqEQsa24 +5BmsX4I7XE4+D2q+YdogmHVS69xMQWXpO13tS1RqE6VQ+XNTDAUgswKkB9PuwGP6 +21GASqrR9Gk/ZxBYJrp5Z6Qut3DkJSndZhraj5sInfi65DXPqSkw40ZsEmfrk/qs +fub+KTpyDknuKIOj66dFA7k1bbCm13mdjAzK/uoU7O4JfURijPxpo9GVjolqKeWr +M6LP5ITKa3J6QQKCAQEAwgPrCb4Tv1pizF4y2g1gB7KRpd4mpX5VG043BPh+hqyg +AoPkbt+iV2II9ye8/RwjiNSaoT+dRRrWXQyCIaDOnBJQLwgqPs0HPhzN++I6YL3n +In0uQLvNgyXCyf89xOFyixf5+PpXnItA5T5ciFi9yccY7zEG/91gC+GB1XQEkVmP +m8Vi6HUF14/jGEIjgeUTkFTXZdxS6kpP7p6sXyq6T2Q0a9KeVqBBP9XeBZZ03VSl +/PNyY4aq7x5HslfpMNAS44oNKQFSN+06NkYhjMFfDrrrb03VlwhbJas1sDjYi+rD +3ZeaMpwvxkUg//ApgiEXfffAaUQLGO09+jsl3azAjQKCAQBnpp5c72SQVa7SNgpM +kBGDxnZ9CPiDicCNKFqOkdBPlcmbGfqhyqv5dYJ+qxTNuVAxvog4T6FeSPP+QpcC +DjFefLva3/+FU1Dy990Ya50CIZVrZZrwwrbvPAx+2/a2xCj/Qbj6hhHp/F37BsjM +8hq/2vxyI0yKVecN8IGnd0Gef8XmrEtBSJJfu+ufDf0DfUGU/MQUBwArTgYQ998T +a2N76B3HewEXBOIbAVv5nTYPe0njuRD0yd0wUpVB5FNVjK2Xep6maIjGrff+yCJJ +mYFLRC7NjhpN4fVinPAVMFHZHmRLYzY2ZyKy6BlCr9VIE896TL1w7JxUUtmI3X14 +EWDBAoIBAQCn9TphKcLwse+72oSNTmzm3QjHngS42iAVTmXFENaAAitXYhS8gy+I +FF+Mj0NFnzmH9/2RQIAG1g/jZ7O0JwEWDaiKvrfLvDTb6ZXMy/Eb1OqmadZDxhFI +ysTRl/xCV6WQkoYdq6Ny6v6YNp9mjeRnLMwCLeBQWrYOMv/x6MkXh4ASKxPQB5ay +IWdIleElT0nbdgcusEi7eO+vtH+mt1eo6SeUfDYE6iDygVP+ZFzxSpmT3LEXRfru +nLkWxJIkZs0jXFy+Nd2WevEdESN0Nebz2o98wNX6NQqrFoeY8e1NW0SKrfaYf6vA +KhJCXwegFsO+kl9pAbXVs3QnD1Ndj3L1AoIBADUYFjD5y071ayhiunkwVekq4+wj +nbmqyaV5lWPU5XPBga6E3Tiah4Kt6C/LMSx3Q46jeEHTZOnCOr0KSk4BKf+WQaXN +4ueRdCWRIjdwxa37qCsg+MDf0iyHmnWp2y6IShhAwMC6konSqUkcez1ssqsChKt6 +dCxLeZEHuiFT6305E/xHZm/tWu9wbhhZecUElP+CyJ62GYtePzHKO+ZsdXywaiD4 +mZkq8ko6GIWkI7clasfdhjFqZ5GYA9Cv0OVQ6+MbFJnRPhCvz+iuAhAqXVE+nPhb +fSQOenyBtwtA3vRYYQR/2Z3xpydKzUiw1JcWf/etRwdtwpRfjEBTlzcQaHs= -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/regenerate.sh b/packages/opentelemetry-exporter-collector-grpc/test/certs/regenerate.sh index bb6ec4a9b52..e1f1af5b54d 100755 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/regenerate.sh +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/regenerate.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # # Usage: regenerate.sh # @@ -7,13 +7,16 @@ # It also serves as a documentation on how existing certificates were generated. rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key -openssl genrsa -passout pass:1111 -des3 -out ca.key 4096 -openssl req -passin pass:1111 -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" -openssl genrsa -passout pass:1111 -des3 -out server.key 4096 -openssl req -passin pass:1111 -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -passin pass:1111 -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -passin pass:1111 -in server.key -out server.key -openssl genrsa -passout pass:1111 -des3 -out client.key 4096 -openssl req -passin pass:1111 -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -passin pass:1111 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -passin pass:1111 -in client.key -out client.key + +openssl genrsa -nodes -des3 -out ca.key 4096 +openssl req -nodes -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" + +openssl genrsa -nodes -des3 -out server.key 4096 +openssl req -nodes -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" +openssl x509 -req -nodes -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt +openssl rsa -nodes -in server.key -out server.key + +openssl genrsa -nodes -des3 -out client.key 4096 +openssl req -nodes -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" +openssl x509 -nodes -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt +openssl rsa -nodes -in client.key -out client.key diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.crt b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.crt index 004b3046fed..09094e4526f 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.crt +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNTE5MjAwNjI5WhcN -MjIwNTE5MjAwNjI5WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAyNzMyWhcN +MjIwNjA3MjAyNzMyWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZT ZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBALvxxVx7QXmoFdP6BqIAtyzO0njJDm487GMkyQjD/dnlW8gCqugz -YGD+kPzaS7/xCThWYwhXNNRWwAF54PkrWYqrg4Vx3GMxvYhucX9ulQZH2ag7+TME -u6sJJ7X+wdDrzi6tqG8EJLf8R8j5ycxlhVQjlwYOwiJtAS8ZycNSluRPKudgMyhv -rr6KtNKJJ5WtqX+bd8eOJljGe/N+B9MVSDrAgab0MppC6+5XKteAhp0cwu8n3ZjB -uxy7/Os/5Lv1wu5cg4lppZa6Piiy1R2LA/P7yLOR2rHSgJV/OJMClN/rnH8uQfEC -NtDh3NN9ruqRHG1lcSNkp3Baz3ONwXoMQ3OjHQ+Lc82i792jaV9ebcUlDedRwKdX -kl3b2Lvlm32UNq1mSFAUQRfPDS5DjktRxFQ2ACNtg5TkC+vGCMZ6iE2NA59+EWLE -F+LkjSzIEgTw8DLKs1Nz6hAbuEtjoW4ncoP5vTNMHvxd6sWbKimvNk9Dnb20iY/N -q4/zdOui+4xkCVhNz8Z2oX2i60Xyho7UD5BVQ2lJ9Z2FR1/yu8yQS2eKr2laRktE -B2RPlX2VIzegIAHmfKQDRceIk1FvsdRmclRm4pNpBdUdQ63ZZeust7IOHFCLlIaB -52Z4GUNhzTxkKmyP24VcyzRb7kFkcLknLtc3VH8MSGZvAoXS1IzSDWJZAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBACELk/lYefu+/8s30dtvlxkWLw/DVyv6GJNkowMh -09uxSmPGjPmpbEXzoZo17oBjqASoEQmTDZdXNe6nHNhsn4pzGl+srxOsdo5GfUdN -9jk+FB6vYEIY9VhsXxmHbkfIvCjD2LmipGhPN2RUIaCgqw00rvC1ebFF67cSoZTq -PSNZQ8JzcFjwLmryOoLXjT0UA2EbN4evVbcFNFOPW2mYBJR1oNf7X86M4IOAGDhp -gz/psuS4BrCvxYuaPk59Sx+aFUYNrSkCw2VZ3ti124i76gRA7Dsqb73Bu2EyYNmT -EFNhKvk7BGbW9zE9lUe3CEfVBCVYUpuxAPZlKk/r8tVSJlppNXQh+2TaGyBdYPxt -BRSHatFtCW+YfTqWVWjm334Dmx/Pa2hJ/7w+RMcr6EgA1GXMuCPusozGAnrNYE3d -141ClscHEhp9b5imRgANlnQY2FjlbYAKALfgYGSrJ/4U6Hj/OZc7emQeLJq6IHi5 -SdB+Eb8MPZ4tZdeYQkrTd1CnYLjXFCmJbucGQ3iJ+Gm0zqzsUZc7MASoFyy9/nby -Ju/33/S3xAzaIEee46DMfHAowDb/awFVq0WddkGQzHQ38ogC9CWdtuOfgAAX/i4q -bWI22dIVvnOOn73RXonAbIcHZT0/dWfwBchlE3he/LLbEleU+QpP9kgkuRT0i4rU -fTS7 +ADCCAgoCggIBANaRv7jpdEedG0CQ/LoJEXuE32eZXzar45u05wq5CzqnUlYdHyx8 +cgCJJ44KThFXiOzgELFiiwjxmPo1CDLqGp8vEDHntvhxLhw/mFy/aa7YrCv1/1eX +0+cEvNUyoikjHKXECI7sV1ZVMrimGKXQNqRfub1JbJ+IzL+kp6MRtdA6GzxsU0Dg +Wwf7IQxtCQ4Tw3onJ3P3NZAkgz6zCVhOVkR7DuqGulzTQDa//mWwKQJie5wscURj +vLsJ0prS16Tc/5yXijwRjwx8ZEoDrJ5KszoMQwKIoLN7wHBo2r8/8RQsOGTVMJ1I +9kOkH3s9clswxCrnpzdNNmyIwTWaQ6CqpQpp0unGimF3VokanHhOhcpkWfzDArmU +jL4PIFBQBJvHIEKbuhZ4pUYL/6RtgEg2f3xVPe8s0hn/DzwJTgXqEX+TY7WvIKmH +0sMGZ9TZzWe9W64LM2/427+6pfgQOAJDHNLSYpmaa14R+630IMocdY6sj2hoZ9TK +8Ridqn+q+5kIpG/pP7bbzbzsotdzjNb6h7GBlsuyycoOfiP+C6Zs/yUZAAZEsSm0 +e4dXFCccurkXRL7cZJHC/agQhkkvcEP1TpmaygjbucME+h6H0G0St8yzBQwEJdkn +wNmfEhIdjmiX6u/fvPO6VJ5HBxgA5gONJlk+4EbiZTfl2rYauBFhloHzAgMBAAEw +DQYJKoZIhvcNAQELBQADggIBACIJLqVoH8oh8W0/0IF3sxH8LFsGByi0CUPo1JEB +1t3+FqyC7eFC9rDW12LfOKgiZl273OBpCHT8bx3OkoGZ4KwZsbsznyJv/X5OVYFH +5y5Lo8QNGWWMzXoK2JLlYJXZHMaJr5tTFOGqoIvC9C8ibLSAbL0MhtB9L5SvSxAm +mUOKZ/en7ZBepRex/s/rfCWYYTw2Ah02HZc8+H/J/aF3tvChI7Gx0anaSQxS48Ru +3eCaiaBEfoSGQvN9Jc+k1QJgJ4vZ8yi7ndl8pwW97YXo8Sg305ritqpnon+vemsV +rYoqHN+WV2/D0nqNu1AX8PldDvUYTfBtLfS7T5goN7abEIJCaTNmzU2ji0SqI9vJ +j4t9E9KcCKMshbciDrD7RPEPk3vogEDD3uygFwcPwUQfpCUFbRJOnTSH1oB/aUC4 +x9DnYSHBdDvaBmu0pBpoddJ+0pbw02P7YL9kPz5OnOAN06JP4McIYz5ytKoSt/m8 +Z7cUnvn7TRVNLuiapwpB0gtRmb9JY1q3pd63+X0SCaBEtUH+PWcRcS7eDsgMwEym +0CyANhCQYJjcKugIWLYtN/0/p2bIKcRmcH3iJiN2zZtP1AF6G7a4mp+21OynvFOc +3+ojTDGJxxD3uPtKEhJXRgYMOmfAEn3rgtoln1kkNYcd7f2EIulckwB2yeM1IMud +0le7 -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.csr b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.csr index f00230f2571..bb61322340d 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.csr +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQC78cVce0F5qBXT+gaiALcsztJ4yQ5uPOxjJMkIw/3Z5VvIAqroM2Bg -/pD82ku/8Qk4VmMIVzTUVsABeeD5K1mKq4OFcdxjMb2IbnF/bpUGR9moO/kzBLur -CSe1/sHQ684urahvBCS3/EfI+cnMZYVUI5cGDsIibQEvGcnDUpbkTyrnYDMob66+ -irTSiSeVral/m3fHjiZYxnvzfgfTFUg6wIGm9DKaQuvuVyrXgIadHMLvJ92Ywbsc -u/zrP+S79cLuXIOJaaWWuj4ostUdiwPz+8izkdqx0oCVfziTApTf65x/LkHxAjbQ -4dzTfa7qkRxtZXEjZKdwWs9zjcF6DENzox0Pi3PNou/do2lfXm3FJQ3nUcCnV5Jd -29i75Zt9lDatZkhQFEEXzw0uQ45LUcRUNgAjbYOU5AvrxgjGeohNjQOffhFixBfi -5I0syBIE8PAyyrNTc+oQG7hLY6FuJ3KD+b0zTB78XerFmyoprzZPQ529tImPzauP -83TrovuMZAlYTc/GdqF9outF8oaO1A+QVUNpSfWdhUdf8rvMkEtniq9pWkZLRAdk -T5V9lSM3oCAB5nykA0XHiJNRb7HUZnJUZuKTaQXVHUOt2WXrrLeyDhxQi5SGgedm -eBlDYc08ZCpsj9uFXMs0W+5BZHC5Jy7XN1R/DEhmbwKF0tSM0g1iWQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBACUrTmxDEBsZMhvYZ5BJ2QiGSvwkJE5eKOyWFhIL -2icu+TgeeZkXBdglijuRPUYzeC4PiESqtGOX5t5cp1NQonh4B4GknergOdzAeJ3M -gqEGKKlezg+pbeddfX408k68ylHRAd0wOl8KcbOzD/auoXRiUihTs0543WkOMoaf -PIqJ8PFusmuulBcSAeB0Q9fZB4HqdKCDMrTsVMGiRQkMcHG/NaAWlOa9T82/xE0/ -pGgRqx5kGXtiVQif/B4NAy3AAuxrbtliFu5m+jMvuAvnXVEdl8q6AAulA5GJTQpC -mcBHKSkqLp1G97MIqhwLSaZhma4en+h71zQWPK1KOij6+M9GSrSZvPjnk9mnAuj8 -dSOrCzeS26bx+AHc/NSHfFRFkvPNQhBIfsXLJmXXEuq/nY8ydQw/DEg2E+OOVX70 -RHxXNOfffpweuMPkN92yZ0dtpmADID65ZSABm8vrUFrewpROFZQIfxLN5141VXhF -ZHy3RrNLbFM3FEIqRrTqlDhW/wL551f+JA2uBjmEYz81oSJ91gug18ym+Obzvm73 -35fvxaL1Ha58IynKC+ISf2ZB73xC04FeOpst5AN126JhXhXp3Ua3/te8aZcKamre -sRbqFNy3iLwSWhjcCD92lXMONXqmpdtD57QO2FjL6W+R6fySk9to/8bHBFKkGpNl -5XCc +ggIKAoICAQDWkb+46XRHnRtAkPy6CRF7hN9nmV82q+ObtOcKuQs6p1JWHR8sfHIA +iSeOCk4RV4js4BCxYosI8Zj6NQgy6hqfLxAx57b4cS4cP5hcv2mu2Kwr9f9Xl9Pn +BLzVMqIpIxylxAiO7FdWVTK4phil0DakX7m9SWyfiMy/pKejEbXQOhs8bFNA4FsH ++yEMbQkOE8N6Jydz9zWQJIM+swlYTlZEew7qhrpc00A2v/5lsCkCYnucLHFEY7y7 +CdKa0tek3P+cl4o8EY8MfGRKA6yeSrM6DEMCiKCze8BwaNq/P/EULDhk1TCdSPZD +pB97PXJbMMQq56c3TTZsiME1mkOgqqUKadLpxophd1aJGpx4ToXKZFn8wwK5lIy+ +DyBQUASbxyBCm7oWeKVGC/+kbYBINn98VT3vLNIZ/w88CU4F6hF/k2O1ryCph9LD +BmfU2c1nvVuuCzNv+Nu/uqX4EDgCQxzS0mKZmmteEfut9CDKHHWOrI9oaGfUyvEY +nap/qvuZCKRv6T+228287KLXc4zW+oexgZbLssnKDn4j/gumbP8lGQAGRLEptHuH +VxQnHLq5F0S+3GSRwv2oEIZJL3BD9U6ZmsoI27nDBPoeh9BtErfMswUMBCXZJ8DZ +nxISHY5ol+rv37zzulSeRwcYAOYDjSZZPuBG4mU35dq2GrgRYZaB8wIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBALQRbWtd7VIT7PI0g2TJY2nyFDZ+iNLlsqtlTQ+3 +9tDUNf911AyXGFBH2OaIg49UEl3Dn3ErAH6nZluZhRNjZRUYfE2dSEVYoeAA3SmE +FElARM1CX4dQUDnV++RLLRIKKGfcnwU+vSEWN4QfXs9qjI2UK80CBr6kPEt+bMfR +wUIax5HT1XLECoLph1rNza0h3WNk5ndEJMAt51U0JNAi6PwDF04ZfnX5E2RtiEjV ++3DPW1HYlX2hepkXVJPB568bbpmWLrmJsHjVZy4vmDoQi2bzS/QPsepgQ3aXxNel +vTxh0Or5SdIRRfNnP/Ov/aYjBxzkcKY83ADh7h1aqMOlUyFenHoMfTWnMYkeNY+1 +dOoLUS/ZNA6IH54UO7uY0uOcwCfRPYZzDxZI0IkjogX0aizixSs5duQx0ux3sUOo +a4zxMNPd89ppbCMZDS7biC7cOAsdDYXKcE5ijpc5CQXVo4/dA2xyfisRT7WUq9ay +vmQoYfMCAkGv47BVYhzASyPIXuFP2/HDbtnBvZ2aeSuMAwhHzj3vX9js2HGy7t2V +kj36LymQv+YBp9mV9/crSqy0DNFAYOWOuig0mQX/SPedGa4jf9v4OhANi+kzgxtQ +hBTcA0OtJyrVxesVGGK0YwaQIIZ8jwhsK3ljlZpOfVUflHl2/etME1DXtU37U9xA +fuw0 -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.key b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.key index 94aa85f3d7f..ddac188c23b 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/certs/server.key +++ b/packages/opentelemetry-exporter-collector-grpc/test/certs/server.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json index 306e77cf438..e95f8bdfa82 100644 --- a/packages/opentelemetry-exporter-collector-proto/package.json +++ b/packages/opentelemetry-exporter-collector-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-collector-proto", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,12 +46,12 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/api-metrics": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/api-metrics": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "cpx": "1.5.0", "mocha": "7.2.0", "nyc": "15.1.0", @@ -63,15 +63,15 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@grpc/proto-loader": "^0.6.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/exporter-collector": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-collector": "0.22.0", + "@opentelemetry/metrics": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "protobufjs": "^6.9.0" } } diff --git a/packages/opentelemetry-exporter-collector-proto/src/version.ts b/packages/opentelemetry-exporter-collector-proto/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-collector-proto/src/version.ts +++ b/packages/opentelemetry-exporter-collector-proto/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/ca.crt b/packages/opentelemetry-exporter-collector-proto/test/certs/ca.crt index 455c498aa28..d54d3fc5d3a 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/ca.crt +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/ca.crt @@ -1,31 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFPjCCAyYCCQDSzsM0Ou9GwDANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJD -TDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYD -VQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yMDA1MTUx -NTQ0MzVaFw0yMTA1MTUxNTQ0MzVaMGExCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJS -TTEaMBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFJvb3QxDTAL -BgNVBAsMBFRlc3QxCzAJBgNVBAMMAmNhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEAs1AVbpZ642HATrkqW0WpzsOAne677zDftkvIhWcto3x+nwP6kSOE -vHtPR7xem9Yl5LUy1aDpd0WnBSke1JIYdJCAmmlitFVShrpolGRb9MqYJPXp5FfH -OFltziG00/MSKwNv7GiwN3ehyvzfS9L46mCcUWnQLJkjkThvlV0JRCfaTBRF3m8M -fKYvQ71G/9ZwbRvRqPCk8CZmzhqKLvRFBmzM2FGj0CY5fFqPcBRM08MWNkxAR/4B -IGKTaz5qzaFEvxHgQMQaXOQZYeNwiCFBoGygOId96x8GX9AT1PwW2ltMU3rNtVCf -9xu3JUREHjkIReNqM9h1qq5YIfrEQYeM1Q5Kyr3+Bpj6EhZqGmfc37z/nootxG3z -VmYZ4+z0zx24s117J7CfD2OLL2OaLyWheXXYqB0gOgoTwwwTsB5DYOv15fjsqs3F -kuYR/hbxs1GQO9RcOmlvynIleiVkm1x+UmOuIltfMjolBPc7ZKKxjlAxbC4oY7Za -3th3UkDIVFJmWsJhj+z87qLq0EW4m5UYV3uIUDN4P6Pko3iTqKG2qUtnnhrlbvhd -/YfSCWJRMSlgCfKFuhGkiVDEpJhza5LxNeM2EYD/PIydotyASw2Btp+VowC6yDJV -yR2cTVEGeYxQXpOI0wqJT8DrhWsdAqioLtaFxNJkdTKWAbfC8MP5wp8CAwEAATAN -BgkqhkiG9w0BAQsFAAOCAgEAP7u8IlEOTBrL3OISH9vUqFbiRdTzPfpFJ2ZVxM3H -C4iLdndKVmJLRJyMeGhD/kEnTMmHrt/mZTw6tI87+PE1ZMqSe4+q2NlHz0BouiQa -ukGj+OzZ4gw+IlDfyiXtsggCb1dRZldGoddiP8ldP0ohvR7nErG0RrRuBp860yPD -qBzItTzpC4dNVBbOBf+m9T914dsznFKlyU+QSVA2TXpJnmfEKCwlyk2gVH9olQlG -ND4cBdnOnarV5eflIj+LXjZh2wt/F0qLpTmUmxEyCc1M1il+hC6hnbarzin+8Cxu -VqjKzG7KcLxlWx9wj6ruBA1kPL0Jx31c8wDJ8b7HtsDzehcwrKKnZwA3qs3r417c -n7Dddbix9Gxxi2MTY83Q3MKbVj+oKxz0wZxa29fvlf3Gv98wzSMcS2cK+bjQwwuJ -WQxH9KksKU6g1Dv3fVz2E5CP9gwHaQBVBNSKxlqQsB2nhNglpigmglCKrfX07c7x -ryzoDE1E7tYguyWa4W+LFJ85EirUkGIBL7IoGCsol/elF6noGiuaNMO3KsWmp/C6 -YsXQJPWrnep93CCZdZ7bY6L6BTPdz1RaXMh8Rc65MlIlTzxPnhFTYrXz/FlK2uv7 -lPvT0+cGOvuiN26vqfKnrid1I2theKhKDWSdv3Rshg0ZJatNWS0u8gTE4f+qCjHP -9CI= +MIIFozCCA4ugAwIBAgIUJy5SEslTLFkUTocZvXO1+3qd+c8wDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs +ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE +AwwCY2EwHhcNMjEwNjA3MjAyNzUxWhcNMjIwNjA3MjAyNzUxWjBhMQswCQYDVQQG +EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w +CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBALHeRFPaPJhHNCwMkcGZMGNaoskj8Qw6 +Ar2PQVC5YzByrNWaxv4HcPArHxbfsMTHJsV8vZfN2K3AQCNsPNVy/YfBFwYbkr5J +K7KeiFSAw8mDz+Hr2NETvQA5xbxTROaBYlNxQirIUtGc0sl0OXinKEsuO5/CqB0V +aPTCmdY0iMNIKtGywSc10XzWSBIzwpqVXMDIjXGPDrl2AvytAm+vwhDB51TSCKmz +ZKAiK3s4VsMmmAWDPvOqItO8QHvyKTswwb5REKXZ455GBzLWM+6+UDr4VVCKlHXe +PydKjXgKwaap/goxo3/lyGdbsbY/BrNDEvKfOhvSwZWaroXvu8R/R9d53Gjh76v8 +v1pXJEo7OzWhVvMxb18/ZonCoX7F40V8uw8fmcoQlUY9/c9JFo5+UiuhmW6acD1F +JBGMbSwVy0MbqledEAkSpIulgapnJSAf4gFxBq1UXjXC9iJNTDlCafY+DQjrhMSx +pjb9FjZAjqkdFyxWwdfNmE6kaXVPbxuOaYVbUXF+w1DoC+TsAni3E6WmVI6WR89G +rvZOHuAj3EJhiVwZuM/f2HpaVfaFmOHS+pWqYgaF1nFC7bOOl+JPcfgdOpFITuPM +QulBt1P1f6eGS4G8js2uW74UQNed0qXk8bmQ6Gie4NUS5sG38yCf+inK/4ykmLtW +jQYHlLKI+WVtAgMBAAGjUzBRMB0GA1UdDgQWBBTUC1DWnOpOOqICf/lXsL/tZjmf +4zAfBgNVHSMEGDAWgBTUC1DWnOpOOqICf/lXsL/tZjmf4zAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBNP5wgbkuM5iUPIhg043xEBnD4kR7iGaZX +bVIyWoLXRbtpjPyCAeBzcDjVgq3i2vs3jGXJ+p2RkEftIDbCrsgdK/SuPQjsXe7t +uxEUf6sNLzwCF3vtxFwoDbeE0EGWJMDgpkzWgGKLOT4mF1VG3tUNQrzEmOVfZXA9 +/WLopGMk4zAuUn45Bbsf49MYzYyWBTZ7I0IBaTFeQ+vFsGD8FphlKIJYX+gv0Lxi +KLPKbNnSAZVXveU12uHrg5p/710tU/BHK7vZiB46R0yuIbT3FJHzr+jGFUsyz3N4 +Ro8x6HlRL8CApNDgTxW5i7hxBRuB3j9iuv1hfB7N5HLAGymwHGzLwJWAb/FbUbEC +sbIvVW6GkUtkDvOREM9VyTfPp2Ix+unnRjGbm984zk1YGF/nq5ztTlwRo3pHrOxh +6BF4XPtSiG6tpA20hokrnMY5cmYbeUNUWQcnQXdwUgpfdvss5r6PRhHUz2UgZmRm +/Jpq4/TE54HCt6j+OWeZyFOHWXwgJDPdco3CgXol3la0wNT7bbNBO8M7ZY3J80Fe +7PkceQyyjcHIym2fSiJECUA0IdrovykMg3LXENDUcX/TuMzLqM7DMHzAnG4i4lot +hzh4MdC8MzLbiyNl/GKiJTsnhn8nzjAqFV0qSdwp6iSo6GdYbMoVewa3x/BPFLQD +gYCn3pHgIg== -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/ca.key b/packages/opentelemetry-exporter-collector-proto/test/certs/ca.key index e8b01e04ea1..1a770f08f8a 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/ca.key +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/ca.key @@ -1,54 +1,54 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,C088BF4BACFE1D5E +DEK-Info: DES-EDE3-CBC,356304F34E38896B -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/client.crt b/packages/opentelemetry-exporter-collector-proto/test/certs/client.crt index 9534695d808..f02b0ec1997 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/client.crt +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/client.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjAwNTE1MTU0NDM3WhcN -MjEwNTE1MTU0NDM3WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAyNzUzWhcN +MjIwNjA3MjAyNzUzWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZD bGllbnQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBAMm4t0aiZqouBsW/VilH/McgrMECz6RYMnAxAZVG0AwvlzZPMc46 -Vpbggpsn5j/N/teragpiqIwIIN+1apGXGmAg4IDgyrswq37Oj4JrvmzXWK1PGGFs -YpWISmNR1DKkEL8ts41KDEZejsItFYctnvIctRYPoYB+6No2iddj5gioHyq/yDLN -zD0c0C3r9tXm+Ed9BO4pgu6Rl6zuPf3sttE5eNa/O6qV1dD3nxnpPS3fIbXqKviD -+xhgXrfLM43X0QBQt6sPFuunpcvhWDsgtWMQ6EShQUhb0DXr6PgGXj/1Vl3nVsxP -4gnCOE5x13jzw/tqijbKin2+dpEGdi+c0QeVfDWoMZA9mlitZiLsenKdB8sYaoCw -QZHu3zzfXruMqA6x6DyLPa6PEFzw4v5PAvsd4Re0cLTBDsw1Fdx/eGzBg7k1KCFZ -HA3RdzNqCMvxcumH7hUg1n0cEtHX/bVSdpndK7iWVPbDYv98bFNOq8fZzsoqZgOk -Jl4TJyil/oPDkzowc8F8+p4vWdgHevjkqk5rtyMLBb6KnUmJgYPef7FuZ97oSi+r -TrAUs595+RZefDRdu5MGV/2NMbpN992Yewg7LTiP+gwNuYBDQmEYyQf0sxMNcwXc -ZVrWw+RdI8udSFowmOd/g0NNz3CaAXX8n6BLMJBBxRx0zet/88VFtLNrAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBADfQTBf/n+r+E6/GH3kyiI4jg0vIlkOlABsypKvY -iPXGTrtTlFB4s18/f0I416ez1U129OYyE2mUHKDKAUHu/Qf3Cl5N983DCx7czVJZ -Maxafe7DS5rAwF1wpfxR6u4Ti0gK0HO29bsCDah5C5+s4Vzv5t6AFmyg+ESQG6cM -vbkIs5nbcU1ydMdfvSb3vmjvPLh41lWnRVkkbjgzTS312EnHmqV3wIx12UAb16J4 -zXOjI+7JU9TZRnTEf3xOyByA5h8pCYha3nOlETR+vRN1byUYesCWsgj0wFU1u6K6 -AqSMU4sqtNIIlwN50CPLvYjB3FBPh8DpB5iQ4GxM636X06dQqQF7n4cWMOMHRlT1 -DgafEpVdxSeJMzuBQHJzF0UbyaAwKkDKGuAZWfihlNEUMdVm4EvKpE82cevM/2Mo -VEuPlcmf+D0ERu6bK5RAjXkH+cxYWXJGRtx823IEEgXOk0F4AMCaMiuNHI7buBi7 -AnBvIUv67b6FRS6Hw8sMDNvVTpavsnUKwSJJUATPU+rRIgD3Dl7SJ9XqmFdgPO+E -eRxvCCZvzEL77SLslv6CkKLseNQQ7MrOgTotYOrHA/AwF1GtFSDoYTRifKGynRPO -Vg3CscBOkIz9Plmy6dq8CEIygdmcN2Bb8BwA97q1epU4vzmx7fhqLLyMq+YztPRp -6SLz +ADCCAgoCggIBAKbADNm8Jv7nlNpSa3A+wAXr5fMPF2Uxum+7Hujt5XabfUiFOSEQ +Qj5Rd3aXxtjrXB102E5oeWJrnUIzRfn0ICRKGudpOgKRL22iwNlIuy7wYz2qa7Vy +jdwsP+xjn4sfWqiDe8ssGrVzQy8/XunoWy+NXROiCE5F51GPMKDrdtVkvvtKGQFe +ThjBP+RrT6dSOn7JCUclwQS/SPlhKopeGygBRtK3fQY5hb0xcIEvzp/qpRqOjyIk +VknJSvaB3Q52Bm8qVvHePkDa3Jg8Lg11G1E2R9zOG8eIQ2A78Cc8RJh5ltDiHHBv +HE4ToC5r0I4pPdwgZYzqI876fNK/4DXmhznUofSwGLx3ST1d0k4Vj+u8u5NvUGrg +9AE47RS0BAqUFQzqqMOjSDXw3rlYEaC0JMy2T36qil8Ti484cIOPY9+rqityAc1y +pbhbATrtf96UEeDQLdA4ygafUXWsutLMG2zSrrZxt2xW8f3H0ifsnICxNHbxi+fe +vAqCek23+iWH+i2tgflHbe7hPwAIByVaNylk/FLV4D4YQbG1hVZ+svex0APXWxLn +T1Z75vYmGhpBQLctyqtq0Ytj0gczEfwaaEXZBcuh7PMepQmBxEj2J71vfp2edowc +LWTWZ0+aBOUh6xTcVeWdyrmEsqrSetTgZxKYt6PNyXP8S93nVuJMCNupAgMBAAEw +DQYJKoZIhvcNAQELBQADggIBADZwq3V+Wm0PNFy02rJmo/fNpcjSmtVYA3BabQCo +KvayqBvm1QfwVzLpji0caZBnztVWf35nAQ0q51jZ/WjNrFg3/g6j8yzwPp7rX5Nv +88VKD2eekjj1wft93K40in2onxzaCchsLo2Jk6wSAt9AkGWM6yTnyvMSSjM3llu1 +m/5OGrUrEGFvjyBUSewBVJalSlMhXMb2PvnT3dzArYDWku+e1rkVSHff6sWrG3AC +D0xDN8JyeLTCfKoPeTsFgVqIz8GyGwenVERj2XrDMncM3o/o1fjT9clHovUVIBVP +SLM7nRB0oqVsau7Syq4xQJ0BZcCXCMD91w+DAHUi85X75C4fpRkaJcPB0oVqEog2 +ZtcyTE/aAsHJGwC7PEpgsQYOpApb2pnfZnhABb8pTBeK/dldrqIW3OJeRCzthh6w +N0p/pxfPXS2Xg5lDlSUoZNWmNObBOpBVevUlMJ+WhK6oFwfkfTbH7z0+o3k70XMZ +mb0R2nXIjZrbU/baGKOUVw9iqQNoRr5DBoInSFuuriTwyHU+O2MVL/UZCZ7TeY4o +5FyGh5+51eWqjt+uyHbJPBeYMoECj4S1PXbMvZSSqI+MR8RdUrEX0F25r60QjLe/ +ETKhZTeqM6GO8DG9WdlaWPDtZ08ZYrKgx4iIN1mu0ytYi0z8QRRvyJ9jBeLa7Lii +/0ud -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/client.csr b/packages/opentelemetry-exporter-collector-proto/test/certs/client.csr index 2c7d0f9c04b..234045e9ea6 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/client.csr +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/client.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDJuLdGomaqLgbFv1YpR/zHIKzBAs+kWDJwMQGVRtAML5c2TzHOOlaW -4IKbJ+Y/zf7Xq2oKYqiMCCDftWqRlxpgIOCA4Mq7MKt+zo+Ca75s11itTxhhbGKV -iEpjUdQypBC/LbONSgxGXo7CLRWHLZ7yHLUWD6GAfujaNonXY+YIqB8qv8gyzcw9 -HNAt6/bV5vhHfQTuKYLukZes7j397LbROXjWvzuqldXQ958Z6T0t3yG16ir4g/sY -YF63yzON19EAULerDxbrp6XL4Vg7ILVjEOhEoUFIW9A16+j4Bl4/9VZd51bMT+IJ -wjhOcdd488P7aoo2yop9vnaRBnYvnNEHlXw1qDGQPZpYrWYi7HpynQfLGGqAsEGR -7t883167jKgOseg8iz2ujxBc8OL+TwL7HeEXtHC0wQ7MNRXcf3hswYO5NSghWRwN -0XczagjL8XLph+4VINZ9HBLR1/21UnaZ3Su4llT2w2L/fGxTTqvH2c7KKmYDpCZe -Eycopf6Dw5M6MHPBfPqeL1nYB3r45KpOa7cjCwW+ip1JiYGD3n+xbmfe6Eovq06w -FLOfefkWXnw0XbuTBlf9jTG6TffdmHsIOy04j/oMDbmAQ0JhGMkH9LMTDXMF3GVa -1sPkXSPLnUhaMJjnf4NDTc9wmgF1/J+gSzCQQcUcdM3rf/PFRbSzawIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAFjedQr52vLv7YxeLxIvyHrMhbx7Iz4ztj3NlnOJ -EMGm7pcum/rGol1z8m7Y3mFbfJJp8IY/jn1w92x+M9pc6zsRo9MsKdqEAKhAjwVh -jYNBWHekrcwGIy6YUSFvZeUZ82IxFcf6N70CH4sLUJLbZXcd5Nui8mZJCPC4SLoC -E51P0vUClnS/l4O+Dz/IfBy9cSvGg3YvF8GGmW7IZdTD4bWg9O8lQi0zcnDGR0Er -N1Tegoe38Mrx49IHpWMEQzJhI6R22CQ0wtk6e8oBuz2No8hnY0yrAvBGI9v8GUE3 -FJAQxHzyUXCA50IcHFruevsgEzixmYb8OfDd1LC3nZJHfq2r5j0jOU6XXxukH8R3 -UyGIf8UpJQqBKHe0Ld0tOWSyByiWHvw4/Nir/DhANezIEsq4A0Y9hq6y2GTtFUnx -HdsYqTmVlrghBiqZF2H9f7YWaRBnsbu6Kkpyc55r8pBZMT2Myu2Gjq/8GAWtEy1J -BYmQfIZUnYksFaZiXvSiyfNaX5M7nvddxkBCyhtwtCzVutL+ZoqwXD2PPaUCuBbu -lu4M7iSjKiibiCqQEVyRPn2o8V4R5r0NmqS+B9CYJECeAnLPO49Z3l4wdJUEww9i -U14lM75e2tfFzaa/ZqOCQFuu84NKacTJUALpdg1aHcPtTG51F2U8EwsoZEBxUBb+ -WR7X +ggIKAoICAQCmwAzZvCb+55TaUmtwPsAF6+XzDxdlMbpvux7o7eV2m31IhTkhEEI+ +UXd2l8bY61wddNhOaHlia51CM0X59CAkShrnaToCkS9tosDZSLsu8GM9qmu1co3c +LD/sY5+LH1qog3vLLBq1c0MvP17p6FsvjV0ToghORedRjzCg63bVZL77ShkBXk4Y +wT/ka0+nUjp+yQlHJcEEv0j5YSqKXhsoAUbSt30GOYW9MXCBL86f6qUajo8iJFZJ +yUr2gd0OdgZvKlbx3j5A2tyYPC4NdRtRNkfczhvHiENgO/AnPESYeZbQ4hxwbxxO +E6Aua9COKT3cIGWM6iPO+nzSv+A15oc51KH0sBi8d0k9XdJOFY/rvLuTb1Bq4PQB +OO0UtAQKlBUM6qjDo0g18N65WBGgtCTMtk9+qopfE4uPOHCDj2Pfq6orcgHNcqW4 +WwE67X/elBHg0C3QOMoGn1F1rLrSzBts0q62cbdsVvH9x9In7JyAsTR28Yvn3rwK +gnpNt/olh/otrYH5R23u4T8ACAclWjcpZPxS1eA+GEGxtYVWfrL3sdAD11sS509W +e+b2JhoaQUC3LcqratGLY9IHMxH8GmhF2QXLoezzHqUJgcRI9ie9b36dnnaMHC1k +1mdPmgTlIesU3FXlncq5hLKq0nrU4GcSmLejzclz/Evd51biTAjbqQIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAKZZVROndJS2TZj/oyaEXjg3+vsVxve7JnlGFiQR +4de+ISUnRTJrTmdN3ocaRRjTp/I7VyIfvQf9chDyyjNz90HSvWI9PntzWkFY/Hk6 +eblj5dPftZHSWhpkNVdjI9tZEl6IOi0uyIzskPDQqm3VX36RApbpO1KglGIANpYx +/DKzt3k4go82u51pKA+KnCaUzI6CqNAsHW1nMBc2zunzBf6hfnlBJ+FEKkz/4Hje +5hR0+QLQr1I8jkvUxN3Qjd7mZJfCLuZiinYejStUs3r8KRA3ZIyPV+4tHqcSTC7J +aE20KCQT8iMYBfMZ3BvMZQYbfheTVeMlQSiOqP5iO9IOoAmgAfX+LNsf0tZ6pBgS +03b+tXZ6GL1qDuAZSRMbb8DmUbBoQI2b1LnP0v2fxe8Cuqm2UJLXBZXY6tOytE8j +ReTSX7Y37AVh17zwNPOOCoJtzUWzEmx6nvizlsB7DBTlbQ/tAKcBubCjTSn2A6yL +ibb0Q9Szjuz3q+zugaYDGEFkK8vjiTzpzpj0wH8VH18q16DcJykBGC1OTTgM66FK +8/toW3ocgAjHPJvd8TxWFaT+hM4VxlFST1Y7/oBnQmSVLtv/6pUGRZsV1ByfPBnD +Bvn7Dqcs8mtZOnw6XX7gQ/qmfMzzE5VQnHh4iPvZ7ULvEgVcz6DbXjjGgEhQQcMq +s7bV -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/client.key b/packages/opentelemetry-exporter-collector-proto/test/certs/client.key index e0fea66664c..f5ebbdc6258 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/client.key +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/client.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/regenerate.sh b/packages/opentelemetry-exporter-collector-proto/test/certs/regenerate.sh index bb6ec4a9b52..728c0cbfb3f 100755 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/regenerate.sh +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/regenerate.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # # Usage: regenerate.sh # @@ -7,13 +7,16 @@ # It also serves as a documentation on how existing certificates were generated. rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key -openssl genrsa -passout pass:1111 -des3 -out ca.key 4096 -openssl req -passin pass:1111 -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" -openssl genrsa -passout pass:1111 -des3 -out server.key 4096 -openssl req -passin pass:1111 -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -passin pass:1111 -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -passin pass:1111 -in server.key -out server.key -openssl genrsa -passout pass:1111 -des3 -out client.key 4096 -openssl req -passin pass:1111 -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -passin pass:1111 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -passin pass:1111 -in client.key -out client.key + +openssl genrsa -des3 -out ca.key 4096 +openssl req -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" + +openssl genrsa -des3 -out server.key 4096 +openssl req -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" +openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt +openssl rsa -in server.key -out server.key + +openssl genrsa -des3 -out client.key 4096 +openssl req -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" +openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt +openssl rsa -in client.key -out client.key diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/server.crt b/packages/opentelemetry-exporter-collector-proto/test/certs/server.crt index 62f91722a93..8e76b7b4a62 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/server.crt +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/server.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjAwNTE1MTU0NDM2WhcN -MjEwNTE1MTU0NDM2WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAyNzUyWhcN +MjIwNjA3MjAyNzUyWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZT ZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBANQwHRfyj/d8Hh0qgDlxdtSxloRs8ZvBIwt6Accd1hUqs8dC0c9V -5XXOcfmusb3Fo8NKXn6IIPCEy1spFCe4EBW4obSgkJEVdPwsMsXUPLek/6K5S6uE -FhnGLUJJ57gAjh9LGdMTDp5szLO7dTYrHzdGZYhmTAyiA9JDN6iYlpWkK4p2IBcN -diu26KWp9+sJKw8Ly/7o5QD4wyc6hGok0v0nwimXZo78EJYBu6BDGuLyAgvq8zLV -sgXi4aYROsmVrg2IJbe8+PtPBNwkoAuR4QC3hRTV3bXyZdbIC0KbOekegAHTeXYz -Ap0HVkCsb/vOLiGuju/mKZFZKp5/PKf8Jdv/zDTIm8TwBvvtQKT4qmAYUkKTXRrO -OWK1pCakVLV7FGREDi+/bxhcQJt5yopLGT5NSoUF3RR+17KZ/5lSPEh5OMSprVyR -789KvY1z79JWt3zB6fIfQ936PyNh++SKxFmlnLuGK5wf58jefwSjGEkY2YAE66Y6 -8Kqg3/W8JsjTFBntBtD3xY1t0c4Hh2f3epQPrzwHx9pywgh+H2TIwnnUyEPLqdYp -SEsbnvdbLB8FZm2fwPZ1MZOZOGrKcnCMkMPE1DOIkxeFDx8xbeHRepSRJSbemY1l -tt+afAnM18mJf36gO8NnM56Me//FSTWbWaQlmUBAwSDlHxYfD9TgCjbBAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBAEt57zbZpIaQiw0BvZenLWhWvBA0j1cFk7eVG+Nl -Zo7+UniFH+1Io/gXJaJmJZ09d3ku4ZB+V44ka1N9J7qnnqXYOxRGT2H6owaWeOLl -FQ8tR1NQQA7p2uNWJclBsuPghzRCSFZw2auu8OKRtM/0VgbskNIN+H0EVhEeYjtd -ZzojPoa7AmH7P4SC1KMvY6qNmab9F8TBD19DPfoA/EpYboMQiK7DwPPuvrAdHcJB -KPLxyzabqFEqouwStqKUmKqbASOR+qJNac/RQTbN6yP4Lu9wTUm1OYaR4ot87dOR -ZhCznzlaJ2DsvFuoOKN/7Bezq+rXhIyCrH9VH0PjWwbO9FIfeZlHgmAmJnJCXb6F -bW6m+ha/63kiPU1NlTJRPukcR0vW/P0XSOcRvvje/07uJOOG5ypnQf6k7neR5e81 -1ZHPKCHba7bh08vKW5LbXwU4Ng7vRc42h6+iN0mogjj+B2oYt432L3howc8np2vF -eLCRxq/9pRut2QkfivT/GHkV/J+RxoEFDrZrTd15q1mLQnPCJOT+QmAMPfZydyZM -FsQUd6kzEWgZ4dHKqEikC0IBG+2xrrvHgKiB5Y1o0K/hEFfQOFCct6c9thXqMYhA -w/2HXXjfWLVBbGjJ4VemU1YFKyMZ+mxM1sJmPc/KkG/NjKf9wFFwFRpT3OIlF+BK -u8P4 +ADCCAgoCggIBAJqjWwLE9Q+qc8xBMQnif6D8GoxRNGzHQlW0lxGmx0OK+irwBqNC +gdmpjn9gKh4SkJL179W7r2pyc7zZw0wzl0Up/4rHb+Z7H55shgmMaxI0pxLdUUwf +0OsqOQWE4sUE3ku5QIGX0zw1M9RuS6wDphZXXuvhMH8+1sZXsDQE40eAaTGUln9k +l7ZBKpaHgMOp+sTHSpkncKXW4ZhH8F9jSCgHNrNCY8R2PiEI2nB1iIAO4B4AUHYh +9X8O1Ke4eAxG7AEQL/QskErX0Y99oBsd6YzOliVBHnIrLerCGnjpapHI9QqeCUI9 +ToV1AiexBCS0O7yHYAhHifZ3GTBM2wNpK0A7sIWW3fKBGEKlf3K09kTbxMNjRaeZ +r5cryJubFrOPu5cqqGqzA8UGUyCEEE//p+PP2Csfb9bviHXzS74jC3tD0cdJw+rn +xvXd71FuhDMjJBnkJwyCBXzlrtbcHVF5H0DHfuUmVffE9BvfeIGzkX8B2ZxFtxU7 +40WEml1YU06jfEmIlojBDOq0Py5BoPAvqEvFOHCzECszkJrjQbEdGWepeBBliXPa +YcEWR6K13PhmDqm/c99x2hpVl8dyAWK5dX86DVtTsrIBz6rgitAN4kPrl5eWVmZp +gf1VFwFZfEjS4SOV/qxbkJDls/r+tD6JhlC1dNT+XVooVq/DgON+Zkk1AgMBAAEw +DQYJKoZIhvcNAQELBQADggIBAFmiQCJLSCLoH/sUbjdcZo5R96jGaaqodv4Prktv +aJ0ruWxLi3NJumfKlHoQZ2oZHU3Ujw0U3G8jHtU3V9v5ThIOMsUl/MY6qQJCaO0V +4QvEWvFJ3GwyZvnd/xDFMVGcRCmwehQZqyFpqCTJ2KTTRKIoxkj7O0oboWlwNpVQ +7/pyIWRvdB7AE/ldY1KuHn5Oj+nXMacB23zPcJ++IHAcL8AlHjrKmskYlqpswWON +xuwG5ilWpLYeoZ3WP1fxG/2Xoe+036eKEXhRHECb3fofGDXZ0ElPAqpMSH/hS2/l +1Eif+p6vy8np9zqSsFmEq74uRPZo7TrBKa8FYufCkB5VxOV31SaP8yj1G+nHCVa1 +O1h7uI7IQpSLsrEldf1FFkJSy6F6qx17uremRUpEPkfyi1/t3vjWPB7wZHetAho4 +uVDBbo85CsM9eKPr7ynWJzEEbefLKRxdpKp/cUvxMxDxZeEStGrIENc4qNYQN6aR +fc3WrczAoOsLMicSye21n7j0OApz+TnbSgt5+ane+oSschiBmx1LaJLFkDTiKA5w +h+3sws4I8dL0YTdtdacPZgtuLWSjN0xTdhD7idfqatrQA5bTJjoTnEBmdIUVp8X4 +wOo03t3lf+LQDjIHps41Mo/BVSqZbWuXA53rfxQ49JsGfoUfm3L1domYB4tlTWRq +s2Wb -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/server.csr b/packages/opentelemetry-exporter-collector-proto/test/certs/server.csr index 967316e1713..45c77ba43fb 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/server.csr +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/server.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDUMB0X8o/3fB4dKoA5cXbUsZaEbPGbwSMLegHHHdYVKrPHQtHPVeV1 -znH5rrG9xaPDSl5+iCDwhMtbKRQnuBAVuKG0oJCRFXT8LDLF1Dy3pP+iuUurhBYZ -xi1CSee4AI4fSxnTEw6ebMyzu3U2Kx83RmWIZkwMogPSQzeomJaVpCuKdiAXDXYr -tuilqffrCSsPC8v+6OUA+MMnOoRqJNL9J8Ipl2aO/BCWAbugQxri8gIL6vMy1bIF -4uGmETrJla4NiCW3vPj7TwTcJKALkeEAt4UU1d218mXWyAtCmznpHoAB03l2MwKd -B1ZArG/7zi4hro7v5imRWSqefzyn/CXb/8w0yJvE8Ab77UCk+KpgGFJCk10azjli -taQmpFS1exRkRA4vv28YXECbecqKSxk+TUqFBd0Ufteymf+ZUjxIeTjEqa1cke/P -Sr2Nc+/SVrd8wenyH0Pd+j8jYfvkisRZpZy7hiucH+fI3n8EoxhJGNmABOumOvCq -oN/1vCbI0xQZ7QbQ98WNbdHOB4dn93qUD688B8facsIIfh9kyMJ51MhDy6nWKUhL -G573WywfBWZtn8D2dTGTmThqynJwjJDDxNQziJMXhQ8fMW3h0XqUkSUm3pmNZbbf -mnwJzNfJiX9+oDvDZzOejHv/xUk1m1mkJZlAQMEg5R8WHw/U4Ao2wQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAIBAt/12a6kkCFaRe256Umrj3/2DPA+gVqaVwlsi -xEGuO3GpBv7D6+lrlwNhLLSFOEkqoB4t/hjfGyabENXrCgyjMEoq/YKfwJvO4FPv -UkjaEWsCxmuwTS0qm8gXQy9PAwSI8EF2jOoRtvpCXl7bDQRJRIgKwZFI+jCEZvgj -Sk8fZGOH9yPEjx0KpvEw3jl/kbdSJu+CFTr981yLKjeG0lMknc/sQwH87tco4icj -t2Deaow6UOc0VaTmsWMLwIWrG/5TQPj+tL/600mBs5iQCOVio+hbzOHmDb48Ztao -CD4z8w8PAHxO79Vx0Wjt26cl6pKL58uke3G41Aq8//YLpSUUvIx0bYOwobDd4Ev5 -Emklvmcf3hAAzVQ7g8kDD82RDPRKtDl6e26+q2MQT31HuGbKB+5xpi113dSoB2CO -NSAgn3heoj5OM7heKwh6p6j0r1gT8WjXDMXQdKgekTGaUxeOSmccvMk4U0LN3JpK -JqaH178OucI9aRxGVjQFErW7xbKOViHP+NxNKj1pnerd7PX0wF/g107v2eSb6l/5 -K0UsM/l7MsINkx/1p+Qqu26t3i3Azw/MxKJqOVAlcb2LrACBj80BXBcJLW/My3kY -0XzK1siVSL17lL4KYBLO7kVR3F1+m+aQPrYJsLEKCAGxsfiFRBhXa6pfvp+fd5Hs -/xFM +ggIKAoICAQCao1sCxPUPqnPMQTEJ4n+g/BqMUTRsx0JVtJcRpsdDivoq8AajQoHZ +qY5/YCoeEpCS9e/Vu69qcnO82cNMM5dFKf+Kx2/mex+ebIYJjGsSNKcS3VFMH9Dr +KjkFhOLFBN5LuUCBl9M8NTPUbkusA6YWV17r4TB/PtbGV7A0BONHgGkxlJZ/ZJe2 +QSqWh4DDqfrEx0qZJ3Cl1uGYR/BfY0goBzazQmPEdj4hCNpwdYiADuAeAFB2IfV/ +DtSnuHgMRuwBEC/0LJBK19GPfaAbHemMzpYlQR5yKy3qwhp46WqRyPUKnglCPU6F +dQInsQQktDu8h2AIR4n2dxkwTNsDaStAO7CFlt3ygRhCpX9ytPZE28TDY0Wnma+X +K8ibmxazj7uXKqhqswPFBlMghBBP/6fjz9grH2/W74h180u+Iwt7Q9HHScPq58b1 +3e9RboQzIyQZ5CcMggV85a7W3B1ReR9Ax37lJlX3xPQb33iBs5F/AdmcRbcVO+NF +hJpdWFNOo3xJiJaIwQzqtD8uQaDwL6hLxThwsxArM5Ca40GxHRlnqXgQZYlz2mHB +Fkeitdz4Zg6pv3PfcdoaVZfHcgFiuXV/Og1bU7KyAc+q4IrQDeJD65eXllZmaYH9 +VRcBWXxI0uEjlf6sW5CQ5bP6/rQ+iYZQtXTU/l1aKFavw4DjfmZJNQIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAI6upPY4cjckMgAGj5NvhP9vWykUUzQZyWHDK052 +ruSo9PAtqCJiYQwXu//8uOjfrDFcOYiET1cpZVPdyjRpfoGMtNje+ap4969UQsj6 +UXvFYgNTSnjBr7nKySH6SamfBABeu5+TjID/jyqFMpepk++GuWRcYPnM1GHObfGm +hRd+3gYbF3m+KA0qrBIoFbHstLkFaLs84Lf8gzDt48ZoN+9QjQKZZtKZvpZXlsag +6FsYcp9o+h/bFIluUINLs8oTfElml3y1G8IMCyNskEdF4Zi65Ml+QaXIk7SLN29Z +NlSZEwtDNJQJB+hOBtIC31cs53l0s7UtdaX6UjyfwswxWsUkvpPJDRs5beC2IUgM +W+PWwszK0BNFvmzGQ4KKWGDLe4YEf5Ss4grIqM4Kf6tpgicuZVyc6wHkB8secJR9 +JftUHBaHazaJFzd+oaQ677cd+Oj74Ht1qGKFmKykPS5GmQfC1CMMj1AkBmh4BnQg +oEdT8xpvhzEBaygJr7v01LViRAAFtM46vW4VkpCMxNSzIymlX8/sszlVChjWpWdE +lMOtlUQxtigbVqYldDx5AmFgGZyKTSi5GaoB9qVLr0tU8c/FodvgUuuzgAZfr3BD +P12EezgueK1oF2z7RCwfgKeEpjGq8wfNzG6AF/AdJGUiHk/yrlcTTLGORH9beBZh +CH0X -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector-proto/test/certs/server.key b/packages/opentelemetry-exporter-collector-proto/test/certs/server.key index 4831771d2b3..b00ffb89bf1 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/certs/server.key +++ b/packages/opentelemetry-exporter-collector-proto/test/certs/server.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json index cb4f5587ab0..cbc7a786652 100644 --- a/packages/opentelemetry-exporter-collector/package.json +++ b/packages/opentelemetry-exporter-collector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-collector", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,13 +54,13 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "cpx": "1.5.0", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", @@ -82,13 +82,13 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/metrics": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } } diff --git a/packages/opentelemetry-exporter-collector/src/version.ts b/packages/opentelemetry-exporter-collector/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-collector/src/version.ts +++ b/packages/opentelemetry-exporter-collector/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-collector/test/certs/ca.crt b/packages/opentelemetry-exporter-collector/test/certs/ca.crt index 455c498aa28..529ce2f7b86 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/ca.crt +++ b/packages/opentelemetry-exporter-collector/test/certs/ca.crt @@ -1,31 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFPjCCAyYCCQDSzsM0Ou9GwDANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJD -TDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYD -VQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yMDA1MTUx -NTQ0MzVaFw0yMTA1MTUxNTQ0MzVaMGExCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJS -TTEaMBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFJvb3QxDTAL -BgNVBAsMBFRlc3QxCzAJBgNVBAMMAmNhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEAs1AVbpZ642HATrkqW0WpzsOAne677zDftkvIhWcto3x+nwP6kSOE -vHtPR7xem9Yl5LUy1aDpd0WnBSke1JIYdJCAmmlitFVShrpolGRb9MqYJPXp5FfH -OFltziG00/MSKwNv7GiwN3ehyvzfS9L46mCcUWnQLJkjkThvlV0JRCfaTBRF3m8M -fKYvQ71G/9ZwbRvRqPCk8CZmzhqKLvRFBmzM2FGj0CY5fFqPcBRM08MWNkxAR/4B -IGKTaz5qzaFEvxHgQMQaXOQZYeNwiCFBoGygOId96x8GX9AT1PwW2ltMU3rNtVCf -9xu3JUREHjkIReNqM9h1qq5YIfrEQYeM1Q5Kyr3+Bpj6EhZqGmfc37z/nootxG3z -VmYZ4+z0zx24s117J7CfD2OLL2OaLyWheXXYqB0gOgoTwwwTsB5DYOv15fjsqs3F -kuYR/hbxs1GQO9RcOmlvynIleiVkm1x+UmOuIltfMjolBPc7ZKKxjlAxbC4oY7Za -3th3UkDIVFJmWsJhj+z87qLq0EW4m5UYV3uIUDN4P6Pko3iTqKG2qUtnnhrlbvhd -/YfSCWJRMSlgCfKFuhGkiVDEpJhza5LxNeM2EYD/PIydotyASw2Btp+VowC6yDJV -yR2cTVEGeYxQXpOI0wqJT8DrhWsdAqioLtaFxNJkdTKWAbfC8MP5wp8CAwEAATAN -BgkqhkiG9w0BAQsFAAOCAgEAP7u8IlEOTBrL3OISH9vUqFbiRdTzPfpFJ2ZVxM3H -C4iLdndKVmJLRJyMeGhD/kEnTMmHrt/mZTw6tI87+PE1ZMqSe4+q2NlHz0BouiQa -ukGj+OzZ4gw+IlDfyiXtsggCb1dRZldGoddiP8ldP0ohvR7nErG0RrRuBp860yPD -qBzItTzpC4dNVBbOBf+m9T914dsznFKlyU+QSVA2TXpJnmfEKCwlyk2gVH9olQlG -ND4cBdnOnarV5eflIj+LXjZh2wt/F0qLpTmUmxEyCc1M1il+hC6hnbarzin+8Cxu -VqjKzG7KcLxlWx9wj6ruBA1kPL0Jx31c8wDJ8b7HtsDzehcwrKKnZwA3qs3r417c -n7Dddbix9Gxxi2MTY83Q3MKbVj+oKxz0wZxa29fvlf3Gv98wzSMcS2cK+bjQwwuJ -WQxH9KksKU6g1Dv3fVz2E5CP9gwHaQBVBNSKxlqQsB2nhNglpigmglCKrfX07c7x -ryzoDE1E7tYguyWa4W+LFJ85EirUkGIBL7IoGCsol/elF6noGiuaNMO3KsWmp/C6 -YsXQJPWrnep93CCZdZ7bY6L6BTPdz1RaXMh8Rc65MlIlTzxPnhFTYrXz/FlK2uv7 -lPvT0+cGOvuiN26vqfKnrid1I2theKhKDWSdv3Rshg0ZJatNWS0u8gTE4f+qCjHP -9CI= +MIIFozCCA4ugAwIBAgIUa6OxgyEYxNjpjac0jTAKn+IkGTYwDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs +ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE +AwwCY2EwHhcNMjEwNjA3MjAxMDExWhcNMjIwNjA3MjAxMDExWjBhMQswCQYDVQQG +EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w +CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMbVyp3NCtDwKpGbV+MCML63o+vGVhpd +Dlt3ncpcwz0FMK6UJDXzTe4joKCaezWto3Bmhb28Lezcf8AdzmTdnoENAaqUX2SE +giGVoeaJ/M1hW1IiOffa9zIMkt6cwf8MUUMl5kTRMdAqmpikNqN0rqNpaGuqBYf9 +kvDy3hw+dj19hKEeEXI2zt/HYDOBHYgpalWiOS8qwj0zSfxAUeura+eXKMlx0JOY +h5N25OUH1oLt1flhyuHnwRThKbvyMnL36Ey+G7uCFH0hQSGO0BLhg1LPDWG1PmTn +KzsvqaIgDF/tMCXykvaWcsSxrhvsNeOFFmmkKp1ECVOFgFYsGuK8lJlEvm6Owrvz +4X69L0phCJtaCCaSUFdybqx+G2ZKLZNqTtnMw/3YECp37KyrRd75Gy1UrU031+XC +Fpt4pHw+3isjAOf1bj32F2Ed7aaqVqM2A7m8AgA0m22J/f+jBzmv6UJN/kvfFXzC +0lbX6b1fGj49vU9WEO/o+F3qaH/c50HPf45AB2d4pWbDl5alXZei58ZyEemBndlv +XcGPtVR9S/5rphlX1vAIOT7ePWgUVkAi5fB/rLVGyC1FwA0zYvdyj9CVigJNs29G +yftsvMynF8TL7/qCIGNz72qtW/Pn227OI4WamvYhX6fJwJirXwTEQhAfKXljocI/ +Liqxx15Sfs+3AgMBAAGjUzBRMB0GA1UdDgQWBBSMocah0cTqX4owoPL4+zV1pe5F +QzAfBgNVHSMEGDAWgBSMocah0cTqX4owoPL4+zV1pe5FQzAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCIpnaYSMXT+nrdOgw2zKHTk47wANGf6nfK +76VwsQfzVkJm/tzEgq+saEznGRW1ttdQfXHJM3NCfneVhjXDkihrHsxiL4S+5OMq +cusp2tKupGXlxwOt7tsAhH5j4SQLyEUiWMmm/Wvwtx2HWuNO8LZGhoAcUrT7r94f +vqr3tYyb3D06/rBRj2QcybYGJHsQAULEQvmWJvCveh5gqxkRjDJlwmqV/lIarPCt +diKbsZqHJMNaRMbgsxV8hVSvD6RKtBG+K8hpuHF2ZKfzb7Yt1IDPtUGCL811ykzh +2PjumjaQ2JCP6vtYAhTS1r/+cbOi+4v5JzF+kxHxFc9vK/gzBT88174S2MQaqwhF +jQiS3YfElLXkr37E9gxMKLDanbFsxPPiXO96s0RSjNK2mzSbz/gfmsjGqxKNq3t1 +IwAfjePmmx4FJ1O/FwOA5RWE+KRhzNucktjxz39oZrnqtPeTqHnAivNOyK3XB68v +5HRjP79TrzIbLCauyJD/qM5UtCRXW2La1rsH8lIBtcxUcZOkvDnE6Po44D5hH2kQ +swRqF9Vy7PL9MWJPTgn4+WFLNoBe+nMY82y7xstRv7c2ctXpAxSWxIXgBN+B9nXo +3Lqpgg0UkjTiCp13Mejq/7DYAw+/Ou8bxWs3BuCQvFcG2+FBMWh0dL1FxVq3BPyq +oveTgr1sfQ== -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/ca.key b/packages/opentelemetry-exporter-collector/test/certs/ca.key index e8b01e04ea1..df94d44c380 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/ca.key +++ b/packages/opentelemetry-exporter-collector/test/certs/ca.key @@ -1,54 +1,54 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,C088BF4BACFE1D5E +DEK-Info: DES-EDE3-CBC,7EE0C188F59416E9 -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/client.crt b/packages/opentelemetry-exporter-collector/test/certs/client.crt index 9534695d808..b1519dede6e 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/client.crt +++ b/packages/opentelemetry-exporter-collector/test/certs/client.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjAwNTE1MTU0NDM3WhcN -MjEwNTE1MTU0NDM3WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAxMDExWhcN +MjIwNjA3MjAxMDExWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZD bGllbnQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBAMm4t0aiZqouBsW/VilH/McgrMECz6RYMnAxAZVG0AwvlzZPMc46 -Vpbggpsn5j/N/teragpiqIwIIN+1apGXGmAg4IDgyrswq37Oj4JrvmzXWK1PGGFs -YpWISmNR1DKkEL8ts41KDEZejsItFYctnvIctRYPoYB+6No2iddj5gioHyq/yDLN -zD0c0C3r9tXm+Ed9BO4pgu6Rl6zuPf3sttE5eNa/O6qV1dD3nxnpPS3fIbXqKviD -+xhgXrfLM43X0QBQt6sPFuunpcvhWDsgtWMQ6EShQUhb0DXr6PgGXj/1Vl3nVsxP -4gnCOE5x13jzw/tqijbKin2+dpEGdi+c0QeVfDWoMZA9mlitZiLsenKdB8sYaoCw -QZHu3zzfXruMqA6x6DyLPa6PEFzw4v5PAvsd4Re0cLTBDsw1Fdx/eGzBg7k1KCFZ -HA3RdzNqCMvxcumH7hUg1n0cEtHX/bVSdpndK7iWVPbDYv98bFNOq8fZzsoqZgOk -Jl4TJyil/oPDkzowc8F8+p4vWdgHevjkqk5rtyMLBb6KnUmJgYPef7FuZ97oSi+r -TrAUs595+RZefDRdu5MGV/2NMbpN992Yewg7LTiP+gwNuYBDQmEYyQf0sxMNcwXc -ZVrWw+RdI8udSFowmOd/g0NNz3CaAXX8n6BLMJBBxRx0zet/88VFtLNrAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBADfQTBf/n+r+E6/GH3kyiI4jg0vIlkOlABsypKvY -iPXGTrtTlFB4s18/f0I416ez1U129OYyE2mUHKDKAUHu/Qf3Cl5N983DCx7czVJZ -Maxafe7DS5rAwF1wpfxR6u4Ti0gK0HO29bsCDah5C5+s4Vzv5t6AFmyg+ESQG6cM -vbkIs5nbcU1ydMdfvSb3vmjvPLh41lWnRVkkbjgzTS312EnHmqV3wIx12UAb16J4 -zXOjI+7JU9TZRnTEf3xOyByA5h8pCYha3nOlETR+vRN1byUYesCWsgj0wFU1u6K6 -AqSMU4sqtNIIlwN50CPLvYjB3FBPh8DpB5iQ4GxM636X06dQqQF7n4cWMOMHRlT1 -DgafEpVdxSeJMzuBQHJzF0UbyaAwKkDKGuAZWfihlNEUMdVm4EvKpE82cevM/2Mo -VEuPlcmf+D0ERu6bK5RAjXkH+cxYWXJGRtx823IEEgXOk0F4AMCaMiuNHI7buBi7 -AnBvIUv67b6FRS6Hw8sMDNvVTpavsnUKwSJJUATPU+rRIgD3Dl7SJ9XqmFdgPO+E -eRxvCCZvzEL77SLslv6CkKLseNQQ7MrOgTotYOrHA/AwF1GtFSDoYTRifKGynRPO -Vg3CscBOkIz9Plmy6dq8CEIygdmcN2Bb8BwA97q1epU4vzmx7fhqLLyMq+YztPRp -6SLz +ADCCAgoCggIBAN1or7F+548RpVIgdrzYmuWgKMfWsO5FhgqpGp+xuoVgMMTlZM3i +yiarMnAE0G6ZVMwqCeXkiUGL9QLatJ1S/HO2sWLUkWaPD7X7O4k1yGtl6UsRcr4K ++YBUbucxfrCQjaWKlBc1GMBrDyY/u/rl0CIYu3GtegniN6HG6rBXC2e98DVctQ3M +r/RXB9DWqMC2KW2X92X+FyWqTfGjv8wjRnhQdDNXPA/PCembzhfCL8VlmG65rDiz +VQxiTotTOCmaxULdF307jorMTLIHZVV2OnAA/udeDcxITnKcksLiRKKAiHUXMIPq +RGxNtLX1sdBD/FoQ28sr8o6Ko7qb3uaA4CZhp2I4RR925oZISyObzY3QxrlafN4g +hFnWkTFJY0K+43cxta8K3gAnQXxN/BANDEydS1YM9adqYbt09wctSUjMqJHGZWnn +IVOged+/DEIW9EmyLSPM1DC1s1owOrgwBXzHRRNXuUFjZPPrMC8TkBexNjsapLjr +nE/xa5cB80DIntkM8ysfLU6p39NihM2hmeyI2YS8osheElXEL3dz5vM8Wzv28qgF +PvGpdYz6cAibE9qJ+oT416dVc+9G6i1fcBl7X8w+KUGVFsRnftovwjoSToGlckqg +dv1Tsf6FBDpSMro3BbGogpDhkSxy//eWvzejjHBemz06Kh2DGkKhnT9rAgMBAAEw +DQYJKoZIhvcNAQELBQADggIBAIGWBdgWOoqGIy0fuSbqQgjgrhDrPGBV15TfvB4T +84xfk9YZxdRKkG3J65uLffTnnotZs6gqLx6MfosR6zQYhSK27fTXpJJdRaI55kgT +2e/xNCe867Bz/3nW+vwWIGTuFn6hFq9f8HNLZMpHu3DClj7AB7ga6qp1uFWIn5oq +xC4da8/JTR6FY2srIktyH5Vr64FnhtX9cLSa/U7df7asZjRUm6ndPS49X01G6BJQ +vH0RO1caCCbpDVqPwJnAf3BXD1MkKsNe4hULt25XCxSsyM7v0Ru4KcSSGxiYHowQ ++VzRdJVYe8ytpcg1eVlWutOlDXGLaeGNQ0/u5OEQ8iqZvp1/qiq/LQIRZlxa+ZlL +vsVAgOxolRpm6W01cYCCWX8utsrMq8lKjMIal0SZhj6oP/rwtH8UVRhqhrQyAn6y +K6IYGLGvXGacJYuHpcAFQ0f8LUCCs0kxN/zZOZ98atF0MvgUWKZFNgrvcX5se8iV +kS/7UHH4Ie9ZO6Hv9IvnElOfZY9dnFPNxcbWnA7U0kLa5CWh8CD55ScAGHrvcz3O +JXPW0SHb2xZmXDTfgmS4vMI5PYDyipSCoUDClA3BPr/dkAVssj8SMikJZWhVvDrK +IcKRHpkmrzLJbatxeDNlCtLRSAXeuTheLqqSA2HACReNYkQLPd5V7mY6uRw3d3o6 +3rKe -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/client.csr b/packages/opentelemetry-exporter-collector/test/certs/client.csr index 2c7d0f9c04b..2d99fab566a 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/client.csr +++ b/packages/opentelemetry-exporter-collector/test/certs/client.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDJuLdGomaqLgbFv1YpR/zHIKzBAs+kWDJwMQGVRtAML5c2TzHOOlaW -4IKbJ+Y/zf7Xq2oKYqiMCCDftWqRlxpgIOCA4Mq7MKt+zo+Ca75s11itTxhhbGKV -iEpjUdQypBC/LbONSgxGXo7CLRWHLZ7yHLUWD6GAfujaNonXY+YIqB8qv8gyzcw9 -HNAt6/bV5vhHfQTuKYLukZes7j397LbROXjWvzuqldXQ958Z6T0t3yG16ir4g/sY -YF63yzON19EAULerDxbrp6XL4Vg7ILVjEOhEoUFIW9A16+j4Bl4/9VZd51bMT+IJ -wjhOcdd488P7aoo2yop9vnaRBnYvnNEHlXw1qDGQPZpYrWYi7HpynQfLGGqAsEGR -7t883167jKgOseg8iz2ujxBc8OL+TwL7HeEXtHC0wQ7MNRXcf3hswYO5NSghWRwN -0XczagjL8XLph+4VINZ9HBLR1/21UnaZ3Su4llT2w2L/fGxTTqvH2c7KKmYDpCZe -Eycopf6Dw5M6MHPBfPqeL1nYB3r45KpOa7cjCwW+ip1JiYGD3n+xbmfe6Eovq06w -FLOfefkWXnw0XbuTBlf9jTG6TffdmHsIOy04j/oMDbmAQ0JhGMkH9LMTDXMF3GVa -1sPkXSPLnUhaMJjnf4NDTc9wmgF1/J+gSzCQQcUcdM3rf/PFRbSzawIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAFjedQr52vLv7YxeLxIvyHrMhbx7Iz4ztj3NlnOJ -EMGm7pcum/rGol1z8m7Y3mFbfJJp8IY/jn1w92x+M9pc6zsRo9MsKdqEAKhAjwVh -jYNBWHekrcwGIy6YUSFvZeUZ82IxFcf6N70CH4sLUJLbZXcd5Nui8mZJCPC4SLoC -E51P0vUClnS/l4O+Dz/IfBy9cSvGg3YvF8GGmW7IZdTD4bWg9O8lQi0zcnDGR0Er -N1Tegoe38Mrx49IHpWMEQzJhI6R22CQ0wtk6e8oBuz2No8hnY0yrAvBGI9v8GUE3 -FJAQxHzyUXCA50IcHFruevsgEzixmYb8OfDd1LC3nZJHfq2r5j0jOU6XXxukH8R3 -UyGIf8UpJQqBKHe0Ld0tOWSyByiWHvw4/Nir/DhANezIEsq4A0Y9hq6y2GTtFUnx -HdsYqTmVlrghBiqZF2H9f7YWaRBnsbu6Kkpyc55r8pBZMT2Myu2Gjq/8GAWtEy1J -BYmQfIZUnYksFaZiXvSiyfNaX5M7nvddxkBCyhtwtCzVutL+ZoqwXD2PPaUCuBbu -lu4M7iSjKiibiCqQEVyRPn2o8V4R5r0NmqS+B9CYJECeAnLPO49Z3l4wdJUEww9i -U14lM75e2tfFzaa/ZqOCQFuu84NKacTJUALpdg1aHcPtTG51F2U8EwsoZEBxUBb+ -WR7X +ggIKAoICAQDdaK+xfuePEaVSIHa82JrloCjH1rDuRYYKqRqfsbqFYDDE5WTN4som +qzJwBNBumVTMKgnl5IlBi/UC2rSdUvxztrFi1JFmjw+1+zuJNchrZelLEXK+CvmA +VG7nMX6wkI2lipQXNRjAaw8mP7v65dAiGLtxrXoJ4jehxuqwVwtnvfA1XLUNzK/0 +VwfQ1qjAtiltl/dl/hclqk3xo7/MI0Z4UHQzVzwPzwnpm84Xwi/FZZhuuaw4s1UM +Yk6LUzgpmsVC3Rd9O46KzEyyB2VVdjpwAP7nXg3MSE5ynJLC4kSigIh1FzCD6kRs +TbS19bHQQ/xaENvLK/KOiqO6m97mgOAmYadiOEUfduaGSEsjm82N0Ma5WnzeIIRZ +1pExSWNCvuN3MbWvCt4AJ0F8TfwQDQxMnUtWDPWnamG7dPcHLUlIzKiRxmVp5yFT +oHnfvwxCFvRJsi0jzNQwtbNaMDq4MAV8x0UTV7lBY2Tz6zAvE5AXsTY7GqS465xP +8WuXAfNAyJ7ZDPMrHy1Oqd/TYoTNoZnsiNmEvKLIXhJVxC93c+bzPFs79vKoBT7x +qXWM+nAImxPaifqE+NenVXPvRuotX3AZe1/MPilBlRbEZ37aL8I6Ek6BpXJKoHb9 +U7H+hQQ6UjK6NwWxqIKQ4ZEscv/3lr83o4xwXps9OiodgxpCoZ0/awIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAE8wUkuBEsxe96X3U2vjWCfD/hB30cF69UZ2NlR6 +2UIZbjvewIy43ozr2uaCk1+US21NaaXKinNrZ0VElWKLVXWkZidfuoGEz0gY+XDF +qyjlfaYlCTexPUSh14nbpLsT0DXvHa5KI3Kq2ly/sciVB78SlH3sRzmJt/qkoaIN +f6PI2Unoqf8vJ1xvQr9z/ODc06MoX5g+ezM2vShZ+P7773bSVL6bIEVl/9yFFAyu +OHL+uwUdBYBk3NS4xKyXWXhG58AyNvGYWIO0tWTYmIVVuL2JDrNGY4QdIDQBoj+4 +hppmh0mYbvDCXolKjUVFC0wHRACaRCN1WLIKP8heE0vZsvXq/7ssuP3DtCDHRadk +pHn+6CpEwbT4bCNsW4bsci9v82npoY6YJKW8mokR+1dhcari6g1W2R80VCuWmB6E +ntJFZpILjPrCf8QCjs9Act0l87xx3+5K0LpFHQiKHygTbOrzE8++Lds+6yC/uzp/ +QtdLC20/iQMJ5GaOxSCwzBe1dUhC+ABF1/ZN1p9wgKFTFQMR+B/bR5q9l/d2AyMY +1pTorKIX7yg14OHehzL0s1tVq3QEtNl14c84hLh0m4Rf7nmRRcKDP8l6EwDujJVD +nR8cHM8ajiyC9tjjdyiQ32NLgzo+6OGiugctUxfw/ZLp7Qr0mT07IvPLcqBiRAC6 +E+9O -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/client.key b/packages/opentelemetry-exporter-collector/test/certs/client.key index e0fea66664c..00f82cfeebc 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/client.key +++ b/packages/opentelemetry-exporter-collector/test/certs/client.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/regenerate.sh b/packages/opentelemetry-exporter-collector/test/certs/regenerate.sh index bb6ec4a9b52..9e2e972c991 100755 --- a/packages/opentelemetry-exporter-collector/test/certs/regenerate.sh +++ b/packages/opentelemetry-exporter-collector/test/certs/regenerate.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # # Usage: regenerate.sh # @@ -7,13 +7,16 @@ # It also serves as a documentation on how existing certificates were generated. rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key -openssl genrsa -passout pass:1111 -des3 -out ca.key 4096 -openssl req -passin pass:1111 -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" -openssl genrsa -passout pass:1111 -des3 -out server.key 4096 -openssl req -passin pass:1111 -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -passin pass:1111 -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -passin pass:1111 -in server.key -out server.key -openssl genrsa -passout pass:1111 -des3 -out client.key 4096 -openssl req -passin pass:1111 -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -passin pass:1111 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -passin pass:1111 -in client.key -out client.key + +openssl genrsa -des3 -out ca.key 4096 +openssl req -new -x509 -days 365 -sha256 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" + +openssl genrsa -des3 -out server.key 4096 +openssl req -new -sha256 -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" +openssl x509 -req -days 365 -sha256 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt +openssl rsa -in server.key -out server.key + +openssl genrsa -des3 -out client.key 4096 +openssl req -new -sha256 -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" +openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt +openssl rsa -in client.key -out client.key diff --git a/packages/opentelemetry-exporter-collector/test/certs/server.crt b/packages/opentelemetry-exporter-collector/test/certs/server.crt index 62f91722a93..55f0c3dbb9e 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/server.crt +++ b/packages/opentelemetry-exporter-collector/test/certs/server.crt @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFPzCCAycCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV +MIIFPzCCAycCAQEwDQYJKoZIhvcNAQELBQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNV BAgMAlJNMRowGAYDVQQHDBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9v -dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjAwNTE1MTU0NDM2WhcN -MjEwNTE1MTU0NDM2WjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV +dDENMAsGA1UECwwEVGVzdDELMAkGA1UEAwwCY2EwHhcNMjEwNjA3MjAxMDExWhcN +MjIwNjA3MjAxMDExWjBqMQswCQYDVQQGEwJDTDELMAkGA1UECAwCUk0xGjAYBgNV BAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQKDARUZXN0MQ8wDQYDVQQLDAZT ZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBANQwHRfyj/d8Hh0qgDlxdtSxloRs8ZvBIwt6Accd1hUqs8dC0c9V -5XXOcfmusb3Fo8NKXn6IIPCEy1spFCe4EBW4obSgkJEVdPwsMsXUPLek/6K5S6uE -FhnGLUJJ57gAjh9LGdMTDp5szLO7dTYrHzdGZYhmTAyiA9JDN6iYlpWkK4p2IBcN -diu26KWp9+sJKw8Ly/7o5QD4wyc6hGok0v0nwimXZo78EJYBu6BDGuLyAgvq8zLV -sgXi4aYROsmVrg2IJbe8+PtPBNwkoAuR4QC3hRTV3bXyZdbIC0KbOekegAHTeXYz -Ap0HVkCsb/vOLiGuju/mKZFZKp5/PKf8Jdv/zDTIm8TwBvvtQKT4qmAYUkKTXRrO -OWK1pCakVLV7FGREDi+/bxhcQJt5yopLGT5NSoUF3RR+17KZ/5lSPEh5OMSprVyR -789KvY1z79JWt3zB6fIfQ936PyNh++SKxFmlnLuGK5wf58jefwSjGEkY2YAE66Y6 -8Kqg3/W8JsjTFBntBtD3xY1t0c4Hh2f3epQPrzwHx9pywgh+H2TIwnnUyEPLqdYp -SEsbnvdbLB8FZm2fwPZ1MZOZOGrKcnCMkMPE1DOIkxeFDx8xbeHRepSRJSbemY1l -tt+afAnM18mJf36gO8NnM56Me//FSTWbWaQlmUBAwSDlHxYfD9TgCjbBAgMBAAEw -DQYJKoZIhvcNAQEFBQADggIBAEt57zbZpIaQiw0BvZenLWhWvBA0j1cFk7eVG+Nl -Zo7+UniFH+1Io/gXJaJmJZ09d3ku4ZB+V44ka1N9J7qnnqXYOxRGT2H6owaWeOLl -FQ8tR1NQQA7p2uNWJclBsuPghzRCSFZw2auu8OKRtM/0VgbskNIN+H0EVhEeYjtd -ZzojPoa7AmH7P4SC1KMvY6qNmab9F8TBD19DPfoA/EpYboMQiK7DwPPuvrAdHcJB -KPLxyzabqFEqouwStqKUmKqbASOR+qJNac/RQTbN6yP4Lu9wTUm1OYaR4ot87dOR -ZhCznzlaJ2DsvFuoOKN/7Bezq+rXhIyCrH9VH0PjWwbO9FIfeZlHgmAmJnJCXb6F -bW6m+ha/63kiPU1NlTJRPukcR0vW/P0XSOcRvvje/07uJOOG5ypnQf6k7neR5e81 -1ZHPKCHba7bh08vKW5LbXwU4Ng7vRc42h6+iN0mogjj+B2oYt432L3howc8np2vF -eLCRxq/9pRut2QkfivT/GHkV/J+RxoEFDrZrTd15q1mLQnPCJOT+QmAMPfZydyZM -FsQUd6kzEWgZ4dHKqEikC0IBG+2xrrvHgKiB5Y1o0K/hEFfQOFCct6c9thXqMYhA -w/2HXXjfWLVBbGjJ4VemU1YFKyMZ+mxM1sJmPc/KkG/NjKf9wFFwFRpT3OIlF+BK -u8P4 +ADCCAgoCggIBALaskMk0FpoAZ8eHpOiNYIW2yOeizGsvJ7PsNZujbUFQ/f7/AYTZ +CBQ9Hc8lKz+3YHklZnTsAJW6QLCBKSgsrjPAXA25zBFQazUuKb+QrjoIqeaq8D8w +6iHL7zdHsplbWZjYrnPjLWPqoc1ga6H0p8NsH7eC6hFXJRp2ZilyZXUR4jvyMc3D +2q/MXoI0VvQ3tI/QaLrU2iaN0DZBsyJhr4B/jNzOYzGAuVieEyV52wFnOsUlJDNp +jsT/v1/Q8JrjOXSb+ko/74VlSLTCauoPSsiUb1ra0Tbu3Z0E6b7vlFKeZaOxwUyW +eLi6YT6Z9ZTOEJuiJan/7STprK1NrqL+OPneK1A0Plr10hY76SptAu2fTqgGOFGo +QkxTosnsppiSkCVaDiLKCVr4DQzBm/0CLoSgXk4fJNhiNrIT+b35gX8Xmm3hUq+U +GanZyXhJYfojBUuhPJFAUKpUUjSsiRU8Dj8R7nIZT+cUWvslYmrOG4ZjCnpIXnoo +pAjFlaZkv62/tEGwJmyBkGk2lYzn9Ka1G/aO92IjfzypUlSKXCntTxLD6BzWNF7/ +qjt19XTOWPjChQHQcYXmlTSNUvUQ09HMaRIUe5MCexlWYleX6lVG6XtMwOb06w5O +ynVuMHjiAGfkjLrUkGQqSxHrS2v/af1J7F+CIClNgI+q2pz5dYWYMaCFAgMBAAEw +DQYJKoZIhvcNAQELBQADggIBAAaVSzyc6jFBLORHUcxkP8DheyTl8m2sWIb+x732 +DkM2qp8oEAKwhJ/AWLFGCqsjyW5ep8fgpTHQgT7braEEUKKnGUbIqUPy1IBz+lSf +LoT7qD92eiMGXOrzcHWnV02PRM3mF5cmLMNu5aMUoIArG5dO1LTSxl5/ybx2l4Zy +qXcT7wJtrA6F0EmuXRzwFBIVZdxlLbI+S4SsvfKXernGatB3Mjotivvqi2SeOd8p +1tuqEyQaaIJ1s6u7vyTcAHDd0OIxSqpTu3SwaHAXhkzMi7+TRGgfQUuljkNKkKfj +N02siSNjIuKzE/DSW6yV0OFL/FCNPyvzs8CKTMwfyrrvA0UAspkFCWZFXFlA+uLs +0at4SmPecOsc+O8ATon9nUyXh06anBwtp03aXX6Mr/7UIRRPHF70BY7MDV4OvvQt +PD0osFo0uEHubflCnPBUdMrQN9KbELVJeV7G0Xj2fHTAVoEnCmSpow+LB1ehWGbR +M3U8q9wlpXi4Awhr19kRcSdE/JzI7eu9MqjsazfUdAtCcgg4dHixOre8oXgauhZ5 +jMOv9lUI6Glf61xt8mamicohSf9CFyH5PgZqRM0aSacdJ7jH6EitABOx21ZqwiBp +o4W37lV55oy+N0r7yxaNy/mSUUcjsQo6kGw/4cMpYTSEzRMtfwYPOS1DeTl9zArE +7TBI -----END CERTIFICATE----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/server.csr b/packages/opentelemetry-exporter-collector/test/certs/server.csr index 967316e1713..0c5e9291bfc 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/server.csr +++ b/packages/opentelemetry-exporter-collector/test/certs/server.csr @@ -2,27 +2,27 @@ MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDUMB0X8o/3fB4dKoA5cXbUsZaEbPGbwSMLegHHHdYVKrPHQtHPVeV1 -znH5rrG9xaPDSl5+iCDwhMtbKRQnuBAVuKG0oJCRFXT8LDLF1Dy3pP+iuUurhBYZ -xi1CSee4AI4fSxnTEw6ebMyzu3U2Kx83RmWIZkwMogPSQzeomJaVpCuKdiAXDXYr -tuilqffrCSsPC8v+6OUA+MMnOoRqJNL9J8Ipl2aO/BCWAbugQxri8gIL6vMy1bIF -4uGmETrJla4NiCW3vPj7TwTcJKALkeEAt4UU1d218mXWyAtCmznpHoAB03l2MwKd -B1ZArG/7zi4hro7v5imRWSqefzyn/CXb/8w0yJvE8Ab77UCk+KpgGFJCk10azjli -taQmpFS1exRkRA4vv28YXECbecqKSxk+TUqFBd0Ufteymf+ZUjxIeTjEqa1cke/P -Sr2Nc+/SVrd8wenyH0Pd+j8jYfvkisRZpZy7hiucH+fI3n8EoxhJGNmABOumOvCq -oN/1vCbI0xQZ7QbQ98WNbdHOB4dn93qUD688B8facsIIfh9kyMJ51MhDy6nWKUhL -G573WywfBWZtn8D2dTGTmThqynJwjJDDxNQziJMXhQ8fMW3h0XqUkSUm3pmNZbbf -mnwJzNfJiX9+oDvDZzOejHv/xUk1m1mkJZlAQMEg5R8WHw/U4Ao2wQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAIBAt/12a6kkCFaRe256Umrj3/2DPA+gVqaVwlsi -xEGuO3GpBv7D6+lrlwNhLLSFOEkqoB4t/hjfGyabENXrCgyjMEoq/YKfwJvO4FPv -UkjaEWsCxmuwTS0qm8gXQy9PAwSI8EF2jOoRtvpCXl7bDQRJRIgKwZFI+jCEZvgj -Sk8fZGOH9yPEjx0KpvEw3jl/kbdSJu+CFTr981yLKjeG0lMknc/sQwH87tco4icj -t2Deaow6UOc0VaTmsWMLwIWrG/5TQPj+tL/600mBs5iQCOVio+hbzOHmDb48Ztao -CD4z8w8PAHxO79Vx0Wjt26cl6pKL58uke3G41Aq8//YLpSUUvIx0bYOwobDd4Ev5 -Emklvmcf3hAAzVQ7g8kDD82RDPRKtDl6e26+q2MQT31HuGbKB+5xpi113dSoB2CO -NSAgn3heoj5OM7heKwh6p6j0r1gT8WjXDMXQdKgekTGaUxeOSmccvMk4U0LN3JpK -JqaH178OucI9aRxGVjQFErW7xbKOViHP+NxNKj1pnerd7PX0wF/g107v2eSb6l/5 -K0UsM/l7MsINkx/1p+Qqu26t3i3Azw/MxKJqOVAlcb2LrACBj80BXBcJLW/My3kY -0XzK1siVSL17lL4KYBLO7kVR3F1+m+aQPrYJsLEKCAGxsfiFRBhXa6pfvp+fd5Hs -/xFM +ggIKAoICAQC2rJDJNBaaAGfHh6TojWCFtsjnosxrLyez7DWbo21BUP3+/wGE2QgU +PR3PJSs/t2B5JWZ07ACVukCwgSkoLK4zwFwNucwRUGs1Lim/kK46CKnmqvA/MOoh +y+83R7KZW1mY2K5z4y1j6qHNYGuh9KfDbB+3guoRVyUadmYpcmV1EeI78jHNw9qv +zF6CNFb0N7SP0Gi61NomjdA2QbMiYa+Af4zczmMxgLlYnhMledsBZzrFJSQzaY7E +/79f0PCa4zl0m/pKP++FZUi0wmrqD0rIlG9a2tE27t2dBOm+75RSnmWjscFMlni4 +umE+mfWUzhCboiWp/+0k6aytTa6i/jj53itQND5a9dIWO+kqbQLtn06oBjhRqEJM +U6LJ7KaYkpAlWg4iygla+A0MwZv9Ai6EoF5OHyTYYjayE/m9+YF/F5pt4VKvlBmp +2cl4SWH6IwVLoTyRQFCqVFI0rIkVPA4/Ee5yGU/nFFr7JWJqzhuGYwp6SF56KKQI +xZWmZL+tv7RBsCZsgZBpNpWM5/SmtRv2jvdiI388qVJUilwp7U8Sw+gc1jRe/6o7 +dfV0zlj4woUB0HGF5pU0jVL1ENPRzGkSFHuTAnsZVmJXl+pVRul7TMDm9OsOTsp1 +bjB44gBn5Iy61JBkKksR60tr/2n9SexfgiApTYCPqtqc+XWFmDGghQIDAQABoAAw +DQYJKoZIhvcNAQELBQADggIBAIJ7KMLIZbomgrup1rrizG3aU4bREy6HfHZ9Ylcr +Lo1vdL5/UZH3AHVhoccb0ua3qXDtsc8pDQAXIMzBu8BjfpbwCvrgz7YXsNsBU9zV +el8p394QB20WoPHebYDBUXPiq3JhLfjzOXBS9Ke3MBl1jDamOFmZW8dg8EpowIXv +ODFP8sErFb7Bmq7x2d0EJyX7+HydBiRWRa376oXcZ/VLl/CnNzpJeACFWPI4d0lg +P5nsadtdLyAwXF6cRQx3pOdN0sS5b3llXX3jVwGzm+kNjVTDWJiJmqWfwIF15pPr +bypoUmPpeQ4I9F+oFm9+Ff776PemqBD7NSJdG0iHRndm3oa6o2bTpn9ZypCO1Skv +UWr3ATduFylA3/YeoN6dQwP4Ol+3WJ2UbXzTbmEfoSEzmwMI5MTidOuA62A0afyN +VM0SjHaLvfD1mK4w+3BKdUivYh4TWbcLU7s1SeDwYiEP6DFZHLBPHDcNLz77d6nQ +zgvOgXqeNfk9uI5NdYBMbtdHW/mwGgEfPlDkKbY2KveOJjLlTM1EduGFsYHAXyhI +SiYozrbFeS5ts4f1EZ5tVT73KBv97MiQkKhBoVXtF1CHPUP1LTkGxtH2uoDiVfDi +r1OkRzoO05pHAh2o+4gujThsc0d3T5mmoeSySs56lgqDmC4blXNOS0kBZ4+I2u7A +C2YH -----END CERTIFICATE REQUEST----- diff --git a/packages/opentelemetry-exporter-collector/test/certs/server.key b/packages/opentelemetry-exporter-collector/test/certs/server.key index 4831771d2b3..9fa740554ac 100644 --- a/packages/opentelemetry-exporter-collector/test/certs/server.key +++ b/packages/opentelemetry-exporter-collector/test/certs/server.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index fa9c243f6e1..48e9805b263 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,12 +40,12 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/resources": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/resources": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", @@ -56,12 +56,12 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "jaeger-client": "^3.15.0" } } diff --git a/packages/opentelemetry-exporter-jaeger/src/version.ts b/packages/opentelemetry-exporter-jaeger/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-jaeger/src/version.ts +++ b/packages/opentelemetry-exporter-jaeger/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json index e9d43133b49..43427fa0234 100644 --- a/packages/opentelemetry-exporter-prometheus/package.json +++ b/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -39,11 +39,11 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -53,11 +53,11 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/metrics": "0.20.0" + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/metrics": "0.22.0" } } diff --git a/packages/opentelemetry-exporter-prometheus/src/version.ts b/packages/opentelemetry-exporter-prometheus/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-prometheus/src/version.ts +++ b/packages/opentelemetry-exporter-prometheus/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index b7e0bb5d390..fa801fb0d51 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -52,13 +52,13 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -80,12 +80,12 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } } diff --git a/packages/opentelemetry-exporter-zipkin/src/version.ts b/packages/opentelemetry-exporter-zipkin/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-exporter-zipkin/src/version.ts +++ b/packages/opentelemetry-exporter-zipkin/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json index c3f69fc50e8..33f6f40f775 100644 --- a/packages/opentelemetry-instrumentation-fetch/package.json +++ b/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -47,17 +47,17 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-zone": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -78,12 +78,12 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", - "@opentelemetry/web": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" } } diff --git a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index 5134016be6e..5d107027d73 100644 --- a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -149,7 +149,7 @@ export class FetchInstrumentation extends InstrumentationBase< const headers: Partial> = {}; api.propagation.inject(api.context.active(), headers); if (Object.keys(headers).length > 0) { - api.diag.debug('headers inject skipped due to CORS policy'); + this._diag.debug('headers inject skipped due to CORS policy'); } return; } @@ -188,7 +188,7 @@ export class FetchInstrumentation extends InstrumentationBase< options: Partial = {} ): api.Span | undefined { if (core.isUrlIgnored(url, this._getConfig().ignoreUrls)) { - api.diag.debug('ignoring span as url matches ignored url'); + this._diag.debug('ignoring span as url matches ignored url'); return; } const method = (options.method || 'GET').toUpperCase(); @@ -407,7 +407,7 @@ export class FetchInstrumentation extends InstrumentationBase< return; } - api.diag.error('applyCustomAttributesOnSpan', error); + this._diag.error('applyCustomAttributesOnSpan', error); }, true ); @@ -451,7 +451,7 @@ export class FetchInstrumentation extends InstrumentationBase< override enable() { if (isWrapped(window.fetch)) { this._unwrap(window, 'fetch'); - api.diag.debug('removing previous patch for constructor'); + this._diag.debug('removing previous patch for constructor'); } this._wrap(window, 'fetch', this._patchConstructor()); } diff --git a/packages/opentelemetry-instrumentation-fetch/src/version.ts b/packages/opentelemetry-instrumentation-fetch/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-instrumentation-fetch/src/version.ts +++ b/packages/opentelemetry-instrumentation-fetch/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts index 017aea8056d..4c6de800c67 100644 --- a/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts @@ -571,7 +571,7 @@ describe('fetch', () => { }); it('should debug info that injecting headers was skipped', () => { assert.strictEqual( - spyDebug.lastCall.args[0], + spyDebug.lastCall.args[1], 'headers inject skipped due to CORS policy' ); }); diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json index 47870ddab07..66f4e40dc82 100644 --- a/packages/opentelemetry-instrumentation-grpc/package.json +++ b/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,17 +43,17 @@ "devDependencies": { "@grpc/grpc-js": "1.3.0", "@grpc/proto-loader": "0.6.1", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/node": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "grpc": "1.24.7", "mocha": "7.2.0", "node-pre-gyp": "0.17.0", @@ -66,11 +66,11 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0" + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0" } } diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts index 753ac06b7b4..0cf2114891e 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts @@ -35,7 +35,6 @@ import { } from './types'; import { context, - diag, propagation, ROOT_CONTEXT, SpanOptions, @@ -76,7 +75,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { '@grpc/grpc-js', ['1.*'], (moduleExports, version) => { - diag.debug(`Applying patch for @grpc/grpc-js@${version}`); + this._diag.debug(`Applying patch for @grpc/grpc-js@${version}`); if (isWrapped(moduleExports.Server.prototype.register)) { this._unwrap(moduleExports.Server.prototype, 'register'); } @@ -115,7 +114,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { }, (moduleExports, version) => { if (moduleExports === undefined) return; - diag.debug(`Removing patch for @grpc/grpc-js@${version}`); + this._diag.debug(`Removing patch for @grpc/grpc-js@${version}`); this._unwrap(moduleExports.Server.prototype, 'register'); this._unwrap(moduleExports, 'makeClientConstructor'); @@ -136,7 +135,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { const instrumentation = this; return (originalRegister: ServerRegisterFunction) => { const config = this._config; - diag.debug('patched gRPC server'); + instrumentation._diag.debug('patched gRPC server'); return function register( this: grpcJs.Server, name: string, @@ -186,7 +185,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { kind: SpanKind.SERVER, }; - diag.debug('patch func: %s', JSON.stringify(spanOptions)); + instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions)); context.with( propagation.extract(ROOT_CONTEXT, call.metadata, { @@ -231,7 +230,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { ) => MakeClientConstructorFunction { const instrumentation = this; return (original: MakeClientConstructorFunction) => { - diag.debug('patching client'); + instrumentation._diag.debug('patching client'); return function makeClientConstructor( this: typeof grpcJs.Client, methods: grpcJs.ServiceDefinition, @@ -255,7 +254,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { */ private _patchLoadPackageDefinition(grpcClient: typeof grpcJs) { const instrumentation = this; - diag.debug('patching loadPackageDefinition'); + instrumentation._diag.debug('patching loadPackageDefinition'); return (original: typeof grpcJs.loadPackageDefinition) => { return function patchedLoadPackageDefinition( this: null, @@ -279,7 +278,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { ): (original: GrpcClientFunc) => () => EventEmitter { const instrumentation = this; return (original: GrpcClientFunc) => { - diag.debug('patch all client methods'); + instrumentation._diag.debug('patch all client methods'); return function clientMethodTrace(this: grpcJs.Client) { const name = `grpc.${original.path.replace('/', '')}`; const args = [...arguments]; diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts b/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts index ade2ea3aabc..87486ef157f 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts @@ -31,7 +31,6 @@ import { import { GrpcInstrumentationConfig } from '../types'; import { context, - diag, propagation, SpanOptions, SpanKind, @@ -75,7 +74,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< 'grpc', ['1.*'], (moduleExports, version) => { - diag.debug(`Applying patch for grpc@${version}`); + this._diag.debug(`Applying patch for grpc@${version}`); grpcClient = moduleExports; if (isWrapped(moduleExports.Server.prototype.register)) { @@ -99,7 +98,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< }, (moduleExports, version) => { if (moduleExports === undefined) return; - diag.debug(`Removing patch for grpc@${version}`); + this._diag.debug(`Removing patch for grpc@${version}`); this._unwrap(moduleExports.Server.prototype, 'register'); }, @@ -113,7 +112,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< moduleExports: GrpcInternalClientTypes, version?: string ) => { - diag.debug(`Applying internal patch for grpc@${version}`); + this._diag.debug(`Applying internal patch for grpc@${version}`); if (isWrapped(moduleExports.makeClientConstructor)) { this._unwrap(moduleExports, 'makeClientConstructor'); } @@ -125,7 +124,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< version?: string ) => { if (moduleExports === undefined) return; - diag.debug(`Removing internal patch for grpc@${version}`); + this._diag.debug(`Removing internal patch for grpc@${version}`); this._unwrap(moduleExports, 'makeClientConstructor'); }; return [ @@ -147,7 +146,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< private _patchServer(grpcModule: typeof grpcTypes) { const instrumentation = this; return (originalRegister: typeof grpcTypes.Server.prototype.register) => { - diag.debug('patched gRPC server'); + instrumentation._diag.debug('patched gRPC server'); return function register( this: grpcTypes.Server & { handlers: any }, @@ -191,7 +190,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< kind: SpanKind.SERVER, }; - diag.debug('patch func: %s', JSON.stringify(spanOptions)); + instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions)); context.with( propagation.extract(context.active(), call.metadata, { @@ -243,7 +242,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< private _patchClient() { const instrumentation = this; return (original: typeof grpcTypes.makeGenericClientConstructor): never => { - diag.debug('patching client'); + instrumentation._diag.debug('patching client'); return function makeClientConstructor( this: typeof grpcTypes.Client, methods: { [key: string]: { originalName?: string } }, @@ -288,7 +287,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< private _getPatchedClientMethods() { const instrumentation = this; return (original: GrpcClientFunc) => { - diag.debug('patch all client methods'); + instrumentation._diag.debug('patch all client methods'); return function clientMethodTrace(this: grpcTypes.Client) { const name = `grpc.${(original.path as string | undefined)?.replace( '/', diff --git a/packages/opentelemetry-instrumentation-grpc/src/version.ts b/packages/opentelemetry-instrumentation-grpc/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/version.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json index 4badf91970b..524fb601caf 100644 --- a/packages/opentelemetry-instrumentation-http/package.json +++ b/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -41,10 +41,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "0.22.0", + "@opentelemetry/node": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "@types/got": "9.6.11", "@types/mocha": "8.2.2", "@types/node": "14.14.43", @@ -53,7 +53,7 @@ "@types/sinon": "9.0.11", "@types/superagent": "4.1.10", "axios": "0.21.1", - "codecov": "3.8.1", + "codecov": "3.8.2", "got": "9.6.0", "mocha": "7.2.0", "nock": "12.0.3", @@ -68,12 +68,12 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "semver": "^7.1.3" } } diff --git a/packages/opentelemetry-instrumentation-http/src/http.ts b/packages/opentelemetry-instrumentation-http/src/http.ts index cc50df76569..4b52635eef9 100644 --- a/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/packages/opentelemetry-instrumentation-http/src/http.ts @@ -15,7 +15,6 @@ */ import { context, - diag, INVALID_SPAN_CONTEXT, propagation, ROOT_CONTEXT, @@ -86,7 +85,7 @@ export class HttpInstrumentation extends InstrumentationBase { 'http', ['*'], moduleExports => { - diag.debug(`Applying patch for http@${this._version}`); + this._diag.debug(`Applying patch for http@${this._version}`); if (isWrapped(moduleExports.request)) { this._unwrap(moduleExports, 'request'); } @@ -115,7 +114,7 @@ export class HttpInstrumentation extends InstrumentationBase { }, moduleExports => { if (moduleExports === undefined) return; - diag.debug(`Removing patch for http@${this._version}`); + this._diag.debug(`Removing patch for http@${this._version}`); this._unwrap(moduleExports, 'request'); this._unwrap(moduleExports, 'get'); @@ -129,7 +128,7 @@ export class HttpInstrumentation extends InstrumentationBase { 'https', ['*'], moduleExports => { - diag.debug(`Applying patch for https@${this._version}`); + this._diag.debug(`Applying patch for https@${this._version}`); if (isWrapped(moduleExports.request)) { this._unwrap(moduleExports, 'request'); } @@ -158,7 +157,7 @@ export class HttpInstrumentation extends InstrumentationBase { }, moduleExports => { if (moduleExports === undefined) return; - diag.debug(`Removing patch for https@${this._version}`); + this._diag.debug(`Removing patch for https@${this._version}`); this._unwrap(moduleExports, 'request'); this._unwrap(moduleExports, 'get'); @@ -309,9 +308,9 @@ export class HttpInstrumentation extends InstrumentationBase { } context.bind(context.active(), response); - diag.debug('outgoingRequest on response()'); + this._diag.debug('outgoingRequest on response()'); response.on('end', () => { - diag.debug('outgoingRequest on end()'); + this._diag.debug('outgoingRequest on end()'); let status: SpanStatus; if (response.aborted && !response.complete) { @@ -353,7 +352,7 @@ export class HttpInstrumentation extends InstrumentationBase { this._closeHttpSpan(span); }); - diag.debug('http.ClientRequest return request'); + this._diag.debug('http.ClientRequest return request'); return request; } @@ -379,13 +378,13 @@ export class HttpInstrumentation extends InstrumentationBase { : '/'; const method = request.method || 'GET'; - diag.debug('%s instrumentation incomingRequest', component); + instrumentation._diag.debug('%s instrumentation incomingRequest', component); if ( utils.isIgnored( pathname, instrumentation._getConfig().ignoreIncomingPaths, - (e: Error) => diag.error('caught ignoreIncomingPaths error: ', e) + (e: Error) => instrumentation._diag.error('caught ignoreIncomingPaths error: ', e) ) ) { return context.with(suppressTracing(context.active()), () => { @@ -529,7 +528,7 @@ export class HttpInstrumentation extends InstrumentationBase { utils.isIgnored( origin + pathname, instrumentation._getConfig().ignoreOutgoingUrls, - (e: Error) => diag.error('caught ignoreOutgoingUrls error: ', e) + (e: Error) => instrumentation._diag.error('caught ignoreOutgoingUrls error: ', e) ) ) { return original.apply(this, [optionsParsed, ...args]); @@ -570,7 +569,7 @@ export class HttpInstrumentation extends InstrumentationBase { } ); - diag.debug('%s instrumentation outgoingRequest', component); + instrumentation._diag.debug('%s instrumentation outgoingRequest', component); context.bind(parentContext, request); return instrumentation._traceClientRequest( component, diff --git a/packages/opentelemetry-instrumentation-http/src/version.ts b/packages/opentelemetry-instrumentation-http/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-instrumentation-http/src/version.ts +++ b/packages/opentelemetry-instrumentation-http/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh b/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh new file mode 100755 index 00000000000..af9c63e310f --- /dev/null +++ b/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh +# +# Usage: regenerate.sh +# +# regenerate.sh regenerates private key and certificate used in https tests and example +# + +EXAMPLE_DIR="../../../../examples/https" +openssl req -x509 -nodes -newkey rsa -keyout server-key.pem -out server-cert.pem -days 3650 -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" +cp ./server-*.pem "$EXAMPLE_DIR/" diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem b/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem index e2b79024da4..4dd904f0882 100644 --- a/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem +++ b/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem @@ -1,11 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIBqzCCARQCCQDLcUeJsLDL5jANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJD -QTELMAkGA1UECAwCUUMwHhcNMTkwOTI5MjIwMDI2WhcNMTkxMDI5MjIwMDI2WjAa -MQswCQYDVQQGEwJDQTELMAkGA1UECAwCUUMwgZ8wDQYJKoZIhvcNAQEBBQADgY0A -MIGJAoGBALhfi1dwIyC1Jha4N/j/VtlPPi+j+SZQGZqLNVVgzzGY7+cc3VkCySZD -yXh3Z+/ftp9DDKdHRutJQE0R4peSDussC/IQDJKzuKN/O9S6tnNlgUr5YZLRENxL -FSJIY5cIkty50IrEhlN5QeDJP8p4yrYq9J6M0yzyfdqIWI3CBqbzAgMBAAEwDQYJ -KoZIhvcNAQEFBQADgYEArnOeXmXXJTK39Ma25elHxlYUZiYOBu/truy5zmx4umyS -GyehAv+jRIanoCRWtOBnrjS5CY/6cC64aIVLMoqXEFIL7q/GD0wEM/DS8rN7KTcp -w+nIX98srYaAFeQZScPioS6WpXz5AjbTVhvAwkIm2/s6dOlX31+1zu6Zu6ASSuQ= +MIIDozCCAougAwIBAgIUZdBdHwmbcYbMUvOesYRyYlg11JMwDQYJKoZIhvcNAQEL +BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs +ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE +AwwCY2EwHhcNMjEwNjA4MDgxNTE2WhcNMzEwNjA2MDgxNTE2WjBhMQswCQYDVQQG +EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w +CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALw9Shaqp1O1zgYK8z5pnvuHK3o9cUNT ++EJz5KLADn11HSgfj5S96s6lDP9mUy8oDXdk9zSH8QsPp/maVh0AM1WrPDDTBJT5 +vdPyUezzn4wvBrJSG/mmy/p4QU1srmE0ueuhgot97GZa9qu+gOqGei3YTjrbx14H +jyvexx+QhqrpUg46qAm67pJHC5jN6LmufoIvepyvQCEbKN+n2B2tAn9on1wo7UmB +igTEiWxk1Gn70IJuyTEbpHoLFviQ5kvTYXM/2KHMOXjZM9fQxtbseNUmj8VK3+tS +5jBdIROZxKxh3r9rV7SBHrblTWB3CZ/NsJblZuzMazLWkYS1/JZud9ECAwEAAaNT +MFEwHQYDVR0OBBYEFP6+DMoQBCg7tOYrSUpWKQrbfJ5yMB8GA1UdIwQYMBaAFP6+ +DMoQBCg7tOYrSUpWKQrbfJ5yMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBAGbkwraWuKnhcE8GrLCO0qLq5GaF+WvxqVzgPvG3G6bQJuEnS6LT65nR +ICU82vCQBikW6lDfpsiwcVqOmgefUmjI99Aw5S1dkYy2J+WZrU/EgX445JLGJMpB +Bh0QajFT6gdQiuURqTmxAhNj4VrUqtrNapP8vFKerR7nTrORG0ELEcvzVYCLNvDm +OYWvLEMZifNWKY6hRdhZXho5hfu7/YPUhZUpcSxkTUsDnG3gzkTyX1TzeWe7wlJr +dtNIk50lUCR6TlSpTaVB+6uhVjaLZpZwBAT5H0dWQXm0Ww5AYsEAT9Uzh9fZYu4m +iMhztKH3PWjDB+jSzcOv9FXeYWgprWk= -----END CERTIFICATE----- diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem b/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem index 405c5fa0d7f..267ed0464e2 100644 --- a/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem +++ b/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem @@ -1,15 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC4X4tXcCMgtSYWuDf4/1bZTz4vo/kmUBmaizVVYM8xmO/nHN1Z -AskmQ8l4d2fv37afQwynR0brSUBNEeKXkg7rLAvyEAySs7ijfzvUurZzZYFK+WGS -0RDcSxUiSGOXCJLcudCKxIZTeUHgyT/KeMq2KvSejNMs8n3aiFiNwgam8wIDAQAB -AoGBAKBztcYQduGeBFm9VCjDvgc8KTg4kTlAeCfAglec+nOFTzJoMlGmVPuR/qFx -+OgOXtXW+goRw6w7gVQQ/os9tvCCp7awSC5UCfPejHh6bW2B0BF2lZJ6B9y+u5Fa -/p8oKoJGcC4eagVnDojuoYJHSqWBf7d7V/U54NpxwgBTsHAhAkEA8PJROgWzjMl2 -Gs5j8oBldEqzrC/d4K1uMEvCTb4RJ+t6jWq+Ug/vqvCfIcLfxHbOmTbOHTfhpv/d -NUf9eDyBGwJBAMPkZaHP5vPDd900MqypLVasollzxgPnMUg35EEQJLAbb/5xG3X9 -ZbaVDTRtLQYNFvDZLlTpRpCPxZCgrn9hJwkCQQDPEVChLrkpqxFm5CydAZ8vG+vh -dJmYNzPVKaZorYmM5yBBXJUHbU6pd3UqzJEGBJx0q9bi4V156bYvzhiVNlo1AkBu -1hbvFCwPtoRmg3c8nEhL50fApzHd2XzX6M/cRF8Nyah3ZdXsz6AyS2l6RV+ZMeTO -B4QghRDpEH/vUgsJhZXJAkB5GQZPJh6/kozc5+Ffc60ThN/58SX0KEFeKnWRlzfr -vfBXwcmaz1oNXN+kcWdLnKbr/tx+3UQ6weRRmeYX/hOi ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8PUoWqqdTtc4G +CvM+aZ77hyt6PXFDU/hCc+SiwA59dR0oH4+UverOpQz/ZlMvKA13ZPc0h/ELD6f5 +mlYdADNVqzww0wSU+b3T8lHs85+MLwayUhv5psv6eEFNbK5hNLnroYKLfexmWvar +voDqhnot2E4628deB48r3scfkIaq6VIOOqgJuu6SRwuYzei5rn6CL3qcr0AhGyjf +p9gdrQJ/aJ9cKO1JgYoExIlsZNRp+9CCbskxG6R6Cxb4kOZL02FzP9ihzDl42TPX +0MbW7HjVJo/FSt/rUuYwXSETmcSsYd6/a1e0gR625U1gdwmfzbCW5WbszGsy1pGE +tfyWbnfRAgMBAAECggEAP1YT7qp+4ICkkI3wqEhbkOA7Ncckq/W964YZINWkSnw0 +UkLESdTZA6yvQeQJCy3b0hdrwgYXiZQ7/ZT7coiVvTZ/ayIlQYcCYyT+gc67GSzd +gPR1qzt/GIiL2GRADD70a58NUKgO+aWTp9fSgpa612AXemBmpXG/r5Amya0UUr7Y +KdSpBuOgomZMqEm2mYDdI4LRw2xbWoWTVvCndhypbXTJ2D8/QhbNfliWTG9MBy90 +UAQpaQGNwHzmCgwBJ03QJuE+OXjX80XcOOIYh6l68wkDeSfqaYx95OQZ3oOr6QT8 +TLYv08M9Grrrj5rPttpycBoxVbtLxkhE0Rt0q9K4HQKBgQD0EuR35CNTIIx/gikO +CxdbSroPW9r92+IXCWcbbtRbVruHBpXzsMeHse4uqhtYmFNbgfgh12dC6OX7NzJx +3Ds4NW8DvcZ3mVq8iEiOZnX5ydeeYMetlDWhXx2/0be5vqmrUkkWdfXsFUCyS8Lw +vGRc9BiNqFePg2HsoVd2tezrwwKBgQDFb/eef/nOM1Eq5h+u+0Pyyg07iRuxxNup +YXY9hwNJyF+NUoIWx2Jfyh+dQfMC18g/4hN4Hwfm/nC85SkPheKJnXYgMWMXp2Y7 +PBgdZGCX/546xiS5VGAoRuLd8oO2AlDfgU4tw6U0WZguJ6hMXlePlKz/uAJ237FB +gcPyGNeY2wKBgQDOD4038zInolk75YYHxzFm78X55ZETtipBTLzyGjXLD4SvUM4U +uXEbjQsL9q2ztJbbsPTujU8u3DYeS9GY81hD8kjRnc0LeDt05JJtNu/vfYs+uXKb +h39nyEfzhHlapi/U5lmyTtDbCm5emTvxxvvsxmBcaH3UOhXYk7amEJ3/xQKBgA+s +svj3agqv0krYmD1ZH2zgE6rdWMCFQ3cwEKYT2PP7n3Jl0YQjcjDuqBHhEXzxSqmf +tjH8LLFvE947R0Y/N9v7D0zA/v/6v0gGnld/B5gpqBM8dd/szfGEpzA9t600g90q +s904Qh5k2osXhOoDN2pjwFRQ9Ikhez4bIkZPKJavAoGAV2YPXyw5rrAZtCtybqsO +B+15Lh+KC+vs0rBBhb0MUpXQPgQ6SX8ozpLHtqlsUpNfHwOk5K958jMrM9Rx4dhS +Z6WuTa+9QpmXzYTnCDBbEU06+YB1QR2QfU4BlAAu1RtUbbt84/7OAoNh2IqOO4XJ +THlhj8odimsk4R1B0RipBis= +-----END PRIVATE KEY----- diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json index e773a8be147..40d71df4c97 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -47,16 +47,16 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-zone": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -77,12 +77,12 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", - "@opentelemetry/web": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" } } diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/version.ts b/packages/opentelemetry-instrumentation-xml-http-request/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/src/version.ts +++ b/packages/opentelemetry-instrumentation-xml-http-request/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 197a9b16670..eabab83d1cb 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -119,7 +119,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase> = {}; api.propagation.inject(api.context.active(), headers); if (Object.keys(headers).length > 0) { - api.diag.debug('headers inject skipped due to CORS policy'); + this._diag.debug('headers inject skipped due to CORS policy'); } return; } @@ -191,7 +191,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase { it('should debug info that injecting headers was skipped', () => { assert.strictEqual( - spyDebug.lastCall.args[0], + spyDebug.lastCall.args[1], 'headers inject skipped due to CORS policy' ); }); diff --git a/packages/opentelemetry-instrumentation/package.json b/packages/opentelemetry-instrumentation/package.json index 5a096870916..d15f408c26e 100644 --- a/packages/opentelemetry-instrumentation/package.json +++ b/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.20.0", + "version": "0.22.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", @@ -59,17 +59,17 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", + "@opentelemetry/api-metrics": "0.22.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", @@ -77,7 +77,7 @@ "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "cpx": "1.5.0", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", diff --git a/packages/opentelemetry-instrumentation/src/instrumentation.ts b/packages/opentelemetry-instrumentation/src/instrumentation.ts index c1389ee12f1..56779a5e64c 100644 --- a/packages/opentelemetry-instrumentation/src/instrumentation.ts +++ b/packages/opentelemetry-instrumentation/src/instrumentation.ts @@ -14,7 +14,13 @@ * limitations under the License. */ -import { TracerProvider, Tracer, trace } from '@opentelemetry/api'; +import { + diag, + DiagLogger, + trace, + Tracer, + TracerProvider, +} from '@opentelemetry/api'; import { Meter, MeterProvider, metrics } from '@opentelemetry/api-metrics'; import * as shimmer from 'shimmer'; import { InstrumentationModuleDefinition } from './platform/node'; @@ -29,6 +35,7 @@ export abstract class InstrumentationAbstract private _tracer: Tracer; private _meter: Meter; + protected _diag: DiagLogger; constructor( public readonly instrumentationName: string, @@ -40,6 +47,10 @@ export abstract class InstrumentationAbstract ...config, }; + this._diag = diag.createComponentLogger({ + namespace: instrumentationName, + }); + this._tracer = trace.getTracer(instrumentationName, instrumentationVersion); this._meter = metrics.getMeter(instrumentationName, instrumentationVersion); diff --git a/packages/opentelemetry-instrumentation/src/version.ts b/packages/opentelemetry-instrumentation/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-instrumentation/src/version.ts +++ b/packages/opentelemetry-instrumentation/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json index 4d0e331389d..68cef60593a 100644 --- a/packages/opentelemetry-metrics/package.json +++ b/packages/opentelemetry-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/metrics", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -44,12 +44,12 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/lodash.merge": "4.6.6", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -59,12 +59,12 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/resources": "0.20.0", + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", "lodash.merge": "^4.6.2" } } diff --git a/packages/opentelemetry-metrics/src/version.ts b/packages/opentelemetry-metrics/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-metrics/src/version.ts +++ b/packages/opentelemetry-metrics/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json index 4b50c931ae7..30fe9b6bcdd 100644 --- a/packages/opentelemetry-node/package.json +++ b/packages/opentelemetry-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/node", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -41,15 +41,15 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -60,14 +60,14 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/propagator-jaeger": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/context-async-hooks": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/propagator-jaeger": "0.22.0", + "@opentelemetry/tracing": "0.22.0", "semver": "^7.1.3" } } diff --git a/packages/opentelemetry-node/src/version.ts b/packages/opentelemetry-node/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-node/src/version.ts +++ b/packages/opentelemetry-node/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 9f42dae43ba..2f426295003 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -43,16 +43,16 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "0.20.0" + "@opentelemetry/core": "0.22.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagator-b3/src/version.ts b/packages/opentelemetry-propagator-b3/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-propagator-b3/src/version.ts +++ b/packages/opentelemetry-propagator-b3/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index d292990ece4..d2299804d2b 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -47,12 +47,12 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -71,9 +71,9 @@ "webpack": "4.46.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0" + "@opentelemetry/core": "0.22.0" } } diff --git a/packages/opentelemetry-propagator-jaeger/src/version.ts b/packages/opentelemetry-propagator-jaeger/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-propagator-jaeger/src/version.ts +++ b/packages/opentelemetry-propagator-jaeger/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json index 7db91b831b1..e9de1b34b57 100644 --- a/packages/opentelemetry-resource-detector-aws/package.json +++ b/packages/opentelemetry-resource-detector-aws/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-aws", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry SDK resource detector for AWS", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -39,11 +39,11 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", @@ -54,11 +54,11 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0" } } diff --git a/packages/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts b/packages/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts index 2d54d9dde2d..694f55764a1 100644 --- a/packages/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts +++ b/packages/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts @@ -71,9 +71,9 @@ export class AwsBeanstalkDetector implements Detector { return new Resource({ [ResourceAttributes.CLOUD_PROVIDER]: CloudProviderValues.AWS, [ResourceAttributes.CLOUD_PLATFORM]: - CloudPlatformValues.AWS_ELASTICBEANSTALK, + CloudPlatformValues.AWS_ELASTIC_BEANSTALK, [ResourceAttributes.SERVICE_NAME]: - CloudPlatformValues.AWS_ELASTICBEANSTALK, + CloudPlatformValues.AWS_ELASTIC_BEANSTALK, [ResourceAttributes.SERVICE_NAMESPACE]: parsedData.environment_name, [ResourceAttributes.SERVICE_VERSION]: parsedData.version_label, [ResourceAttributes.SERVICE_INSTANCE_ID]: parsedData.deployment_id, diff --git a/packages/opentelemetry-resource-detector-aws/src/version.ts b/packages/opentelemetry-resource-detector-aws/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-resource-detector-aws/src/version.ts +++ b/packages/opentelemetry-resource-detector-aws/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts index b0403f46273..08ccc7269ae 100644 --- a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts +++ b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts @@ -58,7 +58,7 @@ describe('BeanstalkResourceDetector', () => { sinon.assert.calledOnce(readStub); assert.ok(resource); assertServiceResource(resource, { - name: CloudPlatformValues.AWS_ELASTICBEANSTALK, + name: CloudPlatformValues.AWS_ELASTIC_BEANSTALK, namespace: 'scorekeep', version: 'app-5a56-170119_190650-stage-170119_190650', instanceId: '32', @@ -80,7 +80,7 @@ describe('BeanstalkResourceDetector', () => { sinon.assert.calledOnce(readStub); assert.ok(resource); assertServiceResource(resource, { - name: CloudPlatformValues.AWS_ELASTICBEANSTALK, + name: CloudPlatformValues.AWS_ELASTIC_BEANSTALK, namespace: 'scorekeep', version: 'app-5a56-170119_190650-stage-170119_190650', instanceId: '32', diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json index b82e98560ff..eac212a3e5b 100644 --- a/packages/opentelemetry-resource-detector-gcp/package.json +++ b/packages/opentelemetry-resource-detector-gcp/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-gcp", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry SDK resource detector for GCP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -39,12 +39,12 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/core": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/core": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", @@ -54,11 +54,11 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "gcp-metadata": "^4.1.4", "semver": "7.3.5" } diff --git a/packages/opentelemetry-resource-detector-gcp/src/version.ts b/packages/opentelemetry-resource-detector-gcp/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-resource-detector-gcp/src/version.ts +++ b/packages/opentelemetry-resource-detector-gcp/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-resources/README.md b/packages/opentelemetry-resources/README.md index b6506a3583e..b29aded79a4 100644 --- a/packages/opentelemetry-resources/README.md +++ b/packages/opentelemetry-resources/README.md @@ -7,7 +7,7 @@ The OpenTelemetry Resource is an immutable representation of the entity producing telemetry. For example, a process producing telemetry that is running in a container on Kubernetes has a Pod name, it is in a namespace and possibly is part of a Deployment which also has a name. All three of these attributes can be included in the `Resource`. -[This document][resource-semantic_conventions] defines standard attributes for resources. +[This document][resource-semantic_conventions] defines standard attributes for resources which are accessible via [`@opentelemetry/semantic-conventions`](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions). ## Installation @@ -18,9 +18,11 @@ npm install --save @opentelemetry/resources ## Usage ```typescript -import { Resource, SERVICE_RESOURCE } from '@opentelemetry/resources'; +import { ResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { Resource } from '@opentelemetry/resources'; + const resource = new Resource({ - [SERVICE_RESOURCE.NAME]: 'api-service', + [ResourceAttributes.SERVICE_NAME]: 'api-service', }); const another_resource = new Resource({ diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 3dda0731970..8b49f8e030b 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -48,11 +48,11 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", @@ -63,10 +63,10 @@ "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0" } } diff --git a/packages/opentelemetry-resources/src/version.ts b/packages/opentelemetry-resources/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-resources/src/version.ts +++ b/packages/opentelemetry-resources/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-sdk-node/package.json b/packages/opentelemetry-sdk-node/package.json index 157f9158c2e..1fb2b4850cb 100644 --- a/packages/opentelemetry-sdk-node/package.json +++ b/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,27 +40,27 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-metrics": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/instrumentation": "0.20.0", - "@opentelemetry/metrics": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/resource-detector-aws": "0.20.0", - "@opentelemetry/resource-detector-gcp": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/metrics": "0.22.0", + "@opentelemetry/node": "0.22.0", + "@opentelemetry/resource-detector-aws": "0.22.0", + "@opentelemetry/resource-detector-gcp": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-async-hooks": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/semver": "7.3.5", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "gcp-metadata": "^4.1.4", "istanbul-instrumenter-loader": "3.0.1", "mocha": "7.2.0", diff --git a/packages/opentelemetry-sdk-node/src/version.ts b/packages/opentelemetry-sdk-node/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-sdk-node/src/version.ts +++ b/packages/opentelemetry-sdk-node/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 119cdb63e37..68787f17c0c 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -46,7 +46,7 @@ "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", diff --git a/packages/opentelemetry-semantic-conventions/src/resource/ResourceAttributes.ts b/packages/opentelemetry-semantic-conventions/src/resource/ResourceAttributes.ts index 4157bafeff1..06d7a872d34 100644 --- a/packages/opentelemetry-semantic-conventions/src/resource/ResourceAttributes.ts +++ b/packages/opentelemetry-semantic-conventions/src/resource/ResourceAttributes.ts @@ -16,409 +16,442 @@ // DO NOT EDIT, this is an Auto-generated file from scripts/semconv/templates//templates/SemanticAttributes.ts.j2 export const ResourceAttributes = { + /** - * Name of the cloud provider. - */ + * Name of the cloud provider. + */ CLOUD_PROVIDER: 'cloud.provider', /** - * The cloud account ID the resource is assigned to. - */ + * The cloud account ID the resource is assigned to. + */ CLOUD_ACCOUNT_ID: 'cloud.account.id', /** - * The geographical region the resource is running. Refer to your provider's docs to see the available regions, for example [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations). - */ + * The geographical region the resource is running. Refer to your provider's docs to see the available regions, for example [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations). + */ CLOUD_REGION: 'cloud.region', /** - * Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running. - * - * Note: Availability zones are called "zones" on Google Cloud. - */ + * Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running. + * + * Note: Availability zones are called "zones" on Google Cloud. + */ CLOUD_AVAILABILITY_ZONE: 'cloud.availability_zone', /** - * The cloud platform in use. - * - * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. - */ + * The cloud platform in use. + * + * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. + */ CLOUD_PLATFORM: 'cloud.platform', /** - * The Amazon Resource Name (ARN) of an [ECS container instance](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html). - */ + * The Amazon Resource Name (ARN) of an [ECS container instance](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html). + */ AWS_ECS_CONTAINER_ARN: 'aws.ecs.container.arn', /** - * The ARN of an [ECS cluster](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html). - */ + * The ARN of an [ECS cluster](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html). + */ AWS_ECS_CLUSTER_ARN: 'aws.ecs.cluster.arn', /** - * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. - */ + * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. + */ AWS_ECS_LAUNCHTYPE: 'aws.ecs.launchtype', /** - * The ARN of an [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html). - */ + * The ARN of an [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html). + */ AWS_ECS_TASK_ARN: 'aws.ecs.task.arn', /** - * The task definition family this task definition is a member of. - */ + * The task definition family this task definition is a member of. + */ AWS_ECS_TASK_FAMILY: 'aws.ecs.task.family', /** - * The revision for this task definition. - */ + * The revision for this task definition. + */ AWS_ECS_TASK_REVISION: 'aws.ecs.task.revision', /** - * The ARN of an EKS cluster. - */ + * The ARN of an EKS cluster. + */ AWS_EKS_CLUSTER_ARN: 'aws.eks.cluster.arn', /** - * The name(s) of the AWS log group(s) an application is writing to. - * - * Note: Multiple log groups must be supported for cases like multi-container applications, where a single application has sidecar containers, and each write to their own log group. - */ + * The name(s) of the AWS log group(s) an application is writing to. + * + * Note: Multiple log groups must be supported for cases like multi-container applications, where a single application has sidecar containers, and each write to their own log group. + */ AWS_LOG_GROUP_NAMES: 'aws.log.group.names', /** - * The Amazon Resource Name(s) (ARN) of the AWS log group(s). - * - * Note: See the [log group ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). - */ + * The Amazon Resource Name(s) (ARN) of the AWS log group(s). + * + * Note: See the [log group ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). + */ AWS_LOG_GROUP_ARNS: 'aws.log.group.arns', /** - * The name(s) of the AWS log stream(s) an application is writing to. - */ + * The name(s) of the AWS log stream(s) an application is writing to. + */ AWS_LOG_STREAM_NAMES: 'aws.log.stream.names', /** - * The ARN(s) of the AWS log stream(s). - * - * Note: See the [log stream ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). One log group can contain several log streams, so these ARNs necessarily identify both a log group and a log stream. - */ + * The ARN(s) of the AWS log stream(s). + * + * Note: See the [log stream ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). One log group can contain several log streams, so these ARNs necessarily identify both a log group and a log stream. + */ AWS_LOG_STREAM_ARNS: 'aws.log.stream.arns', /** - * Container name. - */ + * Container name. + */ CONTAINER_NAME: 'container.name', /** - * Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. - */ + * Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. + */ CONTAINER_ID: 'container.id', /** - * The container runtime managing this container. - */ + * The container runtime managing this container. + */ CONTAINER_RUNTIME: 'container.runtime', /** - * Name of the image the container was built on. - */ + * Name of the image the container was built on. + */ CONTAINER_IMAGE_NAME: 'container.image.name', /** - * Container image tag. - */ + * Container image tag. + */ CONTAINER_IMAGE_TAG: 'container.image.tag', /** - * Name of the [deployment environment](https://en.wikipedia.org/wiki/Deployment_environment) (aka deployment tier). - */ + * Name of the [deployment environment](https://en.wikipedia.org/wiki/Deployment_environment) (aka deployment tier). + */ DEPLOYMENT_ENVIRONMENT: 'deployment.environment', /** - * The name of the function being executed. - */ + * A unique identifier representing the device. + * + * Note: The device identifier MUST only be defined using the values outlined below. This value is not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this value MUST be equal to the [vendor identifier](https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor). On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation ID or a globally unique UUID which is persisted across sessions in your application. More information can be found [here](https://developer.android.com/training/articles/user-data-ids) on best practices and exact implementation details. Caution should be taken when storing personal data or anything which can identify a user. GDPR and data protection laws may apply, ensure you do your own due diligence. + */ + DEVICE_ID: 'device.id', + + /** + * The model identifier for the device. + * + * Note: It's recommended this value represents a machine readable version of the model identifier rather than the market or consumer-friendly name of the device. + */ + DEVICE_MODEL_IDENTIFIER: 'device.model.identifier', + + /** + * The marketing name for the device model. + * + * Note: It's recommended this value represents a human readable version of the device model rather than a machine readable alternative. + */ + DEVICE_MODEL_NAME: 'device.model.name', + + /** + * The name of the function being executed. + */ FAAS_NAME: 'faas.name', /** - * The unique ID of the function being executed. - * - * Note: For example, in AWS Lambda this field corresponds to the [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) value, in GCP to the URI of the resource, and in Azure to the [FunctionDirectory](https://github.com/Azure/azure-functions-host/wiki/Retrieving-information-about-the-currently-running-function) field. - */ + * The unique ID of the function being executed. + * + * Note: For example, in AWS Lambda this field corresponds to the [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) value, in GCP to the URI of the resource, and in Azure to the [FunctionDirectory](https://github.com/Azure/azure-functions-host/wiki/Retrieving-information-about-the-currently-running-function) field. + */ FAAS_ID: 'faas.id', /** - * The version string of the function being executed as defined in [Version Attributes](../../resource/semantic_conventions/README.md#version-attributes). - */ + * The version string of the function being executed as defined in [Version Attributes](../../resource/semantic_conventions/README.md#version-attributes). + */ FAAS_VERSION: 'faas.version', /** - * The execution environment ID as a string. - */ + * The execution environment ID as a string. + */ FAAS_INSTANCE: 'faas.instance', /** - * The amount of memory available to the serverless function in MiB. - * - * Note: It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable `AWS_LAMBDA_FUNCTION_MEMORY_SIZE` provides this information. - */ + * The amount of memory available to the serverless function in MiB. + * + * Note: It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable `AWS_LAMBDA_FUNCTION_MEMORY_SIZE` provides this information. + */ FAAS_MAX_MEMORY: 'faas.max_memory', /** - * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. - */ + * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. + */ HOST_ID: 'host.id', /** - * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully qualified hostname, or another name specified by the user. - */ + * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully qualified hostname, or another name specified by the user. + */ HOST_NAME: 'host.name', /** - * Type of host. For Cloud, this must be the machine type. - */ + * Type of host. For Cloud, this must be the machine type. + */ HOST_TYPE: 'host.type', /** - * The CPU architecture the host system is running on. - */ + * The CPU architecture the host system is running on. + */ HOST_ARCH: 'host.arch', /** - * Name of the VM image or OS install the host was instantiated from. - */ + * Name of the VM image or OS install the host was instantiated from. + */ HOST_IMAGE_NAME: 'host.image.name', /** - * VM image ID. For Cloud, this value is from the provider. - */ + * VM image ID. For Cloud, this value is from the provider. + */ HOST_IMAGE_ID: 'host.image.id', /** - * The version string of the VM image as defined in [Version Attributes](README.md#version-attributes). - */ + * The version string of the VM image as defined in [Version Attributes](README.md#version-attributes). + */ HOST_IMAGE_VERSION: 'host.image.version', /** - * The name of the cluster. - */ + * The name of the cluster. + */ K8S_CLUSTER_NAME: 'k8s.cluster.name', /** - * The name of the Node. - */ + * The name of the Node. + */ K8S_NODE_NAME: 'k8s.node.name', /** - * The UID of the Node. - */ + * The UID of the Node. + */ K8S_NODE_UID: 'k8s.node.uid', /** - * The name of the namespace that the pod is running in. - */ + * The name of the namespace that the pod is running in. + */ K8S_NAMESPACE_NAME: 'k8s.namespace.name', /** - * The UID of the Pod. - */ + * The UID of the Pod. + */ K8S_POD_UID: 'k8s.pod.uid', /** - * The name of the Pod. - */ + * The name of the Pod. + */ K8S_POD_NAME: 'k8s.pod.name', /** - * The name of the Container in a Pod template. - */ + * The name of the Container in a Pod template. + */ K8S_CONTAINER_NAME: 'k8s.container.name', /** - * The UID of the ReplicaSet. - */ + * The UID of the ReplicaSet. + */ K8S_REPLICASET_UID: 'k8s.replicaset.uid', /** - * The name of the ReplicaSet. - */ + * The name of the ReplicaSet. + */ K8S_REPLICASET_NAME: 'k8s.replicaset.name', /** - * The UID of the Deployment. - */ + * The UID of the Deployment. + */ K8S_DEPLOYMENT_UID: 'k8s.deployment.uid', /** - * The name of the Deployment. - */ + * The name of the Deployment. + */ K8S_DEPLOYMENT_NAME: 'k8s.deployment.name', /** - * The UID of the StatefulSet. - */ + * The UID of the StatefulSet. + */ K8S_STATEFULSET_UID: 'k8s.statefulset.uid', /** - * The name of the StatefulSet. - */ + * The name of the StatefulSet. + */ K8S_STATEFULSET_NAME: 'k8s.statefulset.name', /** - * The UID of the DaemonSet. - */ + * The UID of the DaemonSet. + */ K8S_DAEMONSET_UID: 'k8s.daemonset.uid', /** - * The name of the DaemonSet. - */ + * The name of the DaemonSet. + */ K8S_DAEMONSET_NAME: 'k8s.daemonset.name', /** - * The UID of the Job. - */ + * The UID of the Job. + */ K8S_JOB_UID: 'k8s.job.uid', /** - * The name of the Job. - */ + * The name of the Job. + */ K8S_JOB_NAME: 'k8s.job.name', /** - * The UID of the CronJob. - */ + * The UID of the CronJob. + */ K8S_CRONJOB_UID: 'k8s.cronjob.uid', /** - * The name of the CronJob. - */ + * The name of the CronJob. + */ K8S_CRONJOB_NAME: 'k8s.cronjob.name', /** - * The operating system type. - */ + * The operating system type. + */ OS_TYPE: 'os.type', /** - * Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. - */ + * Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. + */ OS_DESCRIPTION: 'os.description', /** - * Process identifier (PID). - */ + * Human readable operating system name. + */ + OS_NAME: 'os.name', + + /** + * The version string of the operating system as defined in [Version Attributes](../../resource/semantic_conventions/README.md#version-attributes). + */ + OS_VERSION: 'os.version', + + /** + * Process identifier (PID). + */ PROCESS_PID: 'process.pid', /** - * The name of the process executable. On Linux based systems, can be set to the `Name` in `proc/[pid]/status`. On Windows, can be set to the base name of `GetProcessImageFileNameW`. - */ + * The name of the process executable. On Linux based systems, can be set to the `Name` in `proc/[pid]/status`. On Windows, can be set to the base name of `GetProcessImageFileNameW`. + */ PROCESS_EXECUTABLE_NAME: 'process.executable.name', /** - * The full path to the process executable. On Linux based systems, can be set to the target of `proc/[pid]/exe`. On Windows, can be set to the result of `GetProcessImageFileNameW`. - */ + * The full path to the process executable. On Linux based systems, can be set to the target of `proc/[pid]/exe`. On Windows, can be set to the result of `GetProcessImageFileNameW`. + */ PROCESS_EXECUTABLE_PATH: 'process.executable.path', /** - * The command used to launch the process (i.e. the command name). On Linux based systems, can be set to the zeroth string in `proc/[pid]/cmdline`. On Windows, can be set to the first parameter extracted from `GetCommandLineW`. - */ + * The command used to launch the process (i.e. the command name). On Linux based systems, can be set to the zeroth string in `proc/[pid]/cmdline`. On Windows, can be set to the first parameter extracted from `GetCommandLineW`. + */ PROCESS_COMMAND: 'process.command', /** - * The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. - */ + * The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. + */ PROCESS_COMMAND_LINE: 'process.command_line', /** - * All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. - */ + * All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. + */ PROCESS_COMMAND_ARGS: 'process.command_args', /** - * The username of the user that owns the process. - */ + * The username of the user that owns the process. + */ PROCESS_OWNER: 'process.owner', /** - * The name of the runtime of this process. For compiled native binaries, this SHOULD be the name of the compiler. - */ + * The name of the runtime of this process. For compiled native binaries, this SHOULD be the name of the compiler. + */ PROCESS_RUNTIME_NAME: 'process.runtime.name', /** - * The version of the runtime of this process, as returned by the runtime without modification. - */ + * The version of the runtime of this process, as returned by the runtime without modification. + */ PROCESS_RUNTIME_VERSION: 'process.runtime.version', /** - * An additional description about the runtime of the process, for example a specific vendor customization of the runtime environment. - */ + * An additional description about the runtime of the process, for example a specific vendor customization of the runtime environment. + */ PROCESS_RUNTIME_DESCRIPTION: 'process.runtime.description', /** - * Logical name of the service. - * - * Note: MUST be the same for all instances of horizontally scaled services. If the value was not specified, SDKs MUST fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md#process), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value MUST be set to `unknown_service`. - */ + * Logical name of the service. + * + * Note: MUST be the same for all instances of horizontally scaled services. If the value was not specified, SDKs MUST fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md#process), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value MUST be set to `unknown_service`. + */ SERVICE_NAME: 'service.name', /** - * A namespace for `service.name`. - * - * Note: A string value having a meaning that helps to distinguish a group of services, for example the team name that owns a group of services. `service.name` is expected to be unique within the same namespace. If `service.namespace` is not specified in the Resource then `service.name` is expected to be unique for all services that have no explicit namespace defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length namespace string is assumed equal to unspecified namespace. - */ + * A namespace for `service.name`. + * + * Note: A string value having a meaning that helps to distinguish a group of services, for example the team name that owns a group of services. `service.name` is expected to be unique within the same namespace. If `service.namespace` is not specified in the Resource then `service.name` is expected to be unique for all services that have no explicit namespace defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length namespace string is assumed equal to unspecified namespace. + */ SERVICE_NAMESPACE: 'service.namespace', /** - * The string ID of the service instance. - * - * Note: MUST be unique for each instance of the same `service.namespace,service.name` pair (in other words `service.namespace,service.name,service.instance.id` triplet MUST be globally unique). The ID helps to distinguish instances of the same service that exist at the same time (e.g. instances of a horizontally scaled service). It is preferable for the ID to be persistent and stay the same for the lifetime of the service instance, however it is acceptable that the ID is ephemeral and changes during important lifetime events for the service (e.g. service restarts). If the service has no inherent unique ID that can be used as the value of this attribute it is recommended to generate a random Version 1 or Version 4 RFC 4122 UUID (services aiming for reproducible UUIDs may also use Version 5, see RFC 4122 for more recommendations). - */ + * The string ID of the service instance. + * + * Note: MUST be unique for each instance of the same `service.namespace,service.name` pair (in other words `service.namespace,service.name,service.instance.id` triplet MUST be globally unique). The ID helps to distinguish instances of the same service that exist at the same time (e.g. instances of a horizontally scaled service). It is preferable for the ID to be persistent and stay the same for the lifetime of the service instance, however it is acceptable that the ID is ephemeral and changes during important lifetime events for the service (e.g. service restarts). If the service has no inherent unique ID that can be used as the value of this attribute it is recommended to generate a random Version 1 or Version 4 RFC 4122 UUID (services aiming for reproducible UUIDs may also use Version 5, see RFC 4122 for more recommendations). + */ SERVICE_INSTANCE_ID: 'service.instance.id', /** - * The version string of the service API or implementation. - */ + * The version string of the service API or implementation. + */ SERVICE_VERSION: 'service.version', /** - * The name of the telemetry SDK as defined above. - */ + * The name of the telemetry SDK as defined above. + */ TELEMETRY_SDK_NAME: 'telemetry.sdk.name', /** - * The language of the telemetry SDK. - */ + * The language of the telemetry SDK. + */ TELEMETRY_SDK_LANGUAGE: 'telemetry.sdk.language', /** - * The version string of the telemetry SDK. - */ + * The version string of the telemetry SDK. + */ TELEMETRY_SDK_VERSION: 'telemetry.sdk.version', /** - * The version string of the auto instrumentation agent, if used. - */ + * The version string of the auto instrumentation agent, if used. + */ TELEMETRY_AUTO_VERSION: 'telemetry.auto.version', /** - * The name of the web engine. - */ + * The name of the web engine. + */ WEBENGINE_NAME: 'webengine.name', /** - * The version of the web engine. - */ + * The version of the web engine. + */ WEBENGINE_VERSION: 'webengine.version', /** - * Additional description of the web engine (e.g. detailed version and edition information). - */ + * Additional description of the web engine (e.g. detailed version and edition information). + */ WEBENGINE_DESCRIPTION: 'webengine.description', -}; +} // Enum definitions + export enum CloudProviderValues { /** Amazon Web Services. */ AWS = 'aws', @@ -428,6 +461,9 @@ export enum CloudProviderValues { GCP = 'gcp', } + + + export enum CloudPlatformValues { /** AWS Elastic Compute Cloud. */ AWS_EC2 = 'aws_ec2', @@ -438,29 +474,32 @@ export enum CloudPlatformValues { /** AWS Lambda. */ AWS_LAMBDA = 'aws_lambda', /** AWS Elastic Beanstalk. */ - AWS_ELASTICBEANSTALK = 'aws_elastic_beanstalk', + AWS_ELASTIC_BEANSTALK = 'aws_elastic_beanstalk', /** Azure Virtual Machines. */ AZURE_VM = 'azure_vm', /** Azure Container Instances. */ - AZURE_CONTAINERINSTANCES = 'azure_container_instances', + AZURE_CONTAINER_INSTANCES = 'azure_container_instances', /** Azure Kubernetes Service. */ AZURE_AKS = 'azure_aks', /** Azure Functions. */ AZURE_FUNCTIONS = 'azure_functions', /** Azure App Service. */ - AZURE_APPSERVICE = 'azure_app_service', + AZURE_APP_SERVICE = 'azure_app_service', /** Google Cloud Compute Engine (GCE). */ - GCP_COMPUTEENGINE = 'gcp_compute_engine', + GCP_COMPUTE_ENGINE = 'gcp_compute_engine', /** Google Cloud Run. */ - GCP_CLOUDRUN = 'gcp_cloud_run', + GCP_CLOUD_RUN = 'gcp_cloud_run', /** Google Cloud Kubernetes Engine (GKE). */ - GCP_KUBERNETESENGINE = 'gcp_kubernetes_engine', + GCP_KUBERNETES_ENGINE = 'gcp_kubernetes_engine', /** Google Cloud Functions (GCF). */ - GCP_CLOUDFUNCTIONS = 'gcp_cloud_functions', + GCP_CLOUD_FUNCTIONS = 'gcp_cloud_functions', /** Google Cloud App Engine (GAE). */ - GCP_APPENGINE = 'gcp_app_engine', + GCP_APP_ENGINE = 'gcp_app_engine', } + + + export enum AwsEcsLaunchtypeValues { /** ec2. */ EC2 = 'ec2', @@ -468,6 +507,9 @@ export enum AwsEcsLaunchtypeValues { FARGATE = 'fargate', } + + + export enum HostArchValues { /** AMD64. */ AMD64 = 'amd64', @@ -485,31 +527,37 @@ export enum HostArchValues { X86 = 'x86', } + + + export enum OsTypeValues { /** Microsoft Windows. */ - WINDOWS = 'WINDOWS', + WINDOWS = 'windows', /** Linux. */ - LINUX = 'LINUX', + LINUX = 'linux', /** Apple Darwin. */ - DARWIN = 'DARWIN', + DARWIN = 'darwin', /** FreeBSD. */ - FREEBSD = 'FREEBSD', + FREEBSD = 'freebsd', /** NetBSD. */ - NETBSD = 'NETBSD', + NETBSD = 'netbsd', /** OpenBSD. */ - OPENBSD = 'OPENBSD', + OPENBSD = 'openbsd', /** DragonFly BSD. */ - DRAGONFLYBSD = 'DRAGONFLYBSD', + DRAGONFLYBSD = 'dragonflybsd', /** HP-UX (Hewlett Packard Unix). */ - HPUX = 'HPUX', + HPUX = 'hpux', /** AIX (Advanced Interactive eXecutive). */ - AIX = 'AIX', + AIX = 'aix', /** Oracle Solaris. */ - SOLARIS = 'SOLARIS', + SOLARIS = 'solaris', /** IBM z/OS. */ - ZOS = 'ZOS', + Z_OS = 'z_os', } + + + export enum TelemetrySdkLanguageValues { /** cpp. */ CPP = 'cpp', @@ -532,3 +580,4 @@ export enum TelemetrySdkLanguageValues { /** webjs. */ WEBJS = 'webjs', } + diff --git a/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts b/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts index 6dbda53b4be..30f20a7b2e6 100644 --- a/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts +++ b/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts @@ -16,132 +16,132 @@ // DO NOT EDIT, this is an Auto-generated file from scripts/semconv/templates//templates/SemanticAttributes.ts.j2 export const SemanticAttributes = { + /** - * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. - */ + * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. + */ DB_SYSTEM: 'db.system', /** - * The connection string used to connect to the database. It is recommended to remove embedded credentials. - */ + * The connection string used to connect to the database. It is recommended to remove embedded credentials. + */ DB_CONNECTION_STRING: 'db.connection_string', /** - * Username for accessing the database. - */ + * Username for accessing the database. + */ DB_USER: 'db.user', /** - * The fully-qualified class name of the [Java Database Connectivity (JDBC)](https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) driver used to connect. - */ + * The fully-qualified class name of the [Java Database Connectivity (JDBC)](https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) driver used to connect. + */ DB_JDBC_DRIVER_CLASSNAME: 'db.jdbc.driver_classname', /** - * If no [tech-specific attribute](#call-level-attributes-for-specific-technologies) is defined, this attribute is used to report the name of the database being accessed. For commands that switch the database, this should be set to the target database (even if the command fails). - * - * Note: In some SQL databases, the database name to be used is called "schema name". - */ + * If no [tech-specific attribute](#call-level-attributes-for-specific-technologies) is defined, this attribute is used to report the name of the database being accessed. For commands that switch the database, this should be set to the target database (even if the command fails). + * + * Note: In some SQL databases, the database name to be used is called "schema name". + */ DB_NAME: 'db.name', /** - * The database statement being executed. - * - * Note: The value may be sanitized to exclude sensitive information. - */ + * The database statement being executed. + * + * Note: The value may be sanitized to exclude sensitive information. + */ DB_STATEMENT: 'db.statement', /** - * The name of the operation being executed, e.g. the [MongoDB command name](https://docs.mongodb.com/manual/reference/command/#database-operations) such as `findAndModify`, or the SQL keyword. - * - * Note: When setting this to an SQL keyword, it is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if the operation name is provided by the library being instrumented. If the SQL statement has an ambiguous operation, or performs more than one operation, this value may be omitted. - */ + * The name of the operation being executed, e.g. the [MongoDB command name](https://docs.mongodb.com/manual/reference/command/#database-operations) such as `findAndModify`, or the SQL keyword. + * + * Note: When setting this to an SQL keyword, it is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if the operation name is provided by the library being instrumented. If the SQL statement has an ambiguous operation, or performs more than one operation, this value may be omitted. + */ DB_OPERATION: 'db.operation', /** - * The Microsoft SQL Server [instance name](https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15) connecting to. This name is used to determine the port of a named instance. - * - * Note: If setting a `db.mssql.instance_name`, `net.peer.port` is no longer required (but still recommended if non-standard). - */ + * The Microsoft SQL Server [instance name](https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15) connecting to. This name is used to determine the port of a named instance. + * + * Note: If setting a `db.mssql.instance_name`, `net.peer.port` is no longer required (but still recommended if non-standard). + */ DB_MSSQL_INSTANCE_NAME: 'db.mssql.instance_name', /** - * The name of the keyspace being accessed. To be used instead of the generic `db.name` attribute. - */ + * The name of the keyspace being accessed. To be used instead of the generic `db.name` attribute. + */ DB_CASSANDRA_KEYSPACE: 'db.cassandra.keyspace', /** - * The fetch size used for paging, i.e. how many rows will be returned at once. - */ + * The fetch size used for paging, i.e. how many rows will be returned at once. + */ DB_CASSANDRA_PAGE_SIZE: 'db.cassandra.page_size', /** - * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). - */ + * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). + */ DB_CASSANDRA_CONSISTENCY_LEVEL: 'db.cassandra.consistency_level', /** - * The name of the primary table that the operation is acting upon, including the schema name (if applicable). - * - * Note: This mirrors the db.sql.table attribute but references cassandra rather than sql. It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. - */ + * The name of the primary table that the operation is acting upon, including the schema name (if applicable). + * + * Note: This mirrors the db.sql.table attribute but references cassandra rather than sql. It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. + */ DB_CASSANDRA_TABLE: 'db.cassandra.table', /** - * Whether or not the query is idempotent. - */ + * Whether or not the query is idempotent. + */ DB_CASSANDRA_IDEMPOTENCE: 'db.cassandra.idempotence', /** - * The number of times a query was speculatively executed. Not set or `0` if the query was not executed speculatively. - */ - DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT: - 'db.cassandra.speculative_execution_count', + * The number of times a query was speculatively executed. Not set or `0` if the query was not executed speculatively. + */ + DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT: 'db.cassandra.speculative_execution_count', /** - * The ID of the coordinating node for a query. - */ + * The ID of the coordinating node for a query. + */ DB_CASSANDRA_COORDINATOR_ID: 'db.cassandra.coordinator.id', /** - * The data center of the coordinating node for a query. - */ + * The data center of the coordinating node for a query. + */ DB_CASSANDRA_COORDINATOR_DC: 'db.cassandra.coordinator.dc', /** - * The [HBase namespace](https://hbase.apache.org/book.html#_namespace) being accessed. To be used instead of the generic `db.name` attribute. - */ + * The [HBase namespace](https://hbase.apache.org/book.html#_namespace) being accessed. To be used instead of the generic `db.name` attribute. + */ DB_HBASE_NAMESPACE: 'db.hbase.namespace', /** - * The index of the database being accessed as used in the [`SELECT` command](https://redis.io/commands/select), provided as an integer. To be used instead of the generic `db.name` attribute. - */ + * The index of the database being accessed as used in the [`SELECT` command](https://redis.io/commands/select), provided as an integer. To be used instead of the generic `db.name` attribute. + */ DB_REDIS_DATABASE_INDEX: 'db.redis.database_index', /** - * The collection being accessed within the database stated in `db.name`. - */ + * The collection being accessed within the database stated in `db.name`. + */ DB_MONGODB_COLLECTION: 'db.mongodb.collection', /** - * The name of the primary table that the operation is acting upon, including the schema name (if applicable). - * - * Note: It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. - */ + * The name of the primary table that the operation is acting upon, including the schema name (if applicable). + * + * Note: It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. + */ DB_SQL_TABLE: 'db.sql.table', /** - * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the exception should be preferred over the static type in languages that support it. - */ + * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the exception should be preferred over the static type in languages that support it. + */ EXCEPTION_TYPE: 'exception.type', /** - * The exception message. - */ + * The exception message. + */ EXCEPTION_MESSAGE: 'exception.message', /** - * A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. - */ + * A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. + */ EXCEPTION_STACKTRACE: 'exception.stacktrace', /** @@ -167,466 +167,490 @@ clear whether the exception will escape. EXCEPTION_ESCAPED: 'exception.escaped', /** - * Type of the trigger on which the function is executed. - */ + * Type of the trigger on which the function is executed. + */ FAAS_TRIGGER: 'faas.trigger', /** - * The execution ID of the current function execution. - */ + * The execution ID of the current function execution. + */ FAAS_EXECUTION: 'faas.execution', /** - * The name of the source on which the triggering operation was performed. For example, in Cloud Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name. - */ + * The name of the source on which the triggering operation was performed. For example, in Cloud Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name. + */ FAAS_DOCUMENT_COLLECTION: 'faas.document.collection', /** - * Describes the type of the operation that was performed on the data. - */ + * Describes the type of the operation that was performed on the data. + */ FAAS_DOCUMENT_OPERATION: 'faas.document.operation', /** - * A string containing the time when the data was accessed in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). - */ + * A string containing the time when the data was accessed in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). + */ FAAS_DOCUMENT_TIME: 'faas.document.time', /** - * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the name of the file, and in Cosmos DB the table name. - */ + * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the name of the file, and in Cosmos DB the table name. + */ FAAS_DOCUMENT_NAME: 'faas.document.name', /** - * A string containing the function invocation time in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). - */ + * A string containing the function invocation time in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). + */ FAAS_TIME: 'faas.time', /** - * A string containing the schedule period as [Cron Expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm). - */ + * A string containing the schedule period as [Cron Expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm). + */ FAAS_CRON: 'faas.cron', /** - * A boolean that is true if the serverless function is executed for the first time (aka cold-start). - */ + * A boolean that is true if the serverless function is executed for the first time (aka cold-start). + */ FAAS_COLDSTART: 'faas.coldstart', /** - * The name of the invoked function. - * - * Note: SHOULD be equal to the `faas.name` resource attribute of the invoked function. - */ + * The name of the invoked function. + * + * Note: SHOULD be equal to the `faas.name` resource attribute of the invoked function. + */ FAAS_INVOKED_NAME: 'faas.invoked_name', /** - * The cloud provider of the invoked function. - * - * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. - */ + * The cloud provider of the invoked function. + * + * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. + */ FAAS_INVOKED_PROVIDER: 'faas.invoked_provider', /** - * The cloud region of the invoked function. - * - * Note: SHOULD be equal to the `cloud.region` resource attribute of the invoked function. - */ + * The cloud region of the invoked function. + * + * Note: SHOULD be equal to the `cloud.region` resource attribute of the invoked function. + */ FAAS_INVOKED_REGION: 'faas.invoked_region', /** - * Transport protocol used. See note below. - */ + * Transport protocol used. See note below. + */ NET_TRANSPORT: 'net.transport', /** - * Remote address of the peer (dotted decimal for IPv4 or [RFC5952](https://tools.ietf.org/html/rfc5952) for IPv6). - */ + * Remote address of the peer (dotted decimal for IPv4 or [RFC5952](https://tools.ietf.org/html/rfc5952) for IPv6). + */ NET_PEER_IP: 'net.peer.ip', /** - * Remote port number. - */ + * Remote port number. + */ NET_PEER_PORT: 'net.peer.port', /** - * Remote hostname or similar, see note below. - */ + * Remote hostname or similar, see note below. + */ NET_PEER_NAME: 'net.peer.name', /** - * Like `net.peer.ip` but for the host IP. Useful in case of a multi-IP host. - */ + * Like `net.peer.ip` but for the host IP. Useful in case of a multi-IP host. + */ NET_HOST_IP: 'net.host.ip', /** - * Like `net.peer.port` but for the host port. - */ + * Like `net.peer.port` but for the host port. + */ NET_HOST_PORT: 'net.host.port', /** - * Local hostname or similar, see note below. - */ + * Local hostname or similar, see note below. + */ NET_HOST_NAME: 'net.host.name', /** - * The [`service.name`](../../resource/semantic_conventions/README.md#service) of the remote service. SHOULD be equal to the actual `service.name` resource attribute of the remote service if any. - */ + * The [`service.name`](../../resource/semantic_conventions/README.md#service) of the remote service. SHOULD be equal to the actual `service.name` resource attribute of the remote service if any. + */ PEER_SERVICE: 'peer.service', /** - * Username or client_id extracted from the access token or [Authorization](https://tools.ietf.org/html/rfc7235#section-4.2) header in the inbound request from outside the system. - */ + * Username or client_id extracted from the access token or [Authorization](https://tools.ietf.org/html/rfc7235#section-4.2) header in the inbound request from outside the system. + */ ENDUSER_ID: 'enduser.id', /** - * Actual/assumed role the client is making the request under extracted from token or application security context. - */ + * Actual/assumed role the client is making the request under extracted from token or application security context. + */ ENDUSER_ROLE: 'enduser.role', /** - * Scopes or granted authorities the client currently possesses extracted from token or application security context. The value would come from the scope associated with an [OAuth 2.0 Access Token](https://tools.ietf.org/html/rfc6749#section-3.3) or an attribute value in a [SAML 2.0 Assertion](http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html). - */ + * Scopes or granted authorities the client currently possesses extracted from token or application security context. The value would come from the scope associated with an [OAuth 2.0 Access Token](https://tools.ietf.org/html/rfc6749#section-3.3) or an attribute value in a [SAML 2.0 Assertion](http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html). + */ ENDUSER_SCOPE: 'enduser.scope', /** - * Current "managed" thread ID (as opposed to OS thread ID). - */ + * Current "managed" thread ID (as opposed to OS thread ID). + */ THREAD_ID: 'thread.id', /** - * Current thread name. - */ + * Current thread name. + */ THREAD_NAME: 'thread.name', /** - * The method or function name, or equivalent (usually rightmost part of the code unit's name). - */ + * The method or function name, or equivalent (usually rightmost part of the code unit's name). + */ CODE_FUNCTION: 'code.function', /** - * The "namespace" within which `code.function` is defined. Usually the qualified class or module name, such that `code.namespace` + some separator + `code.function` form a unique identifier for the code unit. - */ + * The "namespace" within which `code.function` is defined. Usually the qualified class or module name, such that `code.namespace` + some separator + `code.function` form a unique identifier for the code unit. + */ CODE_NAMESPACE: 'code.namespace', /** - * The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path). - */ + * The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path). + */ CODE_FILEPATH: 'code.filepath', /** - * The line number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`. - */ + * The line number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`. + */ CODE_LINENO: 'code.lineno', /** - * HTTP request method. - */ + * HTTP request method. + */ HTTP_METHOD: 'http.method', /** - * Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]`. Usually the fragment is not transmitted over HTTP, but if it is known, it should be included nevertheless. - * - * Note: `http.url` MUST NOT contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case the attribute's value should be `https://www.example.com/`. - */ + * Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]`. Usually the fragment is not transmitted over HTTP, but if it is known, it should be included nevertheless. + * + * Note: `http.url` MUST NOT contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case the attribute's value should be `https://www.example.com/`. + */ HTTP_URL: 'http.url', /** - * The full request target as passed in a HTTP request line or equivalent. - */ + * The full request target as passed in a HTTP request line or equivalent. + */ HTTP_TARGET: 'http.target', /** - * The value of the [HTTP host header](https://tools.ietf.org/html/rfc7230#section-5.4). When the header is empty or not present, this attribute should be the same. - */ + * The value of the [HTTP host header](https://tools.ietf.org/html/rfc7230#section-5.4). When the header is empty or not present, this attribute should be the same. + */ HTTP_HOST: 'http.host', /** - * The URI scheme identifying the used protocol. - */ + * The URI scheme identifying the used protocol. + */ HTTP_SCHEME: 'http.scheme', /** - * [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). - */ + * [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). + */ HTTP_STATUS_CODE: 'http.status_code', /** - * Kind of HTTP protocol used. - * - * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. - */ + * Kind of HTTP protocol used. + * + * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. + */ HTTP_FLAVOR: 'http.flavor', /** - * Value of the [HTTP User-Agent](https://tools.ietf.org/html/rfc7231#section-5.5.3) header sent by the client. - */ + * Value of the [HTTP User-Agent](https://tools.ietf.org/html/rfc7231#section-5.5.3) header sent by the client. + */ HTTP_USER_AGENT: 'http.user_agent', /** - * The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. - */ + * The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. + */ HTTP_REQUEST_CONTENT_LENGTH: 'http.request_content_length', /** - * The size of the uncompressed request payload body after transport decoding. Not set if transport encoding not used. - */ - HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED: - 'http.request_content_length_uncompressed', + * The size of the uncompressed request payload body after transport decoding. Not set if transport encoding not used. + */ + HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED: 'http.request_content_length_uncompressed', /** - * The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. - */ + * The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. + */ HTTP_RESPONSE_CONTENT_LENGTH: 'http.response_content_length', /** - * The size of the uncompressed response payload body after transport decoding. Not set if transport encoding not used. - */ - HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED: - 'http.response_content_length_uncompressed', + * The size of the uncompressed response payload body after transport decoding. Not set if transport encoding not used. + */ + HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED: 'http.response_content_length_uncompressed', /** - * The primary server name of the matched virtual host. This should be obtained via configuration. If no such configuration can be obtained, this attribute MUST NOT be set ( `net.host.name` should be used instead). - * - * Note: `http.url` is usually not readily available on the server side but would have to be assembled in a cumbersome and sometimes lossy process from other information (see e.g. open-telemetry/opentelemetry-python/pull/148). It is thus preferred to supply the raw data that is available. - */ + * The primary server name of the matched virtual host. This should be obtained via configuration. If no such configuration can be obtained, this attribute MUST NOT be set ( `net.host.name` should be used instead). + * + * Note: `http.url` is usually not readily available on the server side but would have to be assembled in a cumbersome and sometimes lossy process from other information (see e.g. open-telemetry/opentelemetry-python/pull/148). It is thus preferred to supply the raw data that is available. + */ HTTP_SERVER_NAME: 'http.server_name', /** - * The matched route (path template). - */ + * The matched route (path template). + */ HTTP_ROUTE: 'http.route', /** - * The IP address of the original client behind all proxies, if known (e.g. from [X-Forwarded-For](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For)). - * - * Note: This is not necessarily the same as `net.peer.ip`, which would identify the network-level peer, which may be a proxy. - */ + * The IP address of the original client behind all proxies, if known (e.g. from [X-Forwarded-For](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For)). + * + * Note: This is not necessarily the same as `net.peer.ip`, which would identify the network-level peer, which may be a proxy. + */ HTTP_CLIENT_IP: 'http.client_ip', /** - * The keys in the `RequestItems` object field. - */ + * The keys in the `RequestItems` object field. + */ AWS_DYNAMODB_TABLE_NAMES: 'aws.dynamodb.table_names', /** - * The JSON-serialized value of each item in the `ConsumedCapacity` response field. - */ + * The JSON-serialized value of each item in the `ConsumedCapacity` response field. + */ AWS_DYNAMODB_CONSUMED_CAPACITY: 'aws.dynamodb.consumed_capacity', /** - * The JSON-serialized value of the `ItemCollectionMetrics` response field. - */ + * The JSON-serialized value of the `ItemCollectionMetrics` response field. + */ AWS_DYNAMODB_ITEM_COLLECTION_METRICS: 'aws.dynamodb.item_collection_metrics', /** - * The value of the `ProvisionedThroughput.ReadCapacityUnits` request parameter. - */ - AWS_DYNAMODB_PROVISIONED_READ_CAPACITY: - 'aws.dynamodb.provisioned_read_capacity', + * The value of the `ProvisionedThroughput.ReadCapacityUnits` request parameter. + */ + AWS_DYNAMODB_PROVISIONED_READ_CAPACITY: 'aws.dynamodb.provisioned_read_capacity', /** - * The value of the `ProvisionedThroughput.WriteCapacityUnits` request parameter. - */ - AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY: - 'aws.dynamodb.provisioned_write_capacity', + * The value of the `ProvisionedThroughput.WriteCapacityUnits` request parameter. + */ + AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY: 'aws.dynamodb.provisioned_write_capacity', /** - * The value of the `ConsistentRead` request parameter. - */ + * The value of the `ConsistentRead` request parameter. + */ AWS_DYNAMODB_CONSISTENT_READ: 'aws.dynamodb.consistent_read', /** - * The value of the `ProjectionExpression` request parameter. - */ + * The value of the `ProjectionExpression` request parameter. + */ AWS_DYNAMODB_PROJECTION: 'aws.dynamodb.projection', /** - * The value of the `Limit` request parameter. - */ + * The value of the `Limit` request parameter. + */ AWS_DYNAMODB_LIMIT: 'aws.dynamodb.limit', /** - * The value of the `AttributesToGet` request parameter. - */ + * The value of the `AttributesToGet` request parameter. + */ AWS_DYNAMODB_ATTRIBUTES_TO_GET: 'aws.dynamodb.attributes_to_get', /** - * The value of the `IndexName` request parameter. - */ + * The value of the `IndexName` request parameter. + */ AWS_DYNAMODB_INDEX_NAME: 'aws.dynamodb.index_name', /** - * The value of the `Select` request parameter. - */ + * The value of the `Select` request parameter. + */ AWS_DYNAMODB_SELECT: 'aws.dynamodb.select', /** - * The JSON-serialized value of each item of the `GlobalSecondaryIndexes` request field. - */ - AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES: - 'aws.dynamodb.global_secondary_indexes', + * The JSON-serialized value of each item of the `GlobalSecondaryIndexes` request field. + */ + AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES: 'aws.dynamodb.global_secondary_indexes', /** - * The JSON-serialized value of each item of the `LocalSecondaryIndexes` request field. - */ + * The JSON-serialized value of each item of the `LocalSecondaryIndexes` request field. + */ AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES: 'aws.dynamodb.local_secondary_indexes', /** - * The value of the `ExclusiveStartTableName` request parameter. - */ + * The value of the `ExclusiveStartTableName` request parameter. + */ AWS_DYNAMODB_EXCLUSIVE_START_TABLE: 'aws.dynamodb.exclusive_start_table', /** - * The the number of items in the `TableNames` response parameter. - */ + * The the number of items in the `TableNames` response parameter. + */ AWS_DYNAMODB_TABLE_COUNT: 'aws.dynamodb.table_count', /** - * The value of the `ScanIndexForward` request parameter. - */ + * The value of the `ScanIndexForward` request parameter. + */ AWS_DYNAMODB_SCAN_FORWARD: 'aws.dynamodb.scan_forward', /** - * The value of the `Segment` request parameter. - */ + * The value of the `Segment` request parameter. + */ AWS_DYNAMODB_SEGMENT: 'aws.dynamodb.segment', /** - * The value of the `TotalSegments` request parameter. - */ + * The value of the `TotalSegments` request parameter. + */ AWS_DYNAMODB_TOTAL_SEGMENTS: 'aws.dynamodb.total_segments', /** - * The value of the `Count` response parameter. - */ + * The value of the `Count` response parameter. + */ AWS_DYNAMODB_COUNT: 'aws.dynamodb.count', /** - * The value of the `ScannedCount` response parameter. - */ + * The value of the `ScannedCount` response parameter. + */ AWS_DYNAMODB_SCANNED_COUNT: 'aws.dynamodb.scanned_count', /** - * The JSON-serialized value of each item in the `AttributeDefinitions` request field. - */ + * The JSON-serialized value of each item in the `AttributeDefinitions` request field. + */ AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS: 'aws.dynamodb.attribute_definitions', /** - * The JSON-serialized value of each item in the the `GlobalSecondaryIndexUpdates` request field. - */ - AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES: - 'aws.dynamodb.global_secondary_index_updates', + * The JSON-serialized value of each item in the the `GlobalSecondaryIndexUpdates` request field. + */ + AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES: 'aws.dynamodb.global_secondary_index_updates', /** - * A string identifying the messaging system. - */ + * A string identifying the messaging system. + */ MESSAGING_SYSTEM: 'messaging.system', /** - * The message destination name. This might be equal to the span name but is required nevertheless. - */ + * The message destination name. This might be equal to the span name but is required nevertheless. + */ MESSAGING_DESTINATION: 'messaging.destination', /** - * The kind of message destination. - */ + * The kind of message destination. + */ MESSAGING_DESTINATION_KIND: 'messaging.destination_kind', /** - * A boolean that is true if the message destination is temporary. - */ + * A boolean that is true if the message destination is temporary. + */ MESSAGING_TEMP_DESTINATION: 'messaging.temp_destination', /** - * The name of the transport protocol. - */ + * The name of the transport protocol. + */ MESSAGING_PROTOCOL: 'messaging.protocol', /** - * The version of the transport protocol. - */ + * The version of the transport protocol. + */ MESSAGING_PROTOCOL_VERSION: 'messaging.protocol_version', /** - * Connection string. - */ + * Connection string. + */ MESSAGING_URL: 'messaging.url', /** - * A value used by the messaging system as an identifier for the message, represented as a string. - */ + * A value used by the messaging system as an identifier for the message, represented as a string. + */ MESSAGING_MESSAGE_ID: 'messaging.message_id', /** - * The [conversation ID](#conversations) identifying the conversation to which the message belongs, represented as a string. Sometimes called "Correlation ID". - */ + * The [conversation ID](#conversations) identifying the conversation to which the message belongs, represented as a string. Sometimes called "Correlation ID". + */ MESSAGING_CONVERSATION_ID: 'messaging.conversation_id', /** - * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is unknown whether the compressed or uncompressed payload size is reported. - */ + * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is unknown whether the compressed or uncompressed payload size is reported. + */ MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES: 'messaging.message_payload_size_bytes', /** - * The compressed size of the message payload in bytes. - */ - MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES: - 'messaging.message_payload_compressed_size_bytes', + * The compressed size of the message payload in bytes. + */ + MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES: 'messaging.message_payload_compressed_size_bytes', /** - * A string identifying the kind of message consumption as defined in the [Operation names](#operation-names) section above. If the operation is "send", this attribute MUST NOT be set, since the operation can be inferred from the span kind in that case. - */ + * A string identifying the kind of message consumption as defined in the [Operation names](#operation-names) section above. If the operation is "send", this attribute MUST NOT be set, since the operation can be inferred from the span kind in that case. + */ MESSAGING_OPERATION: 'messaging.operation', /** - * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same partition. They differ from `messaging.message_id` in that they're not unique. If the key is `null`, the attribute MUST NOT be set. - * - * Note: If the key type is not string, it's string representation has to be supplied for the attribute. If the key has no unambiguous, canonical string form, don't include its value. - */ + * RabbitMQ message routing key. + */ + MESSAGING_RABBITMQ_ROUTING_KEY: 'messaging.rabbitmq.routing_key', + + /** + * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same partition. They differ from `messaging.message_id` in that they're not unique. If the key is `null`, the attribute MUST NOT be set. + * + * Note: If the key type is not string, it's string representation has to be supplied for the attribute. If the key has no unambiguous, canonical string form, don't include its value. + */ MESSAGING_KAFKA_MESSAGE_KEY: 'messaging.kafka.message_key', /** - * Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not producers. - */ + * Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not producers. + */ MESSAGING_KAFKA_CONSUMER_GROUP: 'messaging.kafka.consumer_group', /** - * Client Id for the Consumer or Producer that is handling the message. - */ + * Client Id for the Consumer or Producer that is handling the message. + */ MESSAGING_KAFKA_CLIENT_ID: 'messaging.kafka.client_id', /** - * Partition the message is sent to. - */ + * Partition the message is sent to. + */ MESSAGING_KAFKA_PARTITION: 'messaging.kafka.partition', /** - * A boolean that is true if the message is a tombstone. - */ + * A boolean that is true if the message is a tombstone. + */ MESSAGING_KAFKA_TOMBSTONE: 'messaging.kafka.tombstone', /** - * A string identifying the remoting system. - */ + * A string identifying the remoting system. + */ RPC_SYSTEM: 'rpc.system', /** - * The full name of the service being called, including its package name, if applicable. - */ + * The full name of the service being called, including its package name, if applicable. + */ RPC_SERVICE: 'rpc.service', /** - * The name of the method being called, must be equal to the $method part in the span name. - */ + * The name of the method being called, must be equal to the $method part in the span name. + */ RPC_METHOD: 'rpc.method', /** - * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. - */ + * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. + */ RPC_GRPC_STATUS_CODE: 'rpc.grpc.status_code', -}; + + /** + * Protocol version as in `jsonrpc` property of request/response. Since JSON-RPC 1.0 does not specify this, the value can be omitted. + */ + RPC_JSONRPC_VERSION: 'rpc.jsonrpc.version', + + /** + * `method` property from request. Unlike `rpc.method`, this may not relate to the actual method being called. Useful for client-side traces since client does not know what will be called on the server. + */ + RPC_JSONRPC_METHOD: 'rpc.jsonrpc.method', + + /** + * `id` property of request or response. Since protocol allows id to be int, string, `null` or missing (for notifications), value is expected to be cast to string for simplicity. Use empty string in case of `null` value. Omit entirely if this is a notification. + */ + RPC_JSONRPC_REQUEST_ID: 'rpc.jsonrpc.request_id', + + /** + * `error.code` property of response if it is an error response. + */ + RPC_JSONRPC_ERROR_CODE: 'rpc.jsonrpc.error_code', + + /** + * `error.message` property of response if it is an error response. + */ + RPC_JSONRPC_ERROR_MESSAGE: 'rpc.jsonrpc.error_message', +} // Enum definitions + export enum DbSystemValues { /** Some other SQL database. Fallback only. See notes. */ OTHER_SQL = 'other_sql', @@ -718,33 +742,43 @@ export enum DbSystemValues { GEODE = 'geode', /** Elasticsearch. */ ELASTICSEARCH = 'elasticsearch', + /** Memcached. */ + MEMCACHED = 'memcached', + /** CockroachDB. */ + COCKROACHDB = 'cockroachdb', } + + + export enum DbCassandraConsistencyLevelValues { - /** ALL. */ - ALL = 'ALL', - /** EACH_QUORUM. */ - EACH_QUORUM = 'EACH_QUORUM', - /** QUORUM. */ - QUORUM = 'QUORUM', - /** LOCAL_QUORUM. */ - LOCAL_QUORUM = 'LOCAL_QUORUM', - /** ONE. */ - ONE = 'ONE', - /** TWO. */ - TWO = 'TWO', - /** THREE. */ - THREE = 'THREE', - /** LOCAL_ONE. */ - LOCAL_ONE = 'LOCAL_ONE', - /** ANY. */ - ANY = 'ANY', - /** SERIAL. */ - SERIAL = 'SERIAL', - /** LOCAL_SERIAL. */ - LOCAL_SERIAL = 'LOCAL_SERIAL', + /** all. */ + ALL = 'all', + /** each_quorum. */ + EACH_QUORUM = 'each_quorum', + /** quorum. */ + QUORUM = 'quorum', + /** local_quorum. */ + LOCAL_QUORUM = 'local_quorum', + /** one. */ + ONE = 'one', + /** two. */ + TWO = 'two', + /** three. */ + THREE = 'three', + /** local_one. */ + LOCAL_ONE = 'local_one', + /** any. */ + ANY = 'any', + /** serial. */ + SERIAL = 'serial', + /** local_serial. */ + LOCAL_SERIAL = 'local_serial', } + + + export enum FaasTriggerValues { /** A response to some data source operation such as a database or filesystem read/write. */ DATASOURCE = 'datasource', @@ -758,6 +792,9 @@ export enum FaasTriggerValues { OTHER = 'other', } + + + export enum FaasDocumentOperationValues { /** When a new object is created. */ INSERT = 'insert', @@ -767,6 +804,9 @@ export enum FaasDocumentOperationValues { DELETE = 'delete', } + + + export enum FaasInvokedProviderValues { /** Amazon Web Services. */ AWS = 'aws', @@ -776,15 +816,18 @@ export enum FaasInvokedProviderValues { GCP = 'gcp', } + + + export enum NetTransportValues { - /** IP.TCP. */ - IP_TCP = 'IP.TCP', - /** IP.UDP. */ - IP_UDP = 'IP.UDP', + /** ip_tcp. */ + IP_TCP = 'ip_tcp', + /** ip_udp. */ + IP_UDP = 'ip_udp', /** Another IP-based protocol. */ - IP = 'IP', + IP = 'ip', /** Unix Domain socket. See below. */ - UNIX = 'Unix', + UNIX = 'unix', /** Named or anonymous pipe. See note below. */ PIPE = 'pipe', /** In-process communication. */ @@ -793,6 +836,9 @@ export enum NetTransportValues { OTHER = 'other', } + + + export enum HttpFlavorValues { /** HTTP 1.0. */ HTTP_1_0 = '1.0', @@ -806,6 +852,9 @@ export enum HttpFlavorValues { QUIC = 'QUIC', } + + + export enum MessagingDestinationKindValues { /** A message sent to a queue. */ QUEUE = 'queue', @@ -813,6 +862,9 @@ export enum MessagingDestinationKindValues { TOPIC = 'topic', } + + + export enum MessagingOperationValues { /** receive. */ RECEIVE = 'receive', @@ -820,6 +872,9 @@ export enum MessagingOperationValues { PROCESS = 'process', } + + + export enum RpcGrpcStatusCodeValues { /** OK. */ OK = 0, @@ -856,3 +911,4 @@ export enum RpcGrpcStatusCodeValues { /** UNAUTHENTICATED. */ UNAUTHENTICATED = 16, } + diff --git a/packages/opentelemetry-semantic-conventions/src/version.ts b/packages/opentelemetry-semantic-conventions/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-semantic-conventions/src/version.ts +++ b/packages/opentelemetry-semantic-conventions/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 7680158995b..dc115655231 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -38,27 +38,25 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/tracing": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/propagator-jaeger": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/tracing": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/propagator-jaeger": "0.22.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", - "codecov": "3.8.1", + "codecov": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "tslint-consistent-codestyle": "1.16.0", - "tslint-microsoft-contrib": "6.2.0", "typescript": "4.3.2" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", + "@opentelemetry/core": "0.22.0", "opentracing": "^0.14.4" } } diff --git a/packages/opentelemetry-shim-opentracing/src/version.ts b/packages/opentelemetry-shim-opentracing/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-shim-opentracing/src/version.ts +++ b/packages/opentelemetry-shim-opentracing/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-tracing/karma.conf.js b/packages/opentelemetry-tracing/karma.conf.js index 3019564a15b..455b1437c87 100644 --- a/packages/opentelemetry-tracing/karma.conf.js +++ b/packages/opentelemetry-tracing/karma.conf.js @@ -19,6 +19,8 @@ const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig + webpack: karmaWebpackConfig, + files: ['test/browser/index-webpack.ts'], + preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } })) }; diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json index f0ee2493526..4327e37a322 100644 --- a/packages/opentelemetry-tracing/package.json +++ b/packages/opentelemetry-tracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/tracing", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -14,7 +14,7 @@ "scripts": { "compile": "tsc --build tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'", + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", @@ -53,13 +53,13 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "@types/lodash.merge": "4.6.6", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -78,12 +78,12 @@ "webpack": "4.46.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/resources": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "lodash.merge": "^4.6.2" } } diff --git a/packages/opentelemetry-tracing/src/BasicTracerProvider.ts b/packages/opentelemetry-tracing/src/BasicTracerProvider.ts index d8ca406c1c5..d02d92bccb7 100644 --- a/packages/opentelemetry-tracing/src/BasicTracerProvider.ts +++ b/packages/opentelemetry-tracing/src/BasicTracerProvider.ts @@ -37,7 +37,7 @@ import { SDKRegistrationConfig, TracerConfig } from './types'; // eslint-disable-next-line @typescript-eslint/no-var-requires const merge = require('lodash.merge'); import { SpanExporter } from './export/SpanExporter'; -import { BatchSpanProcessor } from './export/BatchSpanProcessor'; +import { BatchSpanProcessor } from './platform'; export type PROPAGATOR_FACTORY = () => TextMapPropagator; export type EXPORTER_FACTORY = () => SpanExporter; diff --git a/packages/opentelemetry-tracing/src/export/BatchSpanProcessor.ts b/packages/opentelemetry-tracing/src/export/BatchSpanProcessorBase.ts similarity index 94% rename from packages/opentelemetry-tracing/src/export/BatchSpanProcessor.ts rename to packages/opentelemetry-tracing/src/export/BatchSpanProcessorBase.ts index 92b596440f8..03efc430bd2 100644 --- a/packages/opentelemetry-tracing/src/export/BatchSpanProcessor.ts +++ b/packages/opentelemetry-tracing/src/export/BatchSpanProcessorBase.ts @@ -32,7 +32,7 @@ import { SpanExporter } from './SpanExporter'; * Implementation of the {@link SpanProcessor} that batches spans exported by * the SDK then pushes them to the exporter pipeline. */ -export class BatchSpanProcessor implements SpanProcessor { +export abstract class BatchSpanProcessorBase implements SpanProcessor { private readonly _maxExportBatchSize: number; private readonly _maxQueueSize: number; private readonly _scheduledDelayMillis: number; @@ -43,7 +43,7 @@ export class BatchSpanProcessor implements SpanProcessor { private _isShutdown = false; private _shuttingDownPromise: Promise = Promise.resolve(); - constructor(private readonly _exporter: SpanExporter, config?: BufferConfig) { + constructor(private readonly _exporter: SpanExporter, config?: T) { const env = getEnv(); this._maxExportBatchSize = typeof config?.maxExportBatchSize === 'number' @@ -51,15 +51,15 @@ export class BatchSpanProcessor implements SpanProcessor { : env.OTEL_BSP_MAX_EXPORT_BATCH_SIZE; this._maxQueueSize = typeof config?.maxQueueSize === 'number' - ? config?.maxQueueSize + ? config.maxQueueSize : env.OTEL_BSP_MAX_QUEUE_SIZE; this._scheduledDelayMillis = typeof config?.scheduledDelayMillis === 'number' - ? config?.scheduledDelayMillis + ? config.scheduledDelayMillis : env.OTEL_BSP_SCHEDULE_DELAY; this._exportTimeoutMillis = typeof config?.exportTimeoutMillis === 'number' - ? config?.exportTimeoutMillis + ? config.exportTimeoutMillis : env.OTEL_BSP_EXPORT_TIMEOUT; } @@ -87,6 +87,9 @@ export class BatchSpanProcessor implements SpanProcessor { this._isShutdown = true; this._shuttingDownPromise = new Promise((resolve, reject) => { Promise.resolve() + .then(() => { + return this.onShutdown(); + }) .then(() => { return this._flushAll(); }) @@ -190,4 +193,6 @@ export class BatchSpanProcessor implements SpanProcessor { this._timer = undefined; } } + + protected abstract onShutdown(): void; } diff --git a/packages/opentelemetry-tracing/src/index.ts b/packages/opentelemetry-tracing/src/index.ts index 298657290f7..3fb4bc2248a 100644 --- a/packages/opentelemetry-tracing/src/index.ts +++ b/packages/opentelemetry-tracing/src/index.ts @@ -16,8 +16,8 @@ export * from './Tracer'; export * from './BasicTracerProvider'; +export * from './platform'; export * from './export/ConsoleSpanExporter'; -export * from './export/BatchSpanProcessor'; export * from './export/InMemorySpanExporter'; export * from './export/ReadableSpan'; export * from './export/SimpleSpanProcessor'; diff --git a/packages/opentelemetry-tracing/src/platform/browser/export/BatchSpanProcessor.ts b/packages/opentelemetry-tracing/src/platform/browser/export/BatchSpanProcessor.ts new file mode 100644 index 00000000000..07156e7b90d --- /dev/null +++ b/packages/opentelemetry-tracing/src/platform/browser/export/BatchSpanProcessor.ts @@ -0,0 +1,55 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BatchSpanProcessorBase } from '../../../export/BatchSpanProcessorBase'; +import { SpanExporter } from '../../../export/SpanExporter'; +import { BatchSpanProcessorBrowserConfig } from '../../../types'; + +export class BatchSpanProcessor extends BatchSpanProcessorBase { + private _visibilityChangeListener?: () => void + private _pageHideListener?: () => void + + constructor(_exporter: SpanExporter, config?: BatchSpanProcessorBrowserConfig) { + super(_exporter, config) + this.onInit(config) + } + + private onInit(config?: BatchSpanProcessorBrowserConfig): void { + if (config?.disableAutoFlushOnDocumentHide !== true && document != null) { + this._visibilityChangeListener = () => { + if (document.visibilityState === 'hidden') { + void this.forceFlush(); + } + } + this._pageHideListener = () => { + void this.forceFlush() + } + document.addEventListener('visibilitychange', this._visibilityChangeListener); + + // use 'pagehide' event as a fallback for Safari; see https://bugs.webkit.org/show_bug.cgi?id=116769 + document.addEventListener('pagehide', this._pageHideListener); + } + } + + protected onShutdown(): void { + if (this._visibilityChangeListener) { + document.removeEventListener('visibilitychange', this._visibilityChangeListener); + } + if (this._pageHideListener) { + document.removeEventListener('pagehide', this._pageHideListener); + } + } +} diff --git a/packages/opentelemetry-tracing/src/platform/browser/index.ts b/packages/opentelemetry-tracing/src/platform/browser/index.ts new file mode 100644 index 00000000000..7992546b9d7 --- /dev/null +++ b/packages/opentelemetry-tracing/src/platform/browser/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './export/BatchSpanProcessor'; diff --git a/packages/opentelemetry-tracing/src/platform/index.ts b/packages/opentelemetry-tracing/src/platform/index.ts new file mode 100644 index 00000000000..cdaf8858ce5 --- /dev/null +++ b/packages/opentelemetry-tracing/src/platform/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './node'; diff --git a/packages/opentelemetry-tracing/src/platform/node/export/BatchSpanProcessor.ts b/packages/opentelemetry-tracing/src/platform/node/export/BatchSpanProcessor.ts new file mode 100644 index 00000000000..8c860cfdde9 --- /dev/null +++ b/packages/opentelemetry-tracing/src/platform/node/export/BatchSpanProcessor.ts @@ -0,0 +1,22 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BatchSpanProcessorBase } from '../../../export/BatchSpanProcessorBase'; +import { BufferConfig } from '../../../types'; + +export class BatchSpanProcessor extends BatchSpanProcessorBase { + protected onShutdown(): void {} +} diff --git a/packages/opentelemetry-tracing/src/platform/node/index.ts b/packages/opentelemetry-tracing/src/platform/node/index.ts new file mode 100644 index 00000000000..7992546b9d7 --- /dev/null +++ b/packages/opentelemetry-tracing/src/platform/node/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './export/BatchSpanProcessor'; diff --git a/packages/opentelemetry-tracing/src/types.ts b/packages/opentelemetry-tracing/src/types.ts index be3a5954904..d8329aa567a 100644 --- a/packages/opentelemetry-tracing/src/types.ts +++ b/packages/opentelemetry-tracing/src/types.ts @@ -89,3 +89,10 @@ export interface BufferConfig { * The default value is 2048. */ maxQueueSize?: number; } + +/** Interface configuration for BatchSpanProcessor on browser */ +export interface BatchSpanProcessorBrowserConfig extends BufferConfig { + /** Disable flush when a user navigates to a new page, closes the tab or the browser, or, + * on mobile, switches to a different app. Auto flush is enabled by default. */ + disableAutoFlushOnDocumentHide?: boolean; +} diff --git a/packages/opentelemetry-tracing/src/version.ts b/packages/opentelemetry-tracing/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-tracing/src/version.ts +++ b/packages/opentelemetry-tracing/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/opentelemetry-tracing/test/browser/export/BatchSpanProcessor.test.ts b/packages/opentelemetry-tracing/test/browser/export/BatchSpanProcessor.test.ts new file mode 100644 index 00000000000..9c422f2245a --- /dev/null +++ b/packages/opentelemetry-tracing/test/browser/export/BatchSpanProcessor.test.ts @@ -0,0 +1,102 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import { SpanExporter } from '../../../src'; +import { BatchSpanProcessor } from '../../../src/platform/browser/export/BatchSpanProcessor'; +import { TestTracingSpanExporter } from '../../common/export/TestTracingSpanExporter'; + +describe('BatchSpanProcessor - web', () => { + let visibilityState: VisibilityState = 'visible'; + let exporter: SpanExporter + let processor: BatchSpanProcessor; + let forceFlushSpy: sinon.SinonStub; + let visibilityChangeEvent: Event; + let pageHideEvent: Event + + beforeEach(() => { + sinon.replaceGetter(document, 'visibilityState', () => visibilityState); + visibilityState = 'visible'; + exporter = new TestTracingSpanExporter(); + processor = new BatchSpanProcessor(exporter, {}); + forceFlushSpy = sinon.stub(processor, 'forceFlush'); + visibilityChangeEvent = new Event('visibilitychange'); + pageHideEvent = new Event('pagehide'); + }); + + afterEach(async () => { + sinon.restore(); + }); + + describe('when document becomes hidden', () => { + const testDocumentHide = (hideDocument: () => void) => { + it('should force flush spans', () => { + assert.strictEqual(forceFlushSpy.callCount, 0); + hideDocument() + assert.strictEqual(forceFlushSpy.callCount, 1); + }); + + describe('AND shutdown has been called', () => { + it('should NOT force flush spans', async () => { + assert.strictEqual(forceFlushSpy.callCount, 0); + await processor.shutdown(); + hideDocument() + assert.strictEqual(forceFlushSpy.callCount, 0); + }); + }) + + describe('AND disableAutoFlushOnDocumentHide configuration option', () => { + it('set to false should force flush spans', () => { + processor = new BatchSpanProcessor(exporter, { disableAutoFlushOnDocumentHide: false }); + forceFlushSpy = sinon.stub(processor, 'forceFlush'); + assert.strictEqual(forceFlushSpy.callCount, 0); + hideDocument() + assert.strictEqual(forceFlushSpy.callCount, 1); + }) + + it('set to true should NOT force flush spans', () => { + processor = new BatchSpanProcessor(exporter, { disableAutoFlushOnDocumentHide: true }); + forceFlushSpy = sinon.stub(processor, 'forceFlush'); + assert.strictEqual(forceFlushSpy.callCount, 0); + hideDocument() + assert.strictEqual(forceFlushSpy.callCount, 0); + }) + }) + } + + describe('by the visibilitychange event', () => { + testDocumentHide(() => { + visibilityState = 'hidden'; + document.dispatchEvent(visibilityChangeEvent); + }) + }) + + describe('by the pagehide event', () => { + testDocumentHide(() => { + document.dispatchEvent(pageHideEvent); + }) + }) + }) + + describe('when document becomes visible', () => { + it('should NOT force flush spans', () => { + assert.strictEqual(forceFlushSpy.callCount, 0); + document.dispatchEvent(visibilityChangeEvent); + assert.strictEqual(forceFlushSpy.callCount, 0); + }); + }) +}); diff --git a/packages/opentelemetry-tracing/test/index-webpack.ts b/packages/opentelemetry-tracing/test/browser/index-webpack.ts similarity index 79% rename from packages/opentelemetry-tracing/test/index-webpack.ts rename to packages/opentelemetry-tracing/test/browser/index-webpack.ts index 061a48ccfa7..99100a0f6ee 100644 --- a/packages/opentelemetry-tracing/test/index-webpack.ts +++ b/packages/opentelemetry-tracing/test/browser/index-webpack.ts @@ -13,8 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const testsContext = require.context('.', true, /test$/); +const testsContext = require.context('../browser', true, /test$/); testsContext.keys().forEach(testsContext); +const testsContextCommon = require.context('../common', true, /test$/); +testsContextCommon.keys().forEach(testsContextCommon); + const srcContext = require.context('.', true, /src$/); srcContext.keys().forEach(srcContext); diff --git a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts b/packages/opentelemetry-tracing/test/common/BasicTracerProvider.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts rename to packages/opentelemetry-tracing/test/common/BasicTracerProvider.test.ts index 261d81b6e94..f824049a840 100644 --- a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-tracing/test/common/BasicTracerProvider.test.ts @@ -43,7 +43,7 @@ import { InMemorySpanExporter, SpanExporter, BatchSpanProcessor, -} from '../src'; +} from '../../src'; describe('BasicTracerProvider', () => { let removeEvent: Function | undefined; diff --git a/packages/opentelemetry-tracing/test/MultiSpanProcessor.test.ts b/packages/opentelemetry-tracing/test/common/MultiSpanProcessor.test.ts similarity index 98% rename from packages/opentelemetry-tracing/test/MultiSpanProcessor.test.ts rename to packages/opentelemetry-tracing/test/common/MultiSpanProcessor.test.ts index 68723d21149..5c263caa4fc 100644 --- a/packages/opentelemetry-tracing/test/MultiSpanProcessor.test.ts +++ b/packages/opentelemetry-tracing/test/common/MultiSpanProcessor.test.ts @@ -22,12 +22,12 @@ import { SimpleSpanProcessor, Span, SpanProcessor, -} from '../src'; +} from '../../src'; import { setGlobalErrorHandler, loggingErrorHandler, } from '@opentelemetry/core'; -import { MultiSpanProcessor } from '../src/MultiSpanProcessor'; +import { MultiSpanProcessor } from '../../src/MultiSpanProcessor'; class TestProcessor implements SpanProcessor { spans: Span[] = []; diff --git a/packages/opentelemetry-tracing/test/Span.test.ts b/packages/opentelemetry-tracing/test/common/Span.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/Span.test.ts rename to packages/opentelemetry-tracing/test/common/Span.test.ts index ce65b6c8d0f..bd2072bf006 100644 --- a/packages/opentelemetry-tracing/test/Span.test.ts +++ b/packages/opentelemetry-tracing/test/common/Span.test.ts @@ -30,7 +30,7 @@ import { } from '@opentelemetry/core'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; -import { BasicTracerProvider, Span, SpanProcessor } from '../src'; +import { BasicTracerProvider, Span, SpanProcessor } from '../../src'; const performanceTimeOrigin = hrTime(); diff --git a/packages/opentelemetry-tracing/test/Tracer.test.ts b/packages/opentelemetry-tracing/test/common/Tracer.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/Tracer.test.ts rename to packages/opentelemetry-tracing/test/common/Tracer.test.ts index aa42daf0e8c..30180ef4688 100644 --- a/packages/opentelemetry-tracing/test/Tracer.test.ts +++ b/packages/opentelemetry-tracing/test/common/Tracer.test.ts @@ -32,7 +32,7 @@ import { suppressTracing } from '@opentelemetry/core'; import * as assert from 'assert'; -import { BasicTracerProvider, Span, Tracer } from '../src'; +import { BasicTracerProvider, Span, Tracer } from '../../src'; import { TestStackContextManager } from './export/TestStackContextManager'; import * as sinon from 'sinon'; diff --git a/packages/opentelemetry-tracing/test/config.test.ts b/packages/opentelemetry-tracing/test/common/config.test.ts similarity index 98% rename from packages/opentelemetry-tracing/test/config.test.ts rename to packages/opentelemetry-tracing/test/common/config.test.ts index 7f81183c138..ea27f21e9d9 100644 --- a/packages/opentelemetry-tracing/test/config.test.ts +++ b/packages/opentelemetry-tracing/test/common/config.test.ts @@ -20,7 +20,7 @@ import { TraceIdRatioBasedSampler, } from '@opentelemetry/core'; import * as assert from 'assert'; -import { buildSamplerFromEnv } from '../src/config'; +import { buildSamplerFromEnv } from '../../src/config'; describe('config', () => { const envSource = (typeof window !== 'undefined' diff --git a/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts b/packages/opentelemetry-tracing/test/common/export/BatchSpanProcessorBase.test.ts similarity index 95% rename from packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts rename to packages/opentelemetry-tracing/test/common/export/BatchSpanProcessorBase.test.ts index 4f5d734713c..7015d035951 100644 --- a/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts +++ b/packages/opentelemetry-tracing/test/common/export/BatchSpanProcessorBase.test.ts @@ -23,15 +23,11 @@ import { } from '@opentelemetry/core'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { - BasicTracerProvider, - BatchSpanProcessor, - InMemorySpanExporter, - Span, -} from '../../src'; +import { BasicTracerProvider, BufferConfig, InMemorySpanExporter, Span } from '../../../src'; import { context } from '@opentelemetry/api'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; import { TestStackContextManager } from './TestStackContextManager'; +import { BatchSpanProcessorBase } from '../../../src/export/BatchSpanProcessorBase'; function createSampledSpan(spanName: string): Span { const tracer = new BasicTracerProvider({ @@ -42,16 +38,23 @@ function createSampledSpan(spanName: string): Span { return span as Span; } -describe('BatchSpanProcessor', () => { +class BatchSpanProcessor extends BatchSpanProcessorBase { + onInit() {} + onShutdown() {} +} + +describe('BatchSpanProcessorBase', () => { const name = 'span-name'; const defaultBufferConfig = { maxExportBatchSize: 5, scheduledDelayMillis: 2500, }; let exporter: InMemorySpanExporter; + beforeEach(() => { exporter = new InMemorySpanExporter(); }); + afterEach(() => { exporter.reset(); sinon.restore(); @@ -104,6 +107,14 @@ describe('BatchSpanProcessor', () => { }); describe('.onStart/.onEnd/.shutdown', () => { + it('should call onShutdown', async () => { + const processor = new BatchSpanProcessor(exporter, defaultBufferConfig); + const onShutdownSpy = sinon.stub(processor, 'onShutdown'); + assert.strictEqual(onShutdownSpy.callCount, 0); + await processor.shutdown(); + assert.strictEqual(onShutdownSpy.callCount, 1); + }); + it('should do nothing after processor is shutdown', async () => { const processor = new BatchSpanProcessor(exporter, defaultBufferConfig); const spy: sinon.SinonSpy = sinon.spy(exporter, 'export') as any; diff --git a/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts b/packages/opentelemetry-tracing/test/common/export/ConsoleSpanExporter.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts rename to packages/opentelemetry-tracing/test/common/export/ConsoleSpanExporter.test.ts index 674efb53d66..8e5e40adfb9 100644 --- a/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts +++ b/packages/opentelemetry-tracing/test/common/export/ConsoleSpanExporter.test.ts @@ -21,7 +21,7 @@ import { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor, -} from '../../src'; +} from '../../../src'; /* eslint-disable no-console */ describe('ConsoleSpanExporter', () => { diff --git a/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts b/packages/opentelemetry-tracing/test/common/export/InMemorySpanExporter.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts rename to packages/opentelemetry-tracing/test/common/export/InMemorySpanExporter.test.ts index 88be64a67dc..66514155f0c 100644 --- a/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts +++ b/packages/opentelemetry-tracing/test/common/export/InMemorySpanExporter.test.ts @@ -19,7 +19,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, BasicTracerProvider, -} from '../../src'; +} from '../../../src'; import { context, trace } from '@opentelemetry/api'; import { ExportResult, ExportResultCode } from '@opentelemetry/core'; diff --git a/packages/opentelemetry-tracing/test/export/SimpleSpanProcessor.test.ts b/packages/opentelemetry-tracing/test/common/export/SimpleSpanProcessor.test.ts similarity index 99% rename from packages/opentelemetry-tracing/test/export/SimpleSpanProcessor.test.ts rename to packages/opentelemetry-tracing/test/common/export/SimpleSpanProcessor.test.ts index b3a5f1ecd52..df5fa66f817 100644 --- a/packages/opentelemetry-tracing/test/export/SimpleSpanProcessor.test.ts +++ b/packages/opentelemetry-tracing/test/common/export/SimpleSpanProcessor.test.ts @@ -33,7 +33,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, Span, -} from '../../src'; +} from '../../../src'; import { TestStackContextManager } from './TestStackContextManager'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; diff --git a/packages/opentelemetry-tracing/test/export/TestStackContextManager.ts b/packages/opentelemetry-tracing/test/common/export/TestStackContextManager.ts similarity index 100% rename from packages/opentelemetry-tracing/test/export/TestStackContextManager.ts rename to packages/opentelemetry-tracing/test/common/export/TestStackContextManager.ts diff --git a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts b/packages/opentelemetry-tracing/test/common/export/TestTracingSpanExporter.ts similarity index 99% rename from packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts rename to packages/opentelemetry-tracing/test/common/export/TestTracingSpanExporter.ts index 758f38a26d8..9415c67fe7c 100644 --- a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts +++ b/packages/opentelemetry-tracing/test/common/export/TestTracingSpanExporter.ts @@ -20,7 +20,7 @@ import { ReadableSpan, Tracer, SpanProcessor, -} from '../../src'; +} from '../../../src'; import { ExportResult, AlwaysOnSampler } from '@opentelemetry/core'; /** diff --git a/packages/opentelemetry-web/package.json b/packages/opentelemetry-web/package.json index b9004380416..69f7596e694 100644 --- a/packages/opentelemetry-web/package.json +++ b/packages/opentelemetry-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/web", - "version": "0.20.0", + "version": "0.22.0", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -46,17 +46,17 @@ }, "devDependencies": { "@babel/core": "7.14.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/context-zone": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", - "@opentelemetry/resources": "0.20.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "0.22.0", + "@opentelemetry/propagator-b3": "0.22.0", + "@opentelemetry/resources": "0.22.0", "@types/jquery": "3.5.5", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "karma": "5.2.3", "karma-chrome-launcher": "3.1.0", @@ -78,11 +78,11 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "0.20.0", - "@opentelemetry/semantic-conventions": "0.20.0", - "@opentelemetry/tracing": "0.20.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } } diff --git a/packages/opentelemetry-web/src/version.ts b/packages/opentelemetry-web/src/version.ts index a14ba6ef881..8b92491b988 100644 --- a/packages/opentelemetry-web/src/version.ts +++ b/packages/opentelemetry-web/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.20.0'; +export const VERSION = '0.22.0'; diff --git a/packages/template/package.json b/packages/template/package.json index e73ab7f646c..a663b7c2686 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "0.20.0", + "version": "0.22.0", "private": true, "publishConfig": { "access": "restricted" @@ -71,7 +71,7 @@ "Add these to devDependencies for testing": { "@types/mocha": "8.2.0", "@types/sinon": "9.0.9", - "codecov": "3.8.1", + "codecov": "3.8.2", "istanbul-instrumenter-loader": "3.0.1", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index 4aa7ac6f18a..96cc1cb90d9 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="${SCRIPT_DIR}/../../" # freeze the spec version to make SpanAttributess generation reproducible -SPEC_VERSION=v1.2.0 +SPEC_VERSION=v1.4.0 GENERATOR_VERSION=0.3.1 cd ${SCRIPT_DIR} diff --git a/scripts/semconv/templates/SemanticAttributes.ts.j2 b/scripts/semconv/templates/SemanticAttributes.ts.j2 index 0342f32aeaa..18004561d98 100644 --- a/scripts/semconv/templates/SemanticAttributes.ts.j2 +++ b/scripts/semconv/templates/SemanticAttributes.ts.j2 @@ -16,7 +16,7 @@ {%- macro print_value(type, value) -%} - {{ "\"" if type == "string"}}{{value}}{{ "\"" if type == "string"}} + {{ "'" if type == "string"}}{{value}}{{ "'" if type == "string"}} {%- endmacro %} {%- macro upFirst(text) -%} {{ text[0]|upper}}{{text[1:] }}