From c73fd95d634a41105235d9b16c8bc554a892b36f Mon Sep 17 00:00:00 2001 From: Lucas Holmquist Date: Wed, 10 Apr 2024 09:31:06 -0400 Subject: [PATCH] fix: upgrade @opentelemetry/resources from 1.7.0 to 1.10.0 (#420) Snyk has created this PR to upgrade @opentelemetry/resources from 1.7.0 to 1.10.0. See this package in npm: https://www.npmjs.com/package/@opentelemetry/resources See this project in Snyk: https://app.snyk.io/org/nodeshift-starters/project/db6e272c-cc79-4486-b27f-55fb122c44ad?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 135 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 124 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69f0e2d5..e425ae66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@opentelemetry/instrumentation-express": "^0.31.3", "@opentelemetry/instrumentation-http": "^0.33.0", "@opentelemetry/instrumentation-pg": "^0.32.0", - "@opentelemetry/resources": "^1.6.0", + "@opentelemetry/resources": "^1.10.0", "@opentelemetry/sdk-trace-base": "^1.9.1", "@opentelemetry/sdk-trace-node": "^1.6.0", "@opentelemetry/semantic-conventions": "^1.6.0", @@ -931,6 +931,21 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/exporter-jaeger/node_modules/@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "dependencies": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.3.0" + } + }, "node_modules/@opentelemetry/exporter-jaeger/node_modules/@opentelemetry/sdk-trace-base": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.7.0.tgz", @@ -1102,18 +1117,40 @@ } }, "node_modules/@opentelemetry/resources": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", - "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.10.0.tgz", + "integrity": "sha512-bh4auHOdS0/cwSgviCPbkItLwLZRWCZKp/ns2soVwlWQMJH36FIHbcYJf7G9+Rthlc6u163VhUefho+eDrPVeA==", "dependencies": { - "@opentelemetry/core": "1.7.0", - "@opentelemetry/semantic-conventions": "1.7.0" + "@opentelemetry/core": "1.10.0", + "@opentelemetry/semantic-conventions": "1.10.0" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.3.0" + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.10.0.tgz", + "integrity": "sha512-H5/mfU3TsEBe/cnnLu3VCkzjqyRARmhxQGsT64KwafxjzkDh+c2Bk4n140Cg/xhgrjK2sFsxbJj6d0xZlVo/OQ==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.10.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.10.0.tgz", + "integrity": "sha512-Mzo5IyrI59YuYWeNoOZRXfUCc3upjmxCmczSm+pUgWprvSNfdOX70SVde84UxmuzU7MF1MEkPXKXTYG3ymRw2w==", + "engines": { + "node": ">=14" } }, "node_modules/@opentelemetry/sdk-metrics": { @@ -1133,6 +1170,21 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "dependencies": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.3.0" + } + }, "node_modules/@opentelemetry/sdk-trace-base": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.1.tgz", @@ -1205,6 +1257,21 @@ "@opentelemetry/api": ">=1.0.0 <1.3.0" } }, + "node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "dependencies": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.3.0" + } + }, "node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/sdk-trace-base": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.7.0.tgz", @@ -9682,6 +9749,15 @@ "jaeger-client": "^3.15.0" }, "dependencies": { + "@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "requires": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + } + }, "@opentelemetry/sdk-trace-base": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.7.0.tgz", @@ -9799,12 +9875,27 @@ } }, "@opentelemetry/resources": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", - "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.10.0.tgz", + "integrity": "sha512-bh4auHOdS0/cwSgviCPbkItLwLZRWCZKp/ns2soVwlWQMJH36FIHbcYJf7G9+Rthlc6u163VhUefho+eDrPVeA==", "requires": { - "@opentelemetry/core": "1.7.0", - "@opentelemetry/semantic-conventions": "1.7.0" + "@opentelemetry/core": "1.10.0", + "@opentelemetry/semantic-conventions": "1.10.0" + }, + "dependencies": { + "@opentelemetry/core": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.10.0.tgz", + "integrity": "sha512-H5/mfU3TsEBe/cnnLu3VCkzjqyRARmhxQGsT64KwafxjzkDh+c2Bk4n140Cg/xhgrjK2sFsxbJj6d0xZlVo/OQ==", + "requires": { + "@opentelemetry/semantic-conventions": "1.10.0" + } + }, + "@opentelemetry/semantic-conventions": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.10.0.tgz", + "integrity": "sha512-Mzo5IyrI59YuYWeNoOZRXfUCc3upjmxCmczSm+pUgWprvSNfdOX70SVde84UxmuzU7MF1MEkPXKXTYG3ymRw2w==" + } } }, "@opentelemetry/sdk-metrics": { @@ -9816,6 +9907,17 @@ "@opentelemetry/core": "1.7.0", "@opentelemetry/resources": "1.7.0", "lodash.merge": "4.6.2" + }, + "dependencies": { + "@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "requires": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + } + } } }, "@opentelemetry/sdk-trace-base": { @@ -9865,6 +9967,15 @@ "semver": "^7.3.5" }, "dependencies": { + "@opentelemetry/resources": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.7.0.tgz", + "integrity": "sha512-u1M0yZotkjyKx8dj+46Sg5thwtOTBmtRieNXqdCRiWUp6SfFiIP0bI+1XK3LhuXqXkBXA1awJZaTqKduNMStRg==", + "requires": { + "@opentelemetry/core": "1.7.0", + "@opentelemetry/semantic-conventions": "1.7.0" + } + }, "@opentelemetry/sdk-trace-base": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.7.0.tgz", diff --git a/package.json b/package.json index a3fa728b..2afed87e 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@opentelemetry/instrumentation-express": "^0.31.3", "@opentelemetry/instrumentation-http": "^0.33.0", "@opentelemetry/instrumentation-pg": "^0.32.0", - "@opentelemetry/resources": "^1.6.0", + "@opentelemetry/resources": "^1.10.0", "@opentelemetry/sdk-trace-base": "^1.9.1", "@opentelemetry/sdk-trace-node": "^1.6.0", "@opentelemetry/semantic-conventions": "^1.6.0",