Skip to content

Commit ced8e31

Browse files
committed
test(otel): keep compatibility fixtures resolvable after packing
The package-size job resolves dev dependencies from the packed manifest even under --prod, where local test fixture paths do not exist.
1 parent c4ec936 commit ced8e31

6 files changed

Lines changed: 23 additions & 60 deletions

File tree

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,6 @@
205205
"bun": "1.3.14",
206206
"c8": "^11.0.0",
207207
"codeowners-audit": "^2.9.0",
208-
"dd-trace-otel-api-logs-v033-fixture": "file:packages/dd-trace/test/opentelemetry/fixtures/api-logs-v033",
209-
"dd-trace-otel-api-logs-v034-fixture": "file:packages/dd-trace/test/opentelemetry/fixtures/api-logs-v034",
210208
"eslint": "^9.39.2",
211209
"eslint-plugin-cypress": "^6.4.2",
212210
"eslint-plugin-import": "^2.32.0",
@@ -232,6 +230,9 @@
232230
"node-preload": "^0.2.1",
233231
"nyc": "^18.0.0",
234232
"octokit": "^5.0.3",
233+
"otel-api-logs-v033": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.33.0.tgz",
234+
"otel-api-logs-v034": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.34.0.tgz",
235+
"otel-api-v14": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz",
235236
"p-limit": "^7.2.0",
236237
"proxyquire": "^2.1.3",
237238
"retry": "^0.13.1",

packages/dd-trace/test/opentelemetry/api-loading.spec.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@
33
const assert = require('node:assert/strict')
44
const { execFileSync } = require('node:child_process')
55
const fs = require('node:fs')
6-
const { createRequire } = require('node:module')
76
const os = require('node:os')
87
const path = require('node:path')
98

109
const { describe, it, afterEach } = require('mocha')
1110

1211
const DD_TRACE_PATH = path.join(__dirname, '..', '..', '..', '..')
1312
const API_OWNER_VERSION = require(path.join(DD_TRACE_PATH, 'package.json')).optionalDependencies['@opentelemetry/api']
14-
const API_LOGS_V033_REQUIRE = createRequire(require.resolve('dd-trace-otel-api-logs-v033-fixture/package.json'))
15-
const API_LOGS_V034_REQUIRE = createRequire(require.resolve('dd-trace-otel-api-logs-v034-fixture/package.json'))
16-
const API_DIRECTORY = findPackageDirectory(API_LOGS_V033_REQUIRE.resolve('@opentelemetry/api'))
13+
const API_DIRECTORY = findPackageDirectory(require.resolve('otel-api-v14'))
1714
const API_VERSION = require(path.join(API_DIRECTORY, 'package.json')).version
1815
const API_LOGS_DIRECTORIES = [
19-
findPackageDirectory(API_LOGS_V033_REQUIRE.resolve('@opentelemetry/api-logs')),
20-
findPackageDirectory(API_LOGS_V034_REQUIRE.resolve('@opentelemetry/api-logs')),
16+
findPackageDirectory(require.resolve('otel-api-logs-v033')),
17+
findPackageDirectory(require.resolve('otel-api-logs-v034')),
2118
]
2219

