Skip to content

Commit b9af336

Browse files
andreiborzaandreiborza
committed
Merge default otel resource when creating new provider
1 parent cc2d4ad commit b9af336

File tree

4 files changed

+68
-62
lines changed

4 files changed

+68
-62
lines changed

‎packages/node/src/sdk/initOtel.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import moduleModule from 'module';
22
import { DiagLogLevel, diag } from '@opentelemetry/api';
3-
import { resourceFromAttributes } from '@opentelemetry/resources';
3+
import { resourceFromAttributes, defaultResource } from '@opentelemetry/resources';
44
import type { SpanProcessor } from '@opentelemetry/sdk-trace-node';
55
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
66
import {
@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
112112
// Create and configure NodeTracerProvider
113113
const provider = new NodeTracerProvider({
114114
sampler: new SentrySampler(client),
115-
resource: resourceFromAttributes({
116-
[ATTR_SERVICE_NAME]: 'node',
117-
// eslint-disable-next-line deprecation/deprecation
118-
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
119-
[ATTR_SERVICE_VERSION]: SDK_VERSION,
120-
}),
115+
resource: defaultResource().merge(
116+
resourceFromAttributes({
117+
[ATTR_SERVICE_NAME]: 'node',
118+
// eslint-disable-next-line deprecation/deprecation
119+
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
120+
[ATTR_SERVICE_VERSION]: SDK_VERSION,
121+
}),
122+
),
121123
forceFlushTimeoutMillis: 500,
122124
spanProcessors: [
123125
new SentrySpanProcessor({

‎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, diag } 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/src/sdk.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DiagLogLevel, diag } from '@opentelemetry/api';
2-
import { resourceFromAttributes } from '@opentelemetry/resources';
2+
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
33
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
44
import {
55
ATTR_SERVICE_NAME,
@@ -155,12 +155,14 @@ export function setupOtel(client: VercelEdgeClient): void {
155155
// Create and configure NodeTracerProvider
156156
const provider = new NodeTracerProvider({
157157
sampler: new SentrySampler(client),
158-
resource: resourceFromAttributes({
159-
[ATTR_SERVICE_NAME]: 'edge',
160-
// eslint-disable-next-line deprecation/deprecation
161-
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
162-
[ATTR_SERVICE_VERSION]: SDK_VERSION,
163-
}),
158+
resource: defaultResource().merge(
159+
resourceFromAttributes({
160+
[ATTR_SERVICE_NAME]: 'edge',
161+
// eslint-disable-next-line deprecation/deprecation
162+
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
163+
[ATTR_SERVICE_VERSION]: SDK_VERSION,
164+
}),
165+
),
164166
forceFlushTimeoutMillis: 500,
165167
spanProcessors: [
166168
new SentrySpanProcessor({

‎yarn.lock‎

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

5645-
"@opentelemetry/[email protected]dev.0":
5646-
version "0.200.0-dev.0"
5647-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0-dev.0.tgz#1522df44b17bf68b8f709d6251418d8082fb8808"
5648-
integrity sha512-wZzFxB2MSY9aYV0e845vphACuln0MYoiDJLhklnv2nhJqOn5pLMz0GfIK78VP7BVI0+fVW1rlskr7Aw7Aq4oQA==
5645+
"@opentelemetry/[email protected]rc.1":
5646+
version "0.200.0-rc.1"
5647+
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.200.0-rc.1.tgz#b5af8f3b2533edf106d16ff919d8cfa4b50b1eca"
5648+
integrity sha512-V1CCvM+pSZWsSwCw1PmeB5NyX3Ysubje5pxoaV7p556g4ym8mOptX7PE4lF8vhb7MHbtkAfVJ9EpbXbu9w3gzw==
56495649
dependencies:
56505650
"@opentelemetry/api" "^1.3.0"
56515651

@@ -5675,20 +5675,20 @@
56755675
dependencies:
56765676
"@opentelemetry/context-base" "^0.12.0"
56775677

5678-
"@opentelemetry/[email protected]dev.0", "@opentelemetry/context-async-hooks@^2.0.0-dev.0":
5679-
version "2.0.0-dev.0"
5680-
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0-dev.0.tgz#1b4d011c7e74b5fe647c3d06254c7a893a30f79e"
5681-
integrity sha512-5myaYGXVBVIP4wZVoUpMcI80+Wn4sG64kuwc3OO2LVi4jZxMv/hKZA7IO8WvgQMP9gHSWDSS4FN2VXuOyoYmcw==
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==
56825682

56835683
"@opentelemetry/context-base@^0.12.0":
56845684
version "0.12.0"
56855685
resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.12.0.tgz#4906ae27359d3311e3dea1b63770a16f60848550"
56865686
integrity sha512-UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA==
56875687

5688-
"@opentelemetry/[email protected]dev.0", "@opentelemetry/core@^2.0.0-dev.0":
5689-
version "2.0.0-dev.0"
5690-
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0-dev.0.tgz#c5437ecee5055c8a195ad88d13f757100588e62f"
5691-
integrity sha512-uDNKPs29s8P54bP+ol/nFaRujClCeyan5/klpZYUGMt7InwITqRW93gDYdmnlJjFKVh8/tyWjUvyWMe1HdLdAg==
5688+
"@opentelemetry/[email protected]rc.1", "@opentelemetry/core@^2.0.0-rc.1":
5689+
version "2.0.0-rc.1"
5690+
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0-rc.1.tgz#3a117d68f7b0cc2402438dd7a79ab684f29e0c0c"
5691+
integrity sha512-JfXBuCKmo2wPAnZM/iadMkjZj6Em7B6CyeonEbwkJ91/RrZgojAtv8T9VaX77DO8zsjfC8+Y1cJWoH15hYy3xA==
56925692
dependencies:
56935693
"@opentelemetry/semantic-conventions" "^1.29.0"
56945694

@@ -5802,13 +5802,13 @@
58025802
"@opentelemetry/instrumentation" "^0.57.1"
58035803
"@opentelemetry/semantic-conventions" "^1.27.0"
58045804

5805-
"@opentelemetry/[email protected]dev.0":
5806-
version "0.200.0-dev.0"
5807-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.200.0-dev.0.tgz#a74b441160588cc6a69d7b8c8d780bcd2f7eb196"
5808-
integrity sha512-kBe9XqcfpWonxGWskO+QFnTr+ALehojAuvYEEzsKkME3xm9lnzkZoYPXg5CMg7tEqVAWBZmtQ/A9Q1nRRjyfeQ==
5805+
"@opentelemetry/[email protected]rc.1":
5806+
version "0.200.0-rc.1"
5807+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.200.0-rc.1.tgz#f5ce7e2bd060c4a1af94f7c3cb34c0b367317362"
5808+
integrity sha512-VN/NKb1RBfK3t/AtggjkjB1zVYv8IP1MA6odnyRm+AInhv4dM0DUquPCpUxkX+j6F/jQ+VCVidWK0ObAKz/7Rg==
58095809
dependencies:
5810-
"@opentelemetry/core" "2.0.0-dev.0"
5811-
"@opentelemetry/instrumentation" "0.200.0-dev.0"
5810+
"@opentelemetry/core" "2.0.0-rc.1"
5811+
"@opentelemetry/instrumentation" "0.200.0-rc.1"
58125812
"@opentelemetry/semantic-conventions" "^1.29.0"
58135813
forwarded-parse "2.1.2"
58145814

@@ -5934,12 +5934,12 @@
59345934
"@opentelemetry/core" "^1.8.0"
59355935
"@opentelemetry/instrumentation" "^0.57.1"
59365936

5937-
"@opentelemetry/[email protected]dev.0", "@opentelemetry/instrumentation@^0.200.0-dev.0":
5938-
version "0.200.0-dev.0"
5939-
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0-dev.0.tgz#a2387daba680931bd88b6473fadcc2cea5f24bf8"
5940-
integrity sha512-t1Z0lRQVYDnBEim3QY4df1SkdqEgEESYSyXemQWQNWsWtx2H6PhK+yEI8nQtU/J0KPJ0MfZ1xWoxJRRY5NRKbA==
5937+
"@opentelemetry/[email protected]rc.1", "@opentelemetry/instrumentation@^0.200.0-rc.1":
5938+
version "0.200.0-rc.1"
5939+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0-rc.1.tgz#749301d2f65c30680f4521c8f85b797d7b1f5f72"
5940+
integrity sha512-Sq+bD3mEoK60k1n124CDV4OJHaiMpukh2/xnPGj/wxpXo9Q9WcneaOmRRMvlHSkr3L7oBXekZ4JFzwVhFO66EA==
59415941
dependencies:
5942-
"@opentelemetry/api-logs" "0.200.0-dev.0"
5942+
"@opentelemetry/api-logs" "0.200.0-rc.1"
59435943
"@types/shimmer" "^1.2.0"
59445944
import-in-the-middle "^1.8.1"
59455945
require-in-the-middle "^7.1.1"
@@ -5979,12 +5979,12 @@
59795979
resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47"
59805980
integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==
59815981

5982-
"@opentelemetry/[email protected]dev.0", "@opentelemetry/resources@^2.0.0-dev.0":
5983-
version "2.0.0-dev.0"
5984-
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0-dev.0.tgz#1983d56e84fdfbdced0a5b76b325740049f45d62"
5985-
integrity sha512-TpJtctWmdIxDATecqMd92Qv0MifzgvI0YN4uEKQgAdioHJ44Rl1zTOrheUYz/66Y4iUGWUP5bm3irFOb1ymt9A==
5982+
"@opentelemetry/[email protected]rc.1", "@opentelemetry/resources@^2.0.0-rc.1":
5983+
version "2.0.0-rc.1"
5984+
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0-rc.1.tgz#74467a0c4cf0f75d5180faa0d2cab870497684ba"
5985+
integrity sha512-ETqGg9rvdb0zSDmtvgt3R4Q2b1UdWx9M4XWIfoZgzTfV+Bj9LJFtE/YYQxY8Z1ygdI560SmuctgQWrafpLrFFQ==
59865986
dependencies:
5987-
"@opentelemetry/core" "2.0.0-dev.0"
5987+
"@opentelemetry/core" "2.0.0-rc.1"
59885988
"@opentelemetry/semantic-conventions" "^1.29.0"
59895989

59905990
"@opentelemetry/resources@^0.12.0":
@@ -5995,23 +5995,23 @@
59955995
"@opentelemetry/api" "^0.12.0"
59965996
"@opentelemetry/core" "^0.12.0"
59975997

5998-
"@opentelemetry/[email protected]dev.0":
5999-
version "2.0.0-dev.0"
6000-
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0-dev.0.tgz#320a259ea4332b4d9452e6bd309862c4c2d08e9e"
6001-
integrity sha512-zULpgNZNGS6LM+rI6fw2fraAVvIm3aI/DfcuwxRvPa6Yqf9kR7FQk1EdB8Tf2AJm+UWakGPpRbEhkv1KqPVu2w==
5998+
"@opentelemetry/[email protected]rc.1":
5999+
version "2.0.0-rc.1"
6000+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0-rc.1.tgz#3d28a512027daffc4fc9206ef5bd67a9f8459b98"
6001+
integrity sha512-0sHZrmn5v3bWRRK6hMQeiRcJizMR79rTq+PnpaOOBXKPCPTCJotO4VYfk7Ro19HMRpyrP45Q4e2emlY7pZv+sw==
60026002
dependencies:
6003-
"@opentelemetry/core" "2.0.0-dev.0"
6004-
"@opentelemetry/resources" "2.0.0-dev.0"
6003+
"@opentelemetry/core" "2.0.0-rc.1"
6004+
"@opentelemetry/resources" "2.0.0-rc.1"
60056005
"@opentelemetry/semantic-conventions" "^1.29.0"
60066006

6007-
"@opentelemetry/sdk-trace-node@^2.0.0-dev.0":
6008-
version "2.0.0-dev.0"
6009-
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0-dev.0.tgz#98204d32baa71150e9ab702667489f52e73816ac"
6010-
integrity sha512-MyhbEkI4PX+o2LAsGm0/IiRTBYu81+ENYHZN5cbzjsabzYqk55GndkqjO4O1mHEOr47rzuMCcUm9+qvb3BNfsw==
6007+
"@opentelemetry/sdk-trace-node@^2.0.0-rc.1":
6008+
version "2.0.0-rc.1"
6009+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0-rc.1.tgz#00df5a0e1311f7cab002542abd1c64ee135167cc"
6010+
integrity sha512-yhX8xNCucL3z+FobTEl7sZ3myh+YRJf/vAIS+lyeiV2qT30fVX2sv7AMVH+xjDYlYV/YVLZAqXOImVkJEFcMjA==
60116011
dependencies:
6012-
"@opentelemetry/context-async-hooks" "2.0.0-dev.0"
6013-
"@opentelemetry/core" "2.0.0-dev.0"
6014-
"@opentelemetry/sdk-trace-base" "2.0.0-dev.0"
6012+
"@opentelemetry/context-async-hooks" "2.0.0-rc.1"
6013+
"@opentelemetry/core" "2.0.0-rc.1"
6014+
"@opentelemetry/sdk-trace-base" "2.0.0-rc.1"
60156015

60166016
"@opentelemetry/[email protected]":
60176017
version "1.28.0"

0 commit comments

Comments
 (0)