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: Fixed instrumenting the same module installed in different locations #2104

Merged
merged 6 commits into from
Apr 3, 2024

Conversation

jsumners-nr
Copy link
Contributor

@jsumners-nr jsumners-nr commented Apr 1, 2024

This PR resolves #2033.

Before we can merge this PR, we need to:

@bizob2828 bizob2828 self-assigned this Apr 1, 2024
@bizob2828 bizob2828 changed the title chore: Implemented instrumenting the same module installed in different locations fix: Fixed instrumenting the same module installed in different locations Apr 1, 2024
Copy link
Member

@bizob2828 bizob2828 left a comment

Choose a reason for hiding this comment

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

A few comments but hard to see the state of this atm because there's a merge conflict. I'll continue review after that is addressed

jsdoc-conf.jsonc Show resolved Hide resolved
lib/shimmer.js Outdated Show resolved Hide resolved
lib/shimmer.js Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
test/integration/agent/reinstrument.tap.js Outdated Show resolved Hide resolved
lib/shimmer.js Outdated Show resolved Hide resolved
test/versioned-external/external-repos.js Outdated Show resolved Hide resolved
@jsumners-nr jsumners-nr marked this pull request as draft April 2, 2024 19:23
@jsumners-nr jsumners-nr force-pushed the issue-2033 branch 3 times, most recently from 6eba1b8 to 94272c8 Compare April 2, 2024 19:35
@bizob2828 bizob2828 marked this pull request as ready for review April 2, 2024 19:40
Copy link

codecov bot commented Apr 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.19%. Comparing base (158c295) to head (78e384c).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2104      +/-   ##
==========================================
- Coverage   97.20%   97.19%   -0.01%     
==========================================
  Files         251      250       -1     
  Lines       42317    42317              
==========================================
- Hits        41133    41132       -1     
- Misses       1184     1185       +1     
Flag Coverage Δ
integration-tests-16.x 78.54% <95.18%> (+0.24%) ⬆️
integration-tests-18.x 78.52% <95.18%> (+0.24%) ⬆️
integration-tests-20.x 78.54% <95.18%> (+0.25%) ⬆️
unit-tests-16.x 90.44% <99.39%> (ø)
unit-tests-18.x 90.35% <99.39%> (ø)
unit-tests-20.x 90.35% <99.39%> (ø)
versioned-tests-16.x 74.67% <90.36%> (+0.16%) ⬆️
versioned-tests-18.x 75.77% <90.36%> (+0.15%) ⬆️
versioned-tests-20.x 75.78% <90.36%> (+0.15%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Copy link
Member

@bizob2828 bizob2828 left a comment

Choose a reason for hiding this comment

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

Great work. I know this was one was a tough one. Great job abstacting away the tracking and registration of instrumentation. I verified the new test proves the intent of this PR. I also ran the versioned tests with security agent. Lastly, compare coverage of unit and integration tests between this and main to ensure we didn't lose test coverage 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Restore ability to instrument the same module but in different folder locations
2 participants