Skip to content

feat(openai): support openai v5 #5816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

feat(openai): support openai v5 #5816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
60f92e4
rewrite tests with mock server instead of nock
sabrenner Jun 3, 2025
38df4b1
remove nock entirely from tracing tests
sabrenner Jun 3, 2025
4d5fb0c
delete test as soon to be legacy
sabrenner Jun 3, 2025
84ffd90
add error for completions endpoint
sabrenner Jun 3, 2025
ebea545
working llmobs openai v4
sabrenner Jun 3, 2025
f432876
openai v3 tests llmobs
sabrenner Jun 3, 2025
90fe363
remove nock
sabrenner Jun 3, 2025
d90cb85
Merge branch 'master' into sabrenner/change-openai-mocks
sabrenner Jun 4, 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
32 changes: 30 additions & 2 deletions packages/datadog-instrumentations/src/openai.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,21 @@ const V4_PACKAGE_SHIMS = [
file: 'resources/files',
targetClass: 'Files',
baseResource: 'files',
methods: ['create', 'del', 'list', 'retrieve']
methods: ['create', 'list', 'retrieve']
},
{
file: 'resources/files',
targetClass: 'Files',
baseResource: 'files',
methods: ['del'],
versions: ['>=4.0.0 <5.0.0']
},
{
file: 'resources/files',
targetClass: 'Files',
baseResource: 'files',
methods: ['delete'],
versions: ['>=5']
},
{
file: 'resources/files',
Expand Down Expand Up @@ -78,7 +92,21 @@ const V4_PACKAGE_SHIMS = [
file: 'resources/models',
targetClass: 'Models',
baseResource: 'models',
methods: ['del', 'list', 'retrieve']
methods: ['list', 'retrieve']
},
{
file: 'resources/models',
targetClass: 'Models',
baseResource: 'models',
methods: ['del'],
versions: ['>=4 <5']
},
{
file: 'resources/models',
targetClass: 'Models',
baseResource: 'models',
methods: ['delete'],
versions: ['>=5']
},
{
file: 'resources/moderations',
Expand Down
4 changes: 4 additions & 0 deletions packages/datadog-plugin-openai/src/tracing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ function normalizeMethodName (methodName) {
case 'files.retrieve':
return 'retrieveFile'
case 'files.del':
case 'files.delete':
return 'deleteFile'
case 'files.retrieveContent':
case 'files.content':
Expand Down Expand Up @@ -410,6 +411,7 @@ function normalizeMethodName (methodName) {
case 'models.retrieve':
return 'retrieveModel'
case 'models.del':
case 'models.delete':
return 'deleteModel'
default:
return methodName
Expand Down Expand Up @@ -954,6 +956,7 @@ function normalizeRequestPayload (methodName, args) {

case 'deleteFile':
case 'files.del':
case 'files.delete':
case 'retrieveFile':
case 'files.retrieve':
case 'downloadFile':
Expand All @@ -974,6 +977,7 @@ function normalizeRequestPayload (methodName, args) {
case 'fine-tune.retrieve':
case 'deleteModel':
case 'models.del':
case 'models.delete':
case 'cancelFineTune':
case 'fine_tuning.jobs.cancel':
case 'fine-tune.cancel':
Expand Down
Loading