-
Notifications
You must be signed in to change notification settings - Fork 896
fix(instrumentation): remove dependency on the shimmer module #5652
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
Conversation
@cjihrig thanks for working on this 🙌 Could you rebase the PR? It looks like the PR check updates got lost somewhere on GitHub's infra on the first run, and I can't re run it myself as there's no build linked. |
I think there were already conflicts as soon as I opened the PR, so the CI probably never ran. Those changelog conflicts come at you quickly 😄 |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5652 +/- ##
=======================================
Coverage 95.03% 95.03%
=======================================
Files 310 310
Lines 7998 7998
Branches 1615 1615
=======================================
Hits 7601 7601
Misses 397 397 🚀 New features to boost your workflow:
|
this needs a rebase |
Rebased. PTAL. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Marking as requested for changes to block this PR from getting merged until I've figured out the licensing story.
(there are no actual changes I'm requesting for now - there's just no other way to block PRs on github until some question is resolved. I just need to find out if we might be getting our end-users into legal trouble 😬)
I'm pretty sure we're fulfilling the first clause of BSD-2 clause (the second one one too since we're not redistributing in binary form) so we're in the clear, but it may be difficult to our end-users to follow that license since our package is licensed under Apache 2.0 and they might not be aware of the BSD-2 clause component. 🤔
I'll report back once I know more. I had assumed that this was compatible before, but it seems like the package we already did this with in the past (semver
), was using ISC instead of BSD-2 clause which has different requirements. 😕
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I looked into these guidelines and they unfortunately only allow us to copy unmodified code. 😞 I had previously assumed that BSD-2-clause is compatible and should not cause any more friction than integrating Apache-2.0 code does, but I'd just like to double check this first - sorry for the wait. |
Alright, sorry for the delay, everyone. I just came back from open-telemetry/community#2774 and it looks like since I am not a lawyer I was just confused about some wording. It seems like we're good with the license headers in the file, but according to the guidelines we should also add the original license to a So the way I understand it, we should:
And then we should be good. 🙂 |
@pichlermarc a couple of questions:
Will that work properly on publish? The LICENSES directory you're proposing will be above the
Do you mean the top level README or the one for |
Ah, sorry - yes you're right that won't work. I meant to say that we put the So the And then package's |
This commit removes the dependency on shimmer and @types/shimmer. Instead, the shimmer code is vendored into the instrumentation module. Fixes: open-telemetry#4837
Keep package lock work separate.
That makes more sense, thanks. I've pushed the requested changes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thanks for your patience. :)
Which problem is this PR solving?
This PR vendors the shimmer dependency into the project since the shimmer API is currently part of this project's exposed API.
Fixes #4837
Short description of the changes
This commit removes the dependency on shimmer and @types/shimmer.
Instead, the shimmer code is vendored into the instrumentation
module.
Type of change
How Has This Been Tested?
Checklist: