Skip to content

Commit 86b4f71

Browse files
authored
chore: move vendored dependencies to non-standard folder (#7115)
This is required to make sure yarn 2+ continues to work as expected. It would otherwise remove the node_modules folder during install. That would break dd-trace usage.
1 parent 2a5063a commit 86b4f71

177 files changed

Lines changed: 80 additions & 69 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/platform.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
install: pnpm add
3636
- name: yarn
3737
install: yarn add
38+
- name: yarn-berry
39+
install: npm install -g corepack && yarn set version stable && yarn config set nodeLinker node-modules && yarn add
3840
- name: bun
3941
install: bun add
4042
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ packages/dd-trace/test/plugins/versions/node_modules
131131
packages/dd-trace/test/plugins/versions/yarn.lock
132132
!packages/dd-trace/**/telemetry/logs
133133
packages/datadog-plugin-azure-functions/test/integration-test/fixtures/node_modules
134-
!packages/node_modules
134+
!vendor/dist
135135
__azurite_db_queue__.json
136136
__azurite_db_queue_extent__.json
137137
__queuestorage__/AzuriteConfig

docs/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
SPAN_TYPE,
2626
} from '../ext/tags'
2727
import { HTTP, WEB } from '../ext/types'
28-
import * as opentracing from '../packages/node_modules/opentracing';
28+
import * as opentracing from '../vendor/dist/opentracing';
2929
import { IncomingMessage, OutgoingMessage } from 'http';
3030

3131
opentracing.initGlobalTracer(tracer);

index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ClientRequest, IncomingMessage, OutgoingMessage, ServerResponse } from "http";
22
import { LookupFunction } from 'net';
3-
import * as opentracing from "./packages/node_modules/opentracing";
3+
import * as opentracing from "./vendor/dist/opentracing";
44
import * as otel from "@opentelemetry/api";
55

66
/**

integration-tests/profiler/profiler.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const fs = require('fs/promises')
1414
const fsync = require('fs')
1515
const net = require('net')
1616
const zlib = require('zlib')
17-
const { Profile } = require('pprof-format')
17+
const { Profile } = require('../../vendor/dist/pprof-format')
1818
const satisfies = require('semifies')
1919

2020
const DEFAULT_PROFILE_TYPES = ['wall', 'space']

loader-hook.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import regexpEscapeModule from './packages/node_modules/escape-string-regexp/index.js'
1+
import regexpEscapeModule from './vendor/dist/escape-string-regexp/index.js'
22
import * as iitm from 'import-in-the-middle/hook.mjs'
33
import hooks from './packages/datadog-instrumentations/src/helpers/hooks.js'
44
import configHelper from './packages/dd-trace/src/config-helper.js'

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"node": ">=18"
9999
},
100100
"files": [
101+
"/package.json",
101102
"ci/**/*",
102103
"cypress/**/*",
103104
"esbuild.js",
@@ -111,18 +112,17 @@
111112
"LICENSE.Apache",
112113
"LICENSE.BSD3",
113114
"loader-hook.mjs",
114-
"package.json",
115115
"packages/*/index.js",
116116
"packages/*/lib/**/*",
117117
"packages/*/src/**/*",
118-
"packages/node_modules/**/*.js",
119-
"packages/node_modules/**/*.d.ts",
120-
"packages/node_modules/**/*.wasm",
121-
"packages/node_modules/**/LICENSE",
122118
"packages/datadog-instrumentations/orchestrion.yml",
123119
"README.md",
124120
"register.js",
125121
"scripts/preinstall.js",
122+
"vendor/dist/**/*.d.ts",
123+
"vendor/dist/**/*.js",
124+
"vendor/dist/**/*.wasm",
125+
"vendor/dist/**/LICENSE",
126126
"version.js"
127127
],
128128
"dependencies": {

packages/datadog-instrumentations/src/cucumber.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
const { createCoverageMap } = require('istanbul-lib-coverage')
2+
const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
33

44
const { addHook, channel } = require('./helpers/instrument')
55
const shimmer = require('../../datadog-shimmer')
@@ -43,7 +43,7 @@ const {
4343
CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
4444
getIsFaultyEarlyFlakeDetection
4545
} = require('../../dd-trace/src/plugins/util/test')
46-
const satisfies = require('semifies')
46+
const satisfies = require('../../../vendor/dist/semifies')
4747

4848
const isMarkedAsUnskippable = (pickle) => {
4949
return pickle.tags.some(tag => tag.name === '@datadog:unskippable')

packages/datadog-instrumentations/src/helpers/register.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const { channel } = require('dc-polyfill')
44
const path = require('path')
5-
const satisfies = require('semifies')
5+
const satisfies = require('../../../../vendor/dist/semifies')
66
const Hook = require('./hook')
77
const requirePackageJson = require('../../../dd-trace/src/require-package-json')
88
const log = require('../../../dd-trace/src/log')

packages/datadog-instrumentations/src/helpers/rewriter/compiler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ let esquery
66

77
module.exports = {
88
parse: (...args) => {
9-
meriyah ??= require('meriyah')
9+
meriyah ??= require('../../../../../vendor/dist/meriyah')
1010

1111
return meriyah.parse(...args)
1212
},
1313

1414
generate: (...args) => {
15-
astring ??= require('astring')
15+
astring ??= require('../../../../../vendor/dist/astring')
1616

1717
return astring.generate(...args)
1818
},
1919

2020
traverse: (ast, query, visitor) => {
21-
esquery ??= require('esquery').default
21+
esquery ??= require('../../../../../vendor/dist/esquery').default
2222

2323
const selector = esquery.parse(query)
2424

0 commit comments

Comments
 (0)