2320
describe('OpenTelemetry API copy loading', () => {

packages/dd-trace/test/opentelemetry/api.spec.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
const assert = require('node:assert/strict')
44
const fs = require('node:fs')
5-
const { createRequire } = require('node:module')
65
const path = require('node:path')
76

87
const { describe, it, beforeEach, afterEach } = require('mocha')
98
const proxyquire = require('proxyquire')
109
const sinon = require('sinon')
1110

12-
const API_V14_REQUIRE = createRequire(require.resolve('dd-trace-otel-api-logs-v033-fixture/package.json'))
13-
const API_V14_ENTRY = API_V14_REQUIRE.resolve('@opentelemetry/api')
11+
const API_V14_ENTRY = require.resolve('otel-api-v14')
1412
const API_OWNER_VERSION = require('../../../../package.json').optionalDependencies['@opentelemetry/api']
1513

1614
require('../setup/core')

packages/dd-trace/test/opentelemetry/fixtures/api-logs-v033/package.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/dd-trace/test/opentelemetry/fixtures/api-logs-v034/package.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

yarn.lock

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -792,25 +792,6 @@
792792
dependencies:
793793
"@opentelemetry/api" "^1.3.0"
794794

795-
"@opentelemetry/api-logs@0.33.0":
796-
version "0.33.0"
797-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.33.0.tgz#2f180853459227d91a17e3aee40e21d4431b1b5b"
798-
integrity sha512-B3SocjwflrNEaTQrJXNbmOg4nggJmFpxiJnoat+Ap861I9n4ZIH/nuSn7JfPdIEeoZV+jbFu2QzEKNk2ROZMZQ==
799-
dependencies:
800-
"@opentelemetry/api" "^1.0.0"
801-
802-
"@opentelemetry/api-logs@0.34.0":
803-
version "0.34.0"
804-
resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.34.0.tgz#6c26cefa18137afe674e8a814a7ae99cfe61620d"
805-
integrity sha512-6/s7Klnc3IDtLCXjvRlMKYOTp5LgWXwmFDSNF35zMFyk1rNv5LZajWhkk3zXIlEW9auqoesTyoWlP0bgCbr7bw==
806-
dependencies:
807-
"@opentelemetry/api" "^1.0.0"
808-
809-
"@opentelemetry/api@1.4.1":
810-
version "1.4.1"
811-
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
812-
integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==
813-
814795
"@opentelemetry/api@1.9.1", "@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.3.0":
815796
version "1.9.1"
816797
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.1.tgz#c1b0346de336ba55af2d5a7970882037baedec05"
@@ -1798,18 +1779,6 @@ dc-polyfill@^0.1.11:
17981779
resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.11.tgz#3efa792147f3b5224b8a9274905b1e98fe82a856"
17991780
integrity sha512-TyyeGcjx0YeThAI9fTFtgsvj5qd4R+aGfVmXiUhevbgzWFDr7IK4tv4YjE6jaGzLHQTchk4h7DHdr5q4WGgaZw==
18001781

1801-
"dd-trace-otel-api-logs-v033-fixture@file:packages/dd-trace/test/opentelemetry/fixtures/api-logs-v033":
1802-
version "1.0.0"
1803-
dependencies:
1804-
"@opentelemetry/api" "1.4.1"
1805-
"@opentelemetry/api-logs" "0.33.0"
1806-
1807-
"dd-trace-otel-api-logs-v034-fixture@file:packages/dd-trace/test/opentelemetry/fixtures/api-logs-v034":
1808-
version "1.0.0"
1809-
dependencies:
1810-
"@opentelemetry/api" "1.4.1"
1811-
"@opentelemetry/api-logs" "0.34.0"
1812-
18131782
debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.4.0, debug@^4.4.3:
18141783
version "4.4.3"
18151784
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
@@ -3738,6 +3707,22 @@ optionator@^0.9.3:
37383707
type-check "^0.4.0"
37393708
word-wrap "^1.2.5"
37403709

3710+
"otel-api-logs-v033@https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.33.0.tgz":
3711+
version "0.33.0"
3712+
resolved "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.33.0.tgz#2f180853459227d91a17e3aee40e21d4431b1b5b"
3713+
dependencies:
3714+
"@opentelemetry/api" "^1.0.0"
3715+
3716+
"otel-api-logs-v034@https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.34.0.tgz":
3717+
version "0.34.0"
3718+
resolved "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.34.0.tgz#6c26cefa18137afe674e8a814a7ae99cfe61620d"
3719+
dependencies:
3720+
"@opentelemetry/api" "^1.0.0"
3721+
3722+
"otel-api-v14@https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz":
3723+
version "1.4.1"
3724+
resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
3725+
37413726
outvariant@^1.4.0, outvariant@^1.4.3:
37423727
version "1.4.3"
37433728
resolved "https://registry.yarnpkg.com/outvariant/-/outvariant-1.4.3.tgz#221c1bfc093e8fec7075497e7799fdbf43d14873"

0 commit comments

Comments
 (0)