Skip to content

fix errors from object shape of pg query being altered#3603

Merged
rochdev merged 1 commit into
masterfrom
fix-unsafe-pg-descriptor
Sep 12, 2023
Merged

fix errors from object shape of pg query being altered#3603
rochdev merged 1 commit into
masterfrom
fix-unsafe-pg-descriptor

Conversation

@rochdev

@rochdev rochdev commented Aug 31, 2023

Copy link
Copy Markdown
Member

What does this PR do?

Fix errors from object shape of pg query being altered.

Motivation

There were fix attempts in #3212 and #3307 but there were still issues since a new object was returned. The new approach instead attempts to alter the existing object, and if that cannot be done safely, it skips on DSM to avoid potential errors.

@github-actions

Copy link
Copy Markdown
Contributor

Overall package size

Self size: 5.13 MB
Deduped: 59.18 MB
No deduping: 59.34 MB

Dependency sizes

name version self size total size
@datadog/native-iast-taint-tracking 1.5.0 14.86 MB 14.86 MB
@datadog/native-appsec 3.2.0 13.38 MB 13.39 MB
@datadog/pprof 3.2.0 10.8 MB 11.64 MB
protobufjs 7.2.4 2.74 MB 6.52 MB
@datadog/native-iast-rewriter 2.1.3 2.23 MB 2.32 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.4.1 780.32 kB 780.32 kB
import-in-the-middle 1.4.2 41.4 kB 704.79 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
@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
ipaddr.js 2.1.0 60.23 kB 60.23 kB
ignore 5.2.4 51.22 kB 51.22 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
limiter 1.1.5 23.17 kB 23.17 kB
retry 0.13.1 18.85 kB 18.85 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
node-abort-controller 3.1.1 16.89 kB 16.89 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
diagnostics_channel 1.1.0 7.07 kB 7.07 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
methods 1.1.2 5.29 kB 5.29 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

@codecov

codecov Bot commented Aug 31, 2023

Copy link
Copy Markdown

Codecov Report

Merging #3603 (bad6bac) into master (2759038) will not change coverage.
Report is 1 commits behind head on master.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3603   +/-   ##
=======================================
  Coverage   84.43%   84.43%           
=======================================
  Files         218      218           
  Lines        8880     8880           
  Branches       33       33           
=======================================
  Hits         7498     7498           
  Misses       1382     1382           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@simon-id simon-id left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except:

  • No tests ?
  • I don't see the if that cannot be done safely, it skips on DSM to avoid potential errors. part. Is that just implicit behavior from your changes ?

@rochdev
rochdev merged commit 8cdd69f into master Sep 12, 2023
@rochdev
rochdev deleted the fix-unsafe-pg-descriptor branch September 12, 2023 17:45
@rochdev

rochdev commented Sep 12, 2023

Copy link
Copy Markdown
Member Author

No tests ?

We should always do things safely regardless of tests, as these tests would be very complex to set up.

I don't see the if that cannot be done safely, it skips on DSM to avoid potential errors. part. Is that just implicit behavior from your changes ?

Yes, now it always patches safely or bails regardless of DSM.

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