Skip to content

Commit 73efda3

Browse files
andreiborzaandreiborza
committed
Merge default otel resource when creating new provider
1 parent 7939d9f commit 73efda3

File tree

3 files changed

+42
-41
lines changed

3 files changed

+42
-41
lines changed

‎packages/opentelemetry/test/helpers/initOtel.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
22
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
3-
import { resourceFromAttributes } from '@opentelemetry/resources';
3+
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
44
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
55
import {
66
ATTR_SERVICE_NAME,
@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): NodeTracerProvider {
5656
// Create and configure NodeTracerProvider
5757
const provider = new NodeTracerProvider({
5858
sampler: new SentrySampler(client),
59-
resource: resourceFromAttributes({
60-
[ATTR_SERVICE_NAME]: 'opentelemetry-test',
61-
// eslint-disable-next-line deprecation/deprecation
62-
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
63-
[ATTR_SERVICE_VERSION]: SDK_VERSION,
64-
}),
59+
resource: defaultResource().merge(
60+
resourceFromAttributes({
61+
[ATTR_SERVICE_NAME]: 'opentelemetry-test',
62+
// eslint-disable-next-line deprecation/deprecation
63+
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
64+
[ATTR_SERVICE_VERSION]: SDK_VERSION,
65+
}),
66+
),
6567
forceFlushTimeoutMillis: 500,
6668
spanProcessors: [new SentrySpanProcessor()],
6769
});

‎packages/vercel-edge/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@edge-runtime/types": "3.0.1",
4747
"@opentelemetry/core": "^2.0.0-rc.1",
4848
"@opentelemetry/resources": "^2.0.0-rc.1",
49-
"@opentelemetry/sdk-trace-node": "^2.0.0-rc.1",
49+
"@opentelemetry/sdk-trace-base": "^2.0.0-rc.1",
5050
"@opentelemetry/semantic-conventions": "^1.28.0",
5151
"@sentry/opentelemetry": "9.10.1"
5252
},

‎yarn.lock

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5420,13 +5420,6 @@
54205420
dependencies:
54215421
"@octokit/openapi-types" "^18.0.0"
54225422

5423-
"@opentelemetry/[email protected]":
5424-
version "0.200.0"
5425-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0.tgz#f9015fd844920c13968715b3cdccf5a4d4ff907e"
5426-
integrity sha512-IKJBQxh91qJ+3ssRly5hYEJ8NDHu9oY/B1PXVSCWf7zytmYO9RNLB0Ox9XQ/fJ8m6gY6Q6NtBWlmXfaXt5Uc4Q==
5427-
dependencies:
5428-
"@opentelemetry/api" "^1.3.0"
5429-
54305423
"@opentelemetry/[email protected]":
54315424
version "0.200.0-rc.1"
54325425
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0-rc.1.tgz#b5af8f3b2533edf106d16ff919d8cfa4b50b1eca"
@@ -5453,19 +5446,19 @@
54535446
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
54545447
integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
54555448

5456-
"@opentelemetry/[email protected]", "@opentelemetry/context-async-hooks@^2.0.0-rc.1":
5457-
version "2.0.0"
5458-
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0.tgz#c98a727238ca199cda943780acf6124af8d8cd80"
5459-
integrity sha512-IEkJGzK1A9v3/EHjXh3s2IiFc6L4jfK+lNgKVgUjeUJQRRhnVFMIO3TAvKwonm9O1HebCuoOt98v8bZW7oVQHA==
5449+
"@opentelemetry/[email protected]-rc.1", "@opentelemetry/context-async-hooks@^2.0.0-rc.1":
5450+
version "2.0.0-rc.1"
5451+
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0-rc.1.tgz#607fac045f9f01c2b88f14c6c5eb2fddcc9604f3"
5452+
integrity sha512-/qjRw0NqbwoQK8tmxcbtNtAPaMvE+fKG3dQdh7vdRd4D8bxrAfIzBSe6HemuKqwObsB2buCMl/47vPbThrLR+w==
54605453

5461-
"@opentelemetry/[email protected]", "@opentelemetry/core@^2.0.0-rc.1":
5454+
"@opentelemetry/[email protected]":
54625455
version "2.0.0"
54635456
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0.tgz#37e9f0e9ddec4479b267aca6f32d88757c941b3a"
54645457
integrity sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==
54655458
dependencies:
54665459
"@opentelemetry/semantic-conventions" "^1.29.0"
54675460

5468-
"@opentelemetry/[email protected]":
5461+
"@opentelemetry/[email protected]", "@opentelemetry/core@^2.0.0-rc.1":
54695462
version "2.0.0-rc.1"
54705463
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0-rc.1.tgz#3a117d68f7b0cc2402438dd7a79ab684f29e0c0c"
54715464
integrity sha512-JfXBuCKmo2wPAnZM/iadMkjZj6Em7B6CyeonEbwkJ91/RrZgojAtv8T9VaX77DO8zsjfC8+Y1cJWoH15hYy3xA==
@@ -5705,7 +5698,7 @@
57055698
"@opentelemetry/core" "^1.8.0"
57065699
"@opentelemetry/instrumentation" "^0.57.1"
57075700

