Skip to content
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.

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

fix(openai): finish span on error #4352

Merged
merged 10 commits into from
May 29, 2024
Merged

Conversation

sabrenner
Copy link
Collaborator

@sabrenner sabrenner commented May 25, 2024

What does this PR do?

Ensures OpenAI spans finish properly on error from the SDK.

Motivation

Previously, spans were not finished if the OpenAI SDK threw an error. They would still tag the error on the span, and send the metrics and logs appropriately for the Datadog OpenAI metrics and logs integration, but would not finish the APM span. This would cause lost spans in the APM UI, and possible memory leaks. Forcing the span to finish on these errors should avoid these issues.

Plugin Checklist

Copy link

github-actions bot commented May 25, 2024

Overall package size

Self size: 6.54 MB
Deduped: 61.79 MB
No deduping: 62.07 MB

Dependency sizes

name version self size total size
@datadog/native-appsec 8.0.1 15.59 MB 15.6 MB
@datadog/native-iast-taint-tracking 2.1.0 14.91 MB 14.92 MB
@datadog/pprof 5.3.0 9.85 MB 10.22 MB
protobufjs 7.2.5 2.77 MB 6.56 MB
@datadog/native-iast-rewriter 2.3.1 2.15 MB 2.24 MB
@opentelemetry/core 1.14.0 872.87 kB 1.47 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.8.0 1.21 MB 1.21 MB
import-in-the-middle 1.7.4 70.19 kB 739.86 kB
msgpack-lite 0.1.26 201.16 kB 281.59 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.5.4 93.4 kB 123.8 kB
pprof-format 2.1.0 111.69 kB 111.69 kB
@datadog/sketches-js 2.1.0 109.9 kB 109.9 kB
lodash.sortby 4.7.0 75.76 kB 75.76 kB
lru-cache 7.14.0 74.95 kB 74.95 kB
ignore 5.2.4 51.22 kB 51.22 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
shell-quote 1.8.1 44.96 kB 44.96 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
tlhunter-sorted-set 0.1.0 24.94 kB 24.94 kB
limiter 1.1.5 23.17 kB 23.17 kB
dc-polyfill 0.1.4 23.1 kB 23.1 kB
retry 0.13.1 18.85 kB 18.85 kB
jest-docblock 29.7.0 8.99 kB 12.76 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
module-details-from-path 1.0.3 4.47 kB 4.47 kB

🤖 This report was automatically generated by heaviest-objects-in-the-universe

Copy link

codecov bot commented May 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.46%. Comparing base (8bedb23) to head (d429b1b).
Report is 4 commits behind head on master.

Current head d429b1b differs from pull request most recent head 71fdaa5

Please upload reports for the commit 71fdaa5 to get more accurate results.

Additional details and impacted files
@@             Coverage Diff             @@
##           master    #4352       +/-   ##
===========================================
+ Coverage   18.61%   86.46%   +67.85%     
===========================================
  Files           6      253      +247     
  Lines         736    10968    +10232     
  Branches       33       33               
===========================================
+ Hits          137     9484     +9347     
- Misses        599     1484      +885     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pr-commenter
Copy link

pr-commenter bot commented May 25, 2024

Benchmarks

Benchmark execution time: 2024-05-29 15:19:24

Comparing candidate commit 20e1f2d in PR branch sabrenner/openai-finish-on-error with baseline commit a6e0e37 in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 261 metrics, 5 unstable metrics.

@datadog-datadog-prod-us1
Copy link

Software Composition Analysis

We found vulnerabilities in the following libraries (compared 71fdaa5 against cf8964f):

@sabrenner sabrenner marked this pull request as ready for review May 29, 2024 17:22
@sabrenner sabrenner requested review from a team as code owners May 29, 2024 17:22
@bengl bengl merged commit 55a71ac into master May 29, 2024
115 checks passed
@bengl bengl deleted the sabrenner/openai-finish-on-error branch May 29, 2024 18:00
juan-fernandez pushed a commit that referenced this pull request Jun 4, 2024
* impl

* fix impl + test

* finish on error non-streamed case

* lint

* finish on streamed response error as well

* finish in streamed case
juan-fernandez pushed a commit that referenced this pull request Jun 4, 2024
* impl

* fix impl + test

* finish on error non-streamed case

* lint

* finish on streamed response error as well

* finish in streamed case
juan-fernandez pushed a commit that referenced this pull request Jun 5, 2024
* impl

* fix impl + test

* finish on error non-streamed case

* lint

* finish on streamed response error as well

* finish in streamed case
juan-fernandez pushed a commit that referenced this pull request Jun 5, 2024
* impl

* fix impl + test

* finish on error non-streamed case

* lint

* finish on streamed response error as well

* finish in streamed case
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants