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

Always log inject service, version, and env #2696

Merged
merged 1 commit into from Jan 17, 2023

Conversation

Qard
Copy link
Collaborator

@Qard Qard commented Jan 16, 2023

Fixes #2688

What does this PR do?

Makes log injection always run, even if there is no active span.

Motivation

A user may still want to correlate logs to a given service, even if there was no active span at the time. To do this, it is necessary to always include the service, version, and env data even when there is no active span.

@Qard Qard added bug Something isn't working semver-patch labels Jan 16, 2023
@Qard Qard requested a review from a team as a code owner January 16, 2023 19:04
@github-actions
Copy link

github-actions bot commented Jan 16, 2023

Overall package size

Self size: 3.54 MB
Deduped: 57.04 MB
No deduping: 63.64 MB

Dependency sizes

name version self size total size
@datadog/pprof 1.1.1 10.9 MB 17.75 MB
@datadog/native-iast-taint-tracking 1.1.0 13.38 MB 13.39 MB
@datadog/native-appsec 2.0.0 12.33 MB 12.34 MB
@datadog/native-metrics 1.5.0 7.1 MB 7.11 MB
protobufjs 7.1.2 2.76 MB 6.55 MB
@datadog/native-iast-rewriter 1.1.2 2.06 MB 2.08 MB
opentracing 0.14.7 194.81 kB 194.81 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
semver 5.7.1 61.58 kB 61.58 kB
ipaddr.js 2.0.1 59.52 kB 59.52 kB
ignore 5.2.0 48.87 kB 48.87 kB
import-in-the-middle 1.3.4 32.7 kB 37.17 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
retry 0.10.1 27.44 kB 27.44 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
limiter 1.1.5 23.17 kB 23.17 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
node-abort-controller 3.0.1 14.33 kB 14.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
Copy link

codecov bot commented Jan 16, 2023

Codecov Report

Merging #2696 (453d6c3) into master (5341b84) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2696      +/-   ##
==========================================
- Coverage   89.65%   89.64%   -0.01%     
==========================================
  Files         302      302              
  Lines       10505    10531      +26     
  Branches       33       33              
==========================================
+ Hits         9418     9441      +23     
- Misses       1087     1090       +3     
Impacted Files Coverage Δ
packages/dd-trace/src/plugins/log_plugin.js 78.26% <ø> (+57.42%) ⬆️
packages/dd-trace/src/exporters/common/request.js 88.60% <0.00%> (-8.54%) ⬇️
packages/dd-trace/src/config.js 98.61% <0.00%> (ø)
packages/dd-trace/src/priority_sampler.js 100.00% <0.00%> (ø)
packages/datadog-instrumentations/src/mocha.js 0.00% <0.00%> (ø)
...race/src/appsec/iast/taint-tracking/csi-methods.js 100.00% <0.00%> (ø)
packages/dd-trace/src/format.js 99.00% <0.00%> (+<0.01%) ⬆️
.../appsec/iast/taint-tracking/taint-tracking-impl.js 95.34% <0.00%> (+0.75%) ⬆️

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

@pr-commenter
Copy link

pr-commenter bot commented Jan 16, 2023

Benchmarks

Comparing candidate commit 453d6c3 in PR branch always-log-inject-service-version-env with baseline commit 5341b84 in branch master.

Found 3 performance improvements and 1 performance regressions! Performance is the same for 962 cases.

scenario:plugin-http-server-with-tracer-14

  • 🟩 cpu_usage_percentage [-1.677%; -1.026%]
  • 🟥 execution_time [+21.564ms; +36.411ms] or [+2.549%; +4.304%]

scenario:plugin-graphql-with-depth-off-16

  • 🟩 max_rss_usage [-104.453KB; -89.743KB] or [-11.088%; -9.526%]

scenario:plugin-http-server-control-18

  • 🟩 cpu_user_time [-17.066ms; -3.623ms] or [-7.218%; -1.532%]

rochdev
rochdev previously approved these changes Jan 16, 2023
@tlhunter
Copy link
Member

I always found it counterintuitive that logs outside of spans were missing this data.

@selimb
Copy link
Contributor

selimb commented Jan 17, 2023

Thanks for the quick turnaround! 🥳❤️

@Qard Qard merged commit 29fb2f4 into master Jan 17, 2023
@Qard Qard deleted the always-log-inject-service-version-env branch January 18, 2023 03:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working semver-patch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make log injection possible without an active span
5 participants