5708-
"@opentelemetry/[email protected]":
5701+
"@opentelemetry/[email protected]", "@opentelemetry/instrumentation@^0.200.0-rc.1":
57095702
version "0.200.0-rc.1"
57105703
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0-rc.1.tgz#749301d2f65c30680f4521c8f85b797d7b1f5f72"
57115704
integrity sha512-Sq+bD3mEoK60k1n124CDV4OJHaiMpukh2/xnPGj/wxpXo9Q9WcneaOmRRMvlHSkr3L7oBXekZ4JFzwVhFO66EA==
@@ -5716,17 +5709,6 @@
57165709
require-in-the-middle "^7.1.1"
57175710
shimmer "^1.2.1"
57185711

5719-
"@opentelemetry/instrumentation@^0.200.0-rc.1":
5720-
version "0.200.0"
5721-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0.tgz#29d1d4f70cbf0cb1ca9f2f78966379b0be96bddc"
5722-
integrity sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg==
5723-
dependencies:
5724-
"@opentelemetry/api-logs" "0.200.0"
5725-
"@types/shimmer" "^1.2.0"
5726-
import-in-the-middle "^1.8.1"
5727-
require-in-the-middle "^7.1.1"
5728-
shimmer "^1.2.1"
5729-
57305712
"@opentelemetry/instrumentation@^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0", "@opentelemetry/instrumentation@^0.57.1":
57315713
version "0.57.2"
57325714
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.2.tgz#8924549d7941ba1b5c6f04d5529cf48330456d1d"
@@ -5761,15 +5743,32 @@
57615743
resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47"
57625744
integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==
57635745

5764-
"@opentelemetry/[email protected]", "@opentelemetry/resources@^2.0.0-rc.1":
5746+
"@opentelemetry/[email protected]":
57655747
version "2.0.0"
57665748
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0.tgz#15c04794c32b7d0b3c7589225ece6ae9bba25989"
57675749
integrity sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg==
57685750
dependencies:
57695751
"@opentelemetry/core" "2.0.0"
57705752
"@opentelemetry/semantic-conventions" "^1.29.0"
57715753

5772-
"@opentelemetry/[email protected]", "@opentelemetry/sdk-trace-base@^2.0.0-rc.1":
5754+
"@opentelemetry/[email protected]", "@opentelemetry/resources@^2.0.0-rc.1":
5755+
version "2.0.0-rc.1"
5756+
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0-rc.1.tgz#74467a0c4cf0f75d5180faa0d2cab870497684ba"
5757+
integrity sha512-ETqGg9rvdb0zSDmtvgt3R4Q2b1UdWx9M4XWIfoZgzTfV+Bj9LJFtE/YYQxY8Z1ygdI560SmuctgQWrafpLrFFQ==
5758+
dependencies:
5759+
"@opentelemetry/core" "2.0.0-rc.1"
5760+
"@opentelemetry/semantic-conventions" "^1.29.0"
5761+
5762+
"@opentelemetry/[email protected]":
5763+
version "2.0.0-rc.1"
5764+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0-rc.1.tgz#3d28a512027daffc4fc9206ef5bd67a9f8459b98"
5765+
integrity sha512-0sHZrmn5v3bWRRK6hMQeiRcJizMR79rTq+PnpaOOBXKPCPTCJotO4VYfk7Ro19HMRpyrP45Q4e2emlY7pZv+sw==
5766+
dependencies:
5767+
"@opentelemetry/core" "2.0.0-rc.1"
5768+
"@opentelemetry/resources" "2.0.0-rc.1"
5769+
"@opentelemetry/semantic-conventions" "^1.29.0"
5770+
5771+
"@opentelemetry/sdk-trace-base@^2.0.0-rc.1":
57735772
version "2.0.0"
57745773
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0.tgz#ebc06ea7537dea62f3882f8236c1234f4faf6b23"
57755774
integrity sha512-qQnYdX+ZCkonM7tA5iU4fSRsVxbFGml8jbxOgipRGMFHKaXKHQ30js03rTobYjKjIfnOsZSbHKWF0/0v0OQGfw==
@@ -5779,13 +5778,13 @@
57795778
"@opentelemetry/semantic-conventions" "^1.29.0"
57805779

57815780
"@opentelemetry/sdk-trace-node@^2.0.0-rc.1":
5782-
version "2.0.0"
5783-
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0.tgz#ef9f8ab77ccb41a9c9ff272f6bf4bb6999491f5b"
5784-
integrity sha512-omdilCZozUjQwY3uZRBwbaRMJ3p09l4t187Lsdf0dGMye9WKD4NGcpgZRvqhI1dwcH6og+YXQEtoO9Wx3ykilg==
5781+
version "2.0.0-rc.1"
5782+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0-rc.1.tgz#00df5a0e1311f7cab002542abd1c64ee135167cc"
5783+
integrity sha512-yhX8xNCucL3z+FobTEl7sZ3myh+YRJf/vAIS+lyeiV2qT30fVX2sv7AMVH+xjDYlYV/YVLZAqXOImVkJEFcMjA==
57855784
dependencies:
5786-
"@opentelemetry/context-async-hooks" "2.0.0"
5787-
"@opentelemetry/core" "2.0.0"
5788-
"@opentelemetry/sdk-trace-base" "2.0.0"
5785+
"@opentelemetry/context-async-hooks" "2.0.0-rc.1"
5786+
"@opentelemetry/core" "2.0.0-rc.1"
5787+
"@opentelemetry/sdk-trace-base" "2.0.0-rc.1"
57895788

57905789
"@opentelemetry/[email protected]":
57915790
version "1.28.0"

0 commit comments

Comments
 (0)