Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a8e7fb5
switch to bun to install test versions
rochdev Oct 8, 2025
133583a
run scripts from dependencies
rochdev Oct 8, 2025
ebcbead
ignore error when no scripts need to be trusted
rochdev Oct 8, 2025
3e7a6a3
switch to isolated linker
rochdev Oct 8, 2025
66bd22d
move trusted dependencies to individual workspaces
rochdev Oct 8, 2025
da41a9b
add list of trusted dependencies
rochdev Oct 9, 2025
b99a7f0
switch to bun for benchmarks as well
rochdev Oct 9, 2025
32b73e2
omit peer dependencies and remove hoisting config
rochdev Oct 9, 2025
9549a6c
force install for pg
rochdev Oct 9, 2025
0137b21
fix aws-sdk test using internal dependency
rochdev Oct 9, 2025
524b312
actually force install
rochdev Oct 9, 2025
4c57219
fix langchain using transitive dependency
rochdev Oct 10, 2025
b46d494
fix bedrock test using transitive dependency
rochdev Oct 10, 2025
e540e9f
fix remaining langchain test transitive dep reference
rochdev Oct 11, 2025
89a34c8
fix vertexai using transitive dependencies
rochdev Oct 12, 2025
ea7794f
fix vertexai using transitive dependencies
rochdev Oct 12, 2025
7fcea0b
use canary for now
rochdev Oct 22, 2025
9aff23d
fix hoisting conflicting with our install script
rochdev Oct 22, 2025
087c50c
add support for transitive deps and fix pubsub tests
rochdev Oct 22, 2025
ea43583
do not omit peers
rochdev Oct 22, 2025
c3baf3b
fix q tests
rochdev Oct 22, 2025
378a58a
fix moleculer test
rochdev Oct 22, 2025
28de112
remove hoisting prevention
rochdev Oct 22, 2025
907bf51
explicitly install peer dependencies
rochdev Oct 22, 2025
34b56d0
fix prisma
rochdev Oct 22, 2025
986d6e9
fix moleculer test
rochdev Oct 22, 2025
96c8973
remove .bun-version file
rochdev Oct 22, 2025
f4442a6
update bun dependency and remove old install script
rochdev Oct 22, 2025
73aebfd
fix prisma tests
rochdev Oct 23, 2025
03c3e30
fix prisma test
rochdev Oct 23, 2025
3d1a60a
use non-canary version of bun
rochdev Oct 23, 2025
36214fc
code cleanup
rochdev Oct 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/apm-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ jobs:
ports:
- 5432:5432
env:
BUN_FORCE_INSTALL: 'true'
PG_TEST_NATIVE: 'true'
PLUGINS: pg
SERVICES: postgres
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ jobs:
ports:
- 5432:5432
env:
BUN_FORCE_INSTALL: 'true'
PG_TEST_NATIVE: 'true'
PLUGINS: pg
SERVICES: postgres
Expand Down
1 change: 1 addition & 0 deletions .gitlab/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ variables:
interruptible: true
timeout: 15m # TODO: Fix worker queueing and reduce this.
script:
- apt-get install -y unzip
- git clone --branch dd-trace-js https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform && cd platform
- bp-runner bp-runner.yml --debug
artifacts:
Expand Down
6 changes: 3 additions & 3 deletions benchmark/sirun/runall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ fi

(
cd ../../ &&
npm install --global yarn || (sleep 60 && npm install --global yarn) \
&& yarn install --ignore-engines || (sleep 60 && yarn install --ignore-engines) \
&& PLUGINS="bluebird|q|graphql|express" yarn services
npm install --global bun || (sleep 60 && npm install --global bun) \
&& bun install --ignore-engines || (sleep 60 && bun install --ignore-engines) \
&& PLUGINS="bluebird|q|graphql|express" bun services
)

