Skip to content

Commit 5cb62cf

Browse files
andreiborzaandreiborza
committed
Merge default otel resource when creating new provider
1 parent 9325e88 commit 5cb62cf

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.6.0"
5252
},

‎yarn.lock

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5642,13 +5642,6 @@
56425642
dependencies:
56435643
"@octokit/openapi-types" "^18.0.0"
56445644

5645-
"@opentelemetry/[email protected]":
5646-
version "0.200.0"
5647-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0.tgz#f9015fd844920c13968715b3cdccf5a4d4ff907e"
5648-
integrity sha512-IKJBQxh91qJ+3ssRly5hYEJ8NDHu9oY/B1PXVSCWf7zytmYO9RNLB0Ox9XQ/fJ8m6gY6Q6NtBWlmXfaXt5Uc4Q==
5649-
dependencies:
5650-
"@opentelemetry/api" "^1.3.0"
5651-
56525645
"@opentelemetry/[email protected]":
56535646
version "0.200.0-rc.1"
56545647
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0-rc.1.tgz#b5af8f3b2533edf106d16ff919d8cfa4b50b1eca"
@@ -5682,24 +5675,24 @@
56825675
dependencies:
56835676
"@opentelemetry/context-base" "^0.12.0"
56845677

5685-
"@opentelemetry/[email protected]", "@opentelemetry/context-async-hooks@^2.0.0-rc.1":
5686-
version "2.0.0"
5687-
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0.tgz#c98a727238ca199cda943780acf6124af8d8cd80"
5688-
integrity sha512-IEkJGzK1A9v3/EHjXh3s2IiFc6L4jfK+lNgKVgUjeUJQRRhnVFMIO3TAvKwonm9O1HebCuoOt98v8bZW7oVQHA==
5678+
"@opentelemetry/[email protected]-rc.1", "@opentelemetry/context-async-hooks@^2.0.0-rc.1":
5679+
version "2.0.0-rc.1"
5680+
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0-rc.1.tgz#607fac045f9f01c2b88f14c6c5eb2fddcc9604f3"
5681+
integrity sha512-/qjRw0NqbwoQK8tmxcbtNtAPaMvE+fKG3dQdh7vdRd4D8bxrAfIzBSe6HemuKqwObsB2buCMl/47vPbThrLR+w==
56895682

56905683
"@opentelemetry/context-base@^0.12.0":
56915684
version "0.12.0"
56925685
resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.12.0.tgz#4906ae27359d3311e3dea1b63770a16f60848550"
56935686
integrity sha512-UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA==
56945687

5695-
"@opentelemetry/[email protected]", "@opentelemetry/core@^2.0.0-rc.1":
5688+
"@opentelemetry/[email protected]":
56965689
version "2.0.0"
56975690
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0.tgz#37e9f0e9ddec4479b267aca6f32d88757c941b3a"
56985691
integrity sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==
56995692
dependencies:
57005693
"@opentelemetry/semantic-conventions" "^1.29.0"
57015694

5702-
"@opentelemetry/[email protected]":
5695+
"@opentelemetry/[email protected]", "@opentelemetry/core@^2.0.0-rc.1":
57035696
version "2.0.0-rc.1"
57045697
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0-rc.1.tgz#3a117d68f7b0cc2402438dd7a79ab684f29e0c0c"
57055698
integrity sha512-JfXBuCKmo2wPAnZM/iadMkjZj6Em7B6CyeonEbwkJ91/RrZgojAtv8T9VaX77DO8zsjfC8+Y1cJWoH15hYy3xA==
@@ -5948,7 +5941,7 @@
59485941
"@opentelemetry/core" "^1.8.0"
59495942
"@opentelemetry/instrumentation" "^0.57.1"
59505943

5951-
"@opentelemetry/[email protected]":
5944+
"@opentelemetry/[email protected]", "@opentelemetry/instrumentation@^0.200.0-rc.1":
59525945
version "0.200.0-rc.1"
59535946
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0-rc.1.tgz#749301d2f65c30680f4521c8f85b797d7b1f5f72"
59545947
integrity sha512-Sq+bD3mEoK60k1n124CDV4OJHaiMpukh2/xnPGj/wxpXo9Q9WcneaOmRRMvlHSkr3L7oBXekZ4JFzwVhFO66EA==
@@ -5959,17 +5952,6 @@
59595952
require-in-the-middle "^7.1.1"
59605953
shimmer "^1.2.1"
59615954

5962-
"@opentelemetry/instrumentation@^0.200.0-rc.1":
5963-
version "0.200.0"
5964-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0.tgz#29d1d4f70cbf0cb1ca9f2f78966379b0be96bddc"
5965-
integrity sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg==
5966-
dependencies:
5967-
"@opentelemetry/api-logs" "0.200.0"
5968-
"@types/shimmer" "^1.2.0"
5969-
import-in-the-middle "^1.8.1"
5970-
require-in-the-middle "^7.1.1"
5971-
shimmer "^1.2.1"
5972-
59735955
"@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":
59745956
version "0.57.2"
59755957
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.2.tgz#8924549d7941ba1b5c6f04d5529cf48330456d1d"
@@ -6004,14 +5986,22 @@
60045986
resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47"
60055987
integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==
60065988

