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:Aws instrumentation patch without S3 #1592

Merged
merged 1 commit into from
Jul 13, 2021
Merged

Fix:Aws instrumentation patch without S3 #1592

merged 1 commit into from
Jul 13, 2021

Conversation

marcotc
Copy link
Member

@marcotc marcotc commented Jul 13, 2021

Fixes #1589

This PR modifies the AWS instrumentation to only augment the Aws::S3 package if present.

This issue was introduced in #1494, when presign S3 requests became excluded from network instrumentation in https://github.com/DataDog/dd-trace-rb/releases/tag/v0.51.0.

@marcotc marcotc added bug Involves a bug integrations Involves tracing integrations labels Jul 13, 2021
@marcotc marcotc self-assigned this Jul 13, 2021
@marcotc marcotc requested a review from a team July 13, 2021 21:17
@marcotc marcotc force-pushed the fix-aws-s3-patch branch 2 times, most recently from b26cd82 to 7854f57 Compare July 13, 2021 22:39
@codecov-commenter
Copy link

Codecov Report

Merging #1592 (7854f57) into master (a54750f) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1592   +/-   ##
=======================================
  Coverage   98.26%   98.26%           
=======================================
  Files         896      896           
  Lines       43010    43037   +27     
=======================================
+ Hits        42263    42291   +28     
+ Misses        747      746    -1     
Impacted Files Coverage Δ
lib/ddtrace/contrib/aws/patcher.rb 96.00% <100.00%> (ø)
spec/ddtrace/contrib/aws/instrumentation_spec.rb 100.00% <100.00%> (ø)
spec/ddtrace/profiling/ext/forking_spec.rb 100.00% <0.00%> (+0.61%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a54750f...7854f57. Read the comment docs.

@marcotc marcotc merged commit 6a4bf40 into master Jul 13, 2021
@marcotc marcotc deleted the fix-aws-s3-patch branch July 13, 2021 23:14
@github-actions github-actions bot added this to the 0.52.0 milestone Jul 13, 2021
@marcotc marcotc modified the milestones: 0.52.0, 0.51.1 Jul 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Involves a bug integrations Involves tracing integrations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to apply Datadog::Contrib::Aws::Patcher patch. Cause: uninitialized constant Aws::S3
3 participants