Skip to content

Commit 32b317f

Browse files
andreiborzaandreiborza
committed
Update spanTypes tests
1 parent 8cfa8af commit 32b317f

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎packages/opentelemetry/src/utils/spanTypes.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { SpanContext, SpanKind, SpanStatus } from '@opentelemetry/api';
1+
import type { SpanKind, SpanStatus } from '@opentelemetry/api';
22
import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-node';
33

44
import type { AbstractSpan } from '../types';
@@ -54,7 +54,7 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
5454
*/
5555
export function spanHasParentId<SpanType extends AbstractSpan>(
5656
span: SpanType,
57-
): span is SpanType & { spanContext?: SpanContext } {
57+
): span is SpanType {
5858
const castSpan = span as ReadableSpan;
5959
return !!castSpan.parentSpanContext?.spanId;
6060
}

‎packages/opentelemetry/test/utils/spanTypes.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ describe('spanTypes', () => {
4343
describe('spanHasParentId', () => {
4444
it.each([
4545
[{}, false],
46-
[{ parentSpanId: null }, false],
47-
[{ parentSpanId: 'TEST_PARENT_ID' }, true],
46+
[{ parentSpanContext: { spanId: null } }, false],
47+
[{ parentSpanContext: { spanId: 'TEST_PARENT_ID' } }, true],
4848
])('works with %p', (span, expected) => {
4949
const castSpan = span as unknown as Span;
5050
const actual = spanHasParentId(castSpan);
5151

5252
expect(actual).toBe(expected);
5353

5454
if (actual) {
55-
expect(castSpan.parentSpanId).toBeDefined();
55+
expect(castSpan.parentSpanContext?.spanId).toBeDefined();
5656
}
5757
});
5858
});

‎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]-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==
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==
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]-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==
5678+
"@opentelemetry/[email protected]", "@opentelemetry/context-async-hooks@^2.0.0":
5679+
version "2.0.0"
5680+
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.0.tgz#c98a727238ca199cda943780acf6124af8d8cd80"
5681+
integrity sha512-IEkJGzK1A9v3/EHjXh3s2IiFc6L4jfK+lNgKVgUjeUJQRRhnVFMIO3TAvKwonm9O1HebCuoOt98v8bZW7oVQHA==
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]-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==
5688+
"@opentelemetry/[email protected]", "@opentelemetry/core@^2.0.0":
5689+
version "2.0.0"
5690+
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.0.0.tgz#37e9f0e9ddec4479b267aca6f32d88757c941b3a"
5691+
integrity sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==
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]-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==
5805+
"@opentelemetry/[email protected]":
5806+
version "0.200.0"
5807+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.200.0.tgz#b5bda869afad4e6933120c34c98e201d5b6e0a24"
5808+
integrity sha512-9tqGbCJikhYU68y3k9mi6yWsMyMeCcwoQuHvIXan5VvvPPQ5WIZaV6Mxu/MCVe4swRNoFs8Th+qyj0TZV5ELvw==
58095809
dependencies:
5810-
"@opentelemetry/core" "2.0.0-rc.1"
5811-
"@opentelemetry/instrumentation" "0.200.0-rc.1"
5810+
"@opentelemetry/core" "2.0.0"
5811+
"@opentelemetry/instrumentation" "0.200.0"
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]-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==
5937+
"@opentelemetry/[email protected]", "@opentelemetry/instrumentation@^0.200.0":
5938+
version "0.200.0"
5939+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.200.0.tgz#29d1d4f70cbf0cb1ca9f2f78966379b0be96bddc"
5940+
integrity sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg==
59415941
dependencies:
5942-
"@opentelemetry/api-logs" "0.200.0-rc.1"
5942+
"@opentelemetry/api-logs" "0.200.0"
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]-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==
5982+
"@opentelemetry/[email protected]", "@opentelemetry/resources@^2.0.0":
5983+
version "2.0.0"
5984+
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.0.0.tgz#15c04794c32b7d0b3c7589225ece6ae9bba25989"
5985+
integrity sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg==
59865986
dependencies:
5987-
"@opentelemetry/core" "2.0.0-rc.1"
5987+
"@opentelemetry/core" "2.0.0"
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]-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==
5998+
"@opentelemetry/[email protected]":
5999+
version "2.0.0"
6000+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0.tgz#ebc06ea7537dea62f3882f8236c1234f4faf6b23"
6001+
integrity sha512-qQnYdX+ZCkonM7tA5iU4fSRsVxbFGml8jbxOgipRGMFHKaXKHQ30js03rTobYjKjIfnOsZSbHKWF0/0v0OQGfw==
60026002
dependencies:
6003-
"@opentelemetry/core" "2.0.0-rc.1"
6004-
"@opentelemetry/resources" "2.0.0-rc.1"
6003+
"@opentelemetry/core" "2.0.0"
6004+
"@opentelemetry/resources" "2.0.0"
60056005
"@opentelemetry/semantic-conventions" "^1.29.0"
60066006

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==
6007+
"@opentelemetry/sdk-trace-node@^2.0.0":
6008+
version "2.0.0"
6009+
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.0.0.tgz#ef9f8ab77ccb41a9c9ff272f6bf4bb6999491f5b"
6010+
integrity sha512-omdilCZozUjQwY3uZRBwbaRMJ3p09l4t187Lsdf0dGMye9WKD4NGcpgZRvqhI1dwcH6og+YXQEtoO9Wx3ykilg==
60116011
dependencies:
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"
6012+
"@opentelemetry/context-async-hooks" "2.0.0"
6013+
"@opentelemetry/core" "2.0.0"
6014+
"@opentelemetry/sdk-trace-base" "2.0.0"
60156015

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

0 commit comments

Comments
 (0)