6007-
"@opentelemetry/[email protected]", "@opentelemetry/resources@^2.0.0-rc.1":
5989+
"@opentelemetry/[email protected]":
60085990
version "2.0.0"
60095991
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0.tgz#15c04794c32b7d0b3c7589225ece6ae9bba25989"
60105992
integrity sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg==
60115993
dependencies:
60125994
"@opentelemetry/core" "2.0.0"
60135995
"@opentelemetry/semantic-conventions" "^1.29.0"
60145996

5997+
"@opentelemetry/[email protected]", "@opentelemetry/resources@^2.0.0-rc.1":
5998+
version "2.0.0-rc.1"
5999+
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0-rc.1.tgz#74467a0c4cf0f75d5180faa0d2cab870497684ba"
6000+
integrity sha512-ETqGg9rvdb0zSDmtvgt3R4Q2b1UdWx9M4XWIfoZgzTfV+Bj9LJFtE/YYQxY8Z1ygdI560SmuctgQWrafpLrFFQ==
6001+
dependencies:
6002+
"@opentelemetry/core" "2.0.0-rc.1"
6003+
"@opentelemetry/semantic-conventions" "^1.29.0"
6004+
60156005
"@opentelemetry/resources@^0.12.0":
60166006
version "0.12.0"
60176007
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-0.12.0.tgz#5eb287c3032a2bebb2bb9f69b44bd160d2a7d591"
@@ -6020,7 +6010,16 @@
60206010
"@opentelemetry/api" "^0.12.0"
60216011
"@opentelemetry/core" "^0.12.0"
60226012

6023-
"@opentelemetry/[email protected]", "@opentelemetry/sdk-trace-base@^2.0.0-rc.1":
6013+
"@opentelemetry/[email protected]":
6014+
version "2.0.0-rc.1"
6015+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0-rc.1.tgz#3d28a512027daffc4fc9206ef5bd67a9f8459b98"
6016+
integrity sha512-0sHZrmn5v3bWRRK6hMQeiRcJizMR79rTq+PnpaOOBXKPCPTCJotO4VYfk7Ro19HMRpyrP45Q4e2emlY7pZv+sw==
6017+
dependencies:
6018+
"@opentelemetry/core" "2.0.0-rc.1"
6019+
"@opentelemetry/resources" "2.0.0-rc.1"
6020+
"@opentelemetry/semantic-conventions" "^1.29.0"
6021+
6022+
"@opentelemetry/sdk-trace-base@^2.0.0-rc.1":
60246023
version "2.0.0"
60256024
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0.tgz#ebc06ea7537dea62f3882f8236c1234f4faf6b23"
60266025
integrity sha512-qQnYdX+ZCkonM7tA5iU4fSRsVxbFGml8jbxOgipRGMFHKaXKHQ30js03rTobYjKjIfnOsZSbHKWF0/0v0OQGfw==
@@ -6030,13 +6029,13 @@
60306029
"@opentelemetry/semantic-conventions" "^1.29.0"
60316030

60326031
"@opentelemetry/sdk-trace-node@^2.0.0-rc.1":
6033-
version "2.0.0"
6034-
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0.tgz#ef9f8ab77ccb41a9c9ff272f6bf4bb6999491f5b"
6035-
integrity sha512-omdilCZozUjQwY3uZRBwbaRMJ3p09l4t187Lsdf0dGMye9WKD4NGcpgZRvqhI1dwcH6og+YXQEtoO9Wx3ykilg==
6032+
version "2.0.0-rc.1"
6033+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0-rc.1.tgz#00df5a0e1311f7cab002542abd1c64ee135167cc"
6034+
integrity sha512-yhX8xNCucL3z+FobTEl7sZ3myh+YRJf/vAIS+lyeiV2qT30fVX2sv7AMVH+xjDYlYV/YVLZAqXOImVkJEFcMjA==
60366035
dependencies:
6037-
"@opentelemetry/context-async-hooks" "2.0.0"
6038-
"@opentelemetry/core" "2.0.0"
6039-
"@opentelemetry/sdk-trace-base" "2.0.0"
6036+
"@opentelemetry/context-async-hooks" "2.0.0-rc.1"
6037+
"@opentelemetry/core" "2.0.0-rc.1"
6038+
"@opentelemetry/sdk-trace-base" "2.0.0-rc.1"
60406039

60416040
"@opentelemetry/[email protected]":
60426041
version "1.28.0"

0 commit comments

Comments
 (0)