# run each test in parallel for a given version of Node.js
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"axios": "^1.12.2",
"benchmark": "^2.1.4",
"body-parser": "^2.2.0",
"bun": "1.2.23",
"bun": "1.3.1",
"chai": "^4.5.0",
"eslint": "^9.29.0",
"eslint-plugin-cypress": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/datadog-plugin-aws-sdk/test/bedrockruntime.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ describe('Plugin', () => {
const requireVersion = version === '3.0.0' ? '3.422.0' : '>=3.422.0'
AWS = require(`../../../versions/${bedrockRuntimeClientName}@${requireVersion}`).get()
const NodeHttpHandler =
require(`../../../versions/${bedrockRuntimeClientName}@${requireVersion}`)
.get('@smithy/node-http-handler')
require('../../../versions/@aws-sdk/node-http-handler@>=3')
.get()
.NodeHttpHandler

bedrockRuntimeClient = new AWS.BedrockRuntimeClient(
Expand Down
11 changes: 7 additions & 4 deletions packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ describe('Plugin', () => {
let resource
let v1
let gax
let grpc
let expectedProducerHash
let expectedConsumerHash

Expand All @@ -52,9 +53,11 @@ describe('Plugin', () => {
})

beforeEach(() => {
const root = `../../../versions/@google-cloud/pubsub@${version}`
tracer = require('../../dd-trace')
gax = require('../../../versions/[email protected]').get()
const lib = require(`../../../versions/@google-cloud/pubsub@${version}`).get()
gax = require(root).follow('google-gax')
grpc = require(root).follow('google-gax', '@grpc/grpc-js')
const lib = require(root).get()
project = getProjectId()
topicName = getTopic()
resource = `projects/${project}/topics/${topicName}`
Expand Down Expand Up @@ -84,11 +87,11 @@ describe('Plugin', () => {

it('should be instrumented when using the internal API', async () => {
const publisher = new v1.PublisherClient({
grpc: gax.grpc,
grpc,
projectId: project,
servicePath: 'localhost',
port: 8081,
sslCreds: gax.grpc.credentials.createInsecure()
sslCreds: grpc.credentials.createInsecure()
}, gax)

const expectedSpanPromise = expectSpanWithDefaults({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ describe('Plugin', () => {
before(() => {
const { VertexAI } = require(`../../../versions/@google-cloud/vertexai@${version}`).get()

// stub credentials checking
const { GoogleAuth } = require(`../../../versions/@google-cloud/vertexai@${version}`)
.get('google-auth-library/build/src/auth/googleauth')
authStub = sinon.stub(GoogleAuth.prototype, 'getAccessToken').resolves({})
class TestVertexAI extends VertexAI {
constructor (...args) {
super(...args)

const client = new VertexAI({
// stub credentials checking
authStub = sinon.stub(this.googleAuth.constructor.prototype, 'getAccessToken').resolves({})
}
}

const client = new TestVertexAI({
project: 'datadog-sandbox',
location: 'us-central1'
})
Expand Down
3 changes: 1 addition & 2 deletions packages/datadog-plugin-langchain/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ describe('Plugin', () => {
})

beforeEach(() => {
langchainOpenai = require(`../../../versions/langchain@${version}`)
.get('@langchain/openai')
langchainOpenai = require('../../../versions/@langchain/[email protected]').get()
langchainAnthropic = require(`../../../versions/@langchain/anthropic@${version}`).get()
if (version !== '0.1.0') {
// version mismatching otherwise
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ describe('Plugin', () => {
const requireVersion = version === '3.0.0' ? '3.422.0' : '>=3.422.0'
AWS = require(`../../../../../../versions/${bedrockRuntimeClientName}@${requireVersion}`).get()
const NodeHttpHandler =
require(`../../../../../../versions/${bedrockRuntimeClientName}@${requireVersion}`)
.get('@smithy/node-http-handler')
require('../../../../../../versions/@aws-sdk/node-http-handler@>=3')
.get()
.NodeHttpHandler

bedrockRuntimeClient = new AWS.BedrockRuntimeClient(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,16 @@ describe('integrations', () => {
before(() => {
const { VertexAI } = require(`../../../../../../versions/@google-cloud/vertexai@${version}`).get()

// stub credentials checking
const { GoogleAuth } = require(`../../../../../../versions/@google-cloud/vertexai@${version}`)
.get('google-auth-library/build/src/auth/googleauth')
authStub = sinon.stub(GoogleAuth.prototype, 'getAccessToken').resolves({})
class TestVertexAI extends VertexAI {
constructor (...args) {
super(...args)

const client = new VertexAI({
// stub credentials checking
authStub = sinon.stub(this.googleAuth.constructor.prototype, 'getAccessToken').resolves({})
}
}

const client = new TestVertexAI({
project: 'datadog-sandbox',
location: 'us-central1'
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ describe('integrations', () => {
withVersions('langchain', ['@langchain/core'], (version, _, realVersion) => {
describe('langchain', () => {
beforeEach(() => {
langchainOpenai = require(`../../../../../../versions/langchain@${version}`)
.get('@langchain/openai')
langchainOpenai = require('../../../../../../versions/@langchain/[email protected]').get()
langchainAnthropic = require(`../../../../../../versions/@langchain/anthropic@${version}`).get()
langchainCohere = require(`../../../../../../versions/@langchain/cohere@${version}`).get()

Expand Down
13 changes: 9 additions & 4 deletions packages/dd-trace/test/plugins/externals.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
],
"google-cloud-pubsub": [
{
"name": "google-gax",
"versions": ["3.5.7"]
"name": "@grpc/grpc-js",
"dep": "1.3.8"
}
],
"graphql": [
Expand Down Expand Up @@ -344,6 +344,10 @@
"name": "@langchain/cohere",
"versions": [">=0.1"]
},
{
"name": "@langchain/openai",
"versions": [">=0.1"]
},
{
"name": "langchain",
"versions": [">=0.1"]
Expand Down Expand Up @@ -388,7 +392,7 @@
"moleculer": [
{
"name": "bluebird",
"versions": ["3.7.2"]
"dep": "3.7.2"
}
],
"mongodb-core": [
Expand Down Expand Up @@ -494,7 +498,7 @@
"versions": ["8.0.0"]
}
],
"@prisma/client": [
"prisma": [
{
"name": "prisma",
"dep": "@prisma/client"
Expand All @@ -503,6 +507,7 @@
"q": [
{
"name": "collections",
"dep": "5",
"versions": ["5"]
},
{
Expand Down
Loading
Loading