diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 846da0bcf648..02d684c7051b 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1698,8 +1698,15 @@ packages: engines: {node: '>=6.0'} dev: false - /@opentelemetry/api-metrics/0.32.0: - resolution: {integrity: sha512-g1WLhpG8B6iuDyZJFRGsR+JKyZ94m5LEmY2f+duEJ9Xb4XRlLHrZvh6G34OH6GJ8iDHxfHb/sWjJ1ZpkI9yGMQ==} + /@opentelemetry/api-metrics/0.31.0: + resolution: {integrity: sha512-PcL1x0kZtMie7NsNy67OyMvzLEXqf3xd0TZJKHHPMGTe89oMpNVrD1zJB1kZcwXOxLlHHb6tz21G3vvXPdXyZg==} + engines: {node: '>=14'} + dependencies: + '@opentelemetry/api': 1.1.0 + dev: false + + /@opentelemetry/api-metrics/0.33.0: + resolution: {integrity: sha512-78evfPRRRnJA6uZ3xuBuS3VZlXTO/LRs+Ff1iv3O/7DgibCtq9k27T6Zlj8yRdJDFmcjcbQrvC0/CpDpWHaZYA==} engines: {node: '>=14'} dependencies: '@opentelemetry/api': 1.2.0 @@ -1767,29 +1774,31 @@ packages: '@opentelemetry/semantic-conventions': 1.7.0 dev: false - /@opentelemetry/instrumentation-http/0.32.0_@opentelemetry+api@1.2.0: - resolution: {integrity: sha512-EbNdJl6IjouphbxPVGV8/utiqB2DhveyH5TD6vxjc2OXlQ3A/mKg3fYSSWB+rYQBuuli+jWQfBJe2ntOFZtTMw==} + /@opentelemetry/instrumentation-http/0.33.0_@opentelemetry+api@1.2.0: + resolution: {integrity: sha512-8Ny31T1SEX9OKp89sMfLV7tP8WO5m6iBTZgmTC53Wu4t8kcNH6Y00tooMzypL/PgVtglgPXzv4T5mFLABo59AA==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.2.0 - '@opentelemetry/core': 1.6.0_@opentelemetry+api@1.2.0 - '@opentelemetry/instrumentation': 0.32.0_@opentelemetry+api@1.2.0 - '@opentelemetry/semantic-conventions': 1.6.0 + '@opentelemetry/api-metrics': 0.33.0 + '@opentelemetry/core': 1.7.0_@opentelemetry+api@1.2.0 + '@opentelemetry/instrumentation': 0.33.0_@opentelemetry+api@1.2.0 + '@opentelemetry/sdk-metrics': 0.33.0_@opentelemetry+api@1.2.0 + '@opentelemetry/semantic-conventions': 1.7.0 semver: 7.3.7 transitivePeerDependencies: - supports-color dev: false - /@opentelemetry/instrumentation/0.32.0_@opentelemetry+api@1.2.0: - resolution: {integrity: sha512-y6ADjHpkUz/v1nkyyYjsQa/zorhX+0qVGpFvXMcbjU4sHnBnC02c6wcc93sIgZfiQClIWo45TGku1KQxJ5UUbQ==} + /@opentelemetry/instrumentation/0.33.0_@opentelemetry+api@1.2.0: + resolution: {integrity: sha512-8joPjKJ6TznNt04JbnzZG+m1j/4wm1OIrX7DEw/V5lyZ9/2fahIqG72jeZ26VKOZnLOpVzUUnU/dweURqBzT3Q==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.2.0 - '@opentelemetry/api-metrics': 0.32.0 + '@opentelemetry/api-metrics': 0.33.0 require-in-the-middle: 5.2.0 semver: 7.3.7 shimmer: 1.2.1 @@ -1850,16 +1859,30 @@ packages: '@opentelemetry/semantic-conventions': 1.7.0 dev: false - /@opentelemetry/sdk-metrics/0.32.0_@opentelemetry+api@1.2.0: - resolution: {integrity: sha512-zC9RCOIsXRqOHWmWfcxArtDHbip2/jaIH1yu/OKau/shDZYFluAxY6zAEYIb4YEAzKKEF+fpaoRgpodDWNGVGA==} + /@opentelemetry/sdk-metrics-base/0.31.0_@opentelemetry+api@1.1.0: + resolution: {integrity: sha512-4R2Bjl3wlqIGcq4bCoI9/pD49ld+tEoM9n85UfFzr/aUe+2huY2jTPq/BP9SVB8d2Zfg7mGTIFeapcEvAdKK7g==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.0.0 + dependencies: + '@opentelemetry/api': 1.1.0 + '@opentelemetry/api-metrics': 0.31.0 + '@opentelemetry/core': 1.5.0_@opentelemetry+api@1.1.0 + '@opentelemetry/resources': 1.5.0_@opentelemetry+api@1.1.0 + lodash.merge: 4.6.2 + dev: false + + /@opentelemetry/sdk-metrics/0.33.0_@opentelemetry+api@1.2.0: + resolution: {integrity: sha512-ZXPixOlTd/FHLwpkmm5nTpJE7bZOPfmbSz8hBVFCEHkXE1aKEKaM38UFnZ+2xzOY1tDsDwyxEiiBiDX8y3039A==} + engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.2.0 - '@opentelemetry/api-metrics': 0.32.0 - '@opentelemetry/core': 1.6.0_@opentelemetry+api@1.2.0 - '@opentelemetry/resources': 1.6.0_@opentelemetry+api@1.2.0 + '@opentelemetry/api-metrics': 0.33.0 + '@opentelemetry/core': 1.7.0_@opentelemetry+api@1.2.0 + '@opentelemetry/resources': 1.7.0_@opentelemetry+api@1.2.0 lodash.merge: 4.6.2 dev: false @@ -17441,12 +17464,12 @@ packages: dependencies: '@microsoft/api-extractor': 7.31.2 '@opentelemetry/api': 1.2.0 - '@opentelemetry/api-metrics': 0.32.0 + '@opentelemetry/api-metrics': 0.33.0 '@opentelemetry/core': 1.7.0_@opentelemetry+api@1.2.0 - '@opentelemetry/instrumentation': 0.32.0_@opentelemetry+api@1.2.0 - '@opentelemetry/instrumentation-http': 0.32.0_@opentelemetry+api@1.2.0 + '@opentelemetry/instrumentation': 0.33.0_@opentelemetry+api@1.2.0 + '@opentelemetry/instrumentation-http': 0.33.0_@opentelemetry+api@1.2.0 '@opentelemetry/resources': 1.7.0_@opentelemetry+api@1.2.0 - '@opentelemetry/sdk-metrics': 0.32.0_@opentelemetry+api@1.2.0 + '@opentelemetry/sdk-metrics': 0.33.0_@opentelemetry+api@1.2.0 '@opentelemetry/sdk-trace-base': 1.7.0_@opentelemetry+api@1.2.0 '@opentelemetry/sdk-trace-node': 1.7.0_@opentelemetry+api@1.2.0 '@opentelemetry/semantic-conventions': 1.7.0 @@ -17575,7 +17598,7 @@ packages: '@microsoft/api-extractor': 7.31.2 '@opentelemetry/api': 1.2.0 '@opentelemetry/core': 1.7.0_@opentelemetry+api@1.2.0 - '@opentelemetry/instrumentation': 0.32.0_@opentelemetry+api@1.2.0 + '@opentelemetry/instrumentation': 0.33.0_@opentelemetry+api@1.2.0 '@opentelemetry/sdk-trace-base': 1.7.0_@opentelemetry+api@1.2.0 '@opentelemetry/sdk-trace-node': 1.7.0_@opentelemetry+api@1.2.0 '@types/chai': 4.3.3 diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json index e92b6c4e83e6..1d2f5b6d53f7 100644 --- a/sdk/core/core-http/package.json +++ b/sdk/core/core-http/package.json @@ -138,7 +138,7 @@ "@azure/logger-js": "^1.0.2", "@azure/test-utils": "^1.0.0", "@microsoft/api-extractor": "^7.31.1", - "@opentelemetry/api": "^1.0.1", + "@opentelemetry/api": "^1.2.0", "@types/chai": "^4.1.6", "@types/express": "^4.16.0", "@types/mocha": "^7.0.2", diff --git a/sdk/core/core-rest-pipeline/package.json b/sdk/core/core-rest-pipeline/package.json index a0d5bd133b00..d6aaefca416c 100644 --- a/sdk/core/core-rest-pipeline/package.json +++ b/sdk/core/core-rest-pipeline/package.json @@ -100,7 +100,7 @@ "@azure/dev-tool": "^1.0.0", "@azure/eslint-plugin-azure-sdk": "^3.0.0", "@microsoft/api-extractor": "^7.31.1", - "@opentelemetry/api": "^1.0.1", + "@opentelemetry/api": "^1.2.0", "@types/chai": "^4.1.6", "@types/chai-as-promised": "^7.1.0", "@types/mocha": "^7.0.2", diff --git a/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json b/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json index 28fe59ee28b2..261c815d84f8 100644 --- a/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json +++ b/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json @@ -79,9 +79,9 @@ "dependencies": { "@azure/core-tracing": "^1.0.0", "@azure/logger": "^1.0.0", - "@opentelemetry/api": "^1.1.0", - "@opentelemetry/core": "^1.6.0", - "@opentelemetry/instrumentation": "^0.32.0", + "@opentelemetry/api": "^1.2.0", + "@opentelemetry/core": "^1.7.0", + "@opentelemetry/instrumentation": "^0.33.0", "tslib": "^2.2.0" }, "devDependencies": { @@ -90,8 +90,8 @@ "@azure/dev-tool": "^1.0.0", "@azure/eslint-plugin-azure-sdk": "^3.0.0", "@microsoft/api-extractor": "^7.31.1", - "@opentelemetry/sdk-trace-base": "^1.6.0", - "@opentelemetry/sdk-trace-node": "^1.6.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", "@types/chai": "^4.1.6", "@types/mocha": "^7.0.2", "@types/node": "^12.0.0", diff --git a/sdk/monitor/monitor-opentelemetry-exporter/README.md b/sdk/monitor/monitor-opentelemetry-exporter/README.md index cece82b240c8..add4b330dfac 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/README.md +++ b/sdk/monitor/monitor-opentelemetry-exporter/README.md @@ -62,7 +62,7 @@ provider.addSpanProcessor( Add the exporter to your existing OpenTelemetry tracer provider (`NodeTracerProvider` / `BasicTracerProvider`) ```js -const { MeterProvider, PeriodicExportingMetricReader } = require("@opentelemetry/sdk-metrics-base"); +const { MeterProvider, PeriodicExportingMetricReader } = require("@opentelemetry/sdk-metrics"); const { Resource } = require("@opentelemetry/resources"); const { SemanticResourceAttributes } = require("@opentelemetry/semantic-conventions"); const { AzureMonitorMetricExporter } = require("@azure/monitor-opentelemetry-exporter"); diff --git a/sdk/monitor/monitor-opentelemetry-exporter/package.json b/sdk/monitor/monitor-opentelemetry-exporter/package.json index 300648201cb8..f79e7d1c3f4a 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/package.json +++ b/sdk/monitor/monitor-opentelemetry-exporter/package.json @@ -86,9 +86,9 @@ "@azure/dev-tool": "^1.0.0", "@azure/eslint-plugin-azure-sdk": "^3.0.0", "@microsoft/api-extractor": "^7.31.1", - "@opentelemetry/instrumentation": "^0.32.0", - "@opentelemetry/instrumentation-http": "^0.32.0", - "@opentelemetry/sdk-trace-node": "^1.6.0", + "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/instrumentation-http": "^0.33.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", "@types/mocha": "^7.0.2", "@types/node": "^12.0.0", "dotenv": "^8.2.0", @@ -108,12 +108,12 @@ "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.1.0", "@opentelemetry/api": "^1.2.0", - "@opentelemetry/api-metrics": "^0.32.0", - "@opentelemetry/core": "^1.6.0", - "@opentelemetry/resources": "^1.6.0", - "@opentelemetry/sdk-metrics": "^0.32.0", - "@opentelemetry/sdk-trace-base": "^1.6.0", - "@opentelemetry/semantic-conventions": "^1.6.0", + "@opentelemetry/api-metrics": "^0.33.0", + "@opentelemetry/core": "^1.7.0", + "@opentelemetry/resources": "^1.7.0", + "@opentelemetry/sdk-metrics": "^0.33.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", + "@opentelemetry/semantic-conventions": "^1.7.0", "tslib": "^2.2.0" }, "sideEffects": false, diff --git a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/metricsSample.js b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/metricsSample.js index 826d124b23bc..6377fe8d35fe 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/metricsSample.js +++ b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/metricsSample.js @@ -3,13 +3,13 @@ /** * This example shows how to use - * [@opentelemetry/sdk-metrics-base](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-metrics-base) + * [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-metrics) * to generate Metrics in a simple Node.js application and export them to Azure Monitor. * * @summary Basic use of Metrics in Node.js application. */ -const { MeterProvider, PeriodicExportingMetricReader } = require("@opentelemetry/sdk-metrics-base"); +const { MeterProvider, PeriodicExportingMetricReader } = require("@opentelemetry/sdk-metrics"); const { Resource } = require("@opentelemetry/resources"); const { SemanticResourceAttributes } = require("@opentelemetry/semantic-conventions"); const { AzureMonitorMetricExporter } = require("@azure/monitor-opentelemetry-exporter"); diff --git a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/package.json b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/package.json index dce1765b4cec..fae7aa751067 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/package.json +++ b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/package.json @@ -30,13 +30,13 @@ "dependencies": { "@azure/monitor-opentelemetry-exporter": "next", "dotenv": "latest", - "@opentelemetry/api": "^1.1.0", - "@opentelemetry/resources": "^1.3.1", - "@opentelemetry/semantic-conventions": "^1.3.1", - "@opentelemetry/sdk-trace-base": "^1.3.1", - "@opentelemetry/instrumentation": "^0.30.0", - "@opentelemetry/sdk-trace-node": "^1.3.1", - "@opentelemetry/instrumentation-http": "^0.30.0", - "@opentelemetry/sdk-metrics-base": "0.30.0" + "@opentelemetry/api": "^1.2.0", + "@opentelemetry/resources": "^1.7.0", + "@opentelemetry/semantic-conventions": "^1.7.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", + "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", + "@opentelemetry/instrumentation-http": "^0.33.0", + "@opentelemetry/sdk-metrics": "^0.33.0" } } diff --git a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/package.json b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/package.json index 6ea3a9ee2c2a..51e86c4865d7 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/package.json +++ b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/package.json @@ -34,14 +34,14 @@ "dependencies": { "@azure/monitor-opentelemetry-exporter": "next", "dotenv": "latest", - "@opentelemetry/api": "^1.1.0", - "@opentelemetry/resources": "^1.3.1", - "@opentelemetry/semantic-conventions": "^1.3.1", - "@opentelemetry/sdk-trace-base": "^1.3.1", - "@opentelemetry/instrumentation": "^0.30.0", - "@opentelemetry/sdk-trace-node": "^1.3.1", - "@opentelemetry/instrumentation-http": "^0.30.0", - "@opentelemetry/sdk-metrics-base": "0.30.0" + "@opentelemetry/api": "^1.2.0", + "@opentelemetry/resources": "^1.7.0", + "@opentelemetry/semantic-conventions": "^1.7.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", + "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", + "@opentelemetry/instrumentation-http": "^0.33.0", + "@opentelemetry/sdk-metrics": "^0.33.0" }, "devDependencies": { "@types/node": "^12.0.0", diff --git a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/src/metricsSample.ts b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/src/metricsSample.ts index c204095b6ebc..615ba80e7809 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/src/metricsSample.ts +++ b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/src/metricsSample.ts @@ -3,7 +3,7 @@ /** * This example shows how to use - * [@opentelemetry/sdk-metrics-base](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-metrics-base) + * [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-metrics) * to generate Metrics in a simple Node.js application and export them to Azure Monitor. * * @summary Basic use of Metrics in Node.js application. @@ -13,7 +13,7 @@ import { MeterProvider, PeriodicExportingMetricReader, PeriodicExportingMetricReaderOptions, -} from "@opentelemetry/sdk-metrics-base"; +} from "@opentelemetry/sdk-metrics"; import { Resource } from "@opentelemetry/resources"; import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions"; import { AzureMonitorMetricExporter } from "@azure/monitor-opentelemetry-exporter"; diff --git a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1/javascript/package.json b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1/javascript/package.json index 721e17ae330f..93212a6793bd 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/samples/v1/javascript/package.json +++ b/sdk/monitor/monitor-opentelemetry-exporter/samples/v1/javascript/package.json @@ -30,12 +30,12 @@ "dependencies": { "@azure/monitor-opentelemetry-exporter": "next", "dotenv": "latest", - "@opentelemetry/api": "^1.0.1", - "@opentelemetry/resources": "^0.22.0", - "@opentelemetry/semantic-conventions": "^0.24.0", - "@opentelemetry/instrumentation": "0.29.1", - "@opentelemetry/sdk-trace-base": "^1.0.1", - "@opentelemetry/sdk-trace-node": "^1.0.1", - "@opentelemetry/instrumentation-http": "0.22.0" + "@opentelemetry/api": "^1.2.0", + "@opentelemetry/resources": "^1.7.0", + "@opentelemetry/semantic-conventions": "^1.7.0", + "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", + "@opentelemetry/instrumentation-http": "^0.33.0" } } diff --git a/sdk/monitor/monitor-query/package.json b/sdk/monitor/monitor-query/package.json index aea43cc0a503..cfc852d271d4 100644 --- a/sdk/monitor/monitor-query/package.json +++ b/sdk/monitor/monitor-query/package.json @@ -113,9 +113,9 @@ "@azure/test-utils": "^1.0.0", "@azure-tools/test-recorder": "^2.0.0", "@microsoft/api-extractor": "^7.31.1", - "@opentelemetry/api": "^1.1.0", - "@opentelemetry/sdk-trace-node": "^1.2.0", - "@opentelemetry/sdk-trace-base": "^1.2.0", + "@opentelemetry/api": "^1.2.0", + "@opentelemetry/sdk-trace-node": "^1.7.0", + "@opentelemetry/sdk-trace-base": "^1.7.0", "@types/chai-as-promised": "^7.1.0", "@types/chai": "^4.1.6", "@types/mocha": "^7.0.2", diff --git a/sdk/test-utils/test-utils/package.json b/sdk/test-utils/test-utils/package.json index 8ac42ebf5136..a1339eb953c9 100644 --- a/sdk/test-utils/test-utils/package.json +++ b/sdk/test-utils/test-utils/package.json @@ -60,7 +60,7 @@ "@azure/abort-controller": "^1.0.0", "@azure/core-rest-pipeline": "^1.1.0", "@azure/core-tracing": "^1.0.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.2.0", "@types/chai": "^4.1.6", "@types/chai-as-promised": "^7.1.4", "chai": "^4.2.0",