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

Merge 2.x to master #225

Closed
wants to merge 48 commits into from
Closed

Merge 2.x to master #225

wants to merge 48 commits into from

Conversation

willarmiros
Copy link
Contributor

Issue #, if available:
#157

Description of changes:
This PR will merge all changes made in the 2.x branch since its creation into master. Following this, master should be up-to-date with the latest changes to the SDK. I'll note any important merge conflicts that I have to make below, since those will be the only changes not already reviewed in this PR.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

willarmiros and others added 30 commits August 27, 2019 16:27
Set up to publish from the 2.x branch
chore: prepares 2.3.5 release
refactor: remove lodash from runtime dependencies
Changed all instances of cls.getNamespace to contextUtils.getNamespace
Resolve critical dependency warning when bundling XRay SDK with webpack
This addresses issue #142. While that issue points to other open handles, `segment_emitter` is currently opening a udp handle as soon as it's required in a file.

This initializes the socket only on first send which should prevent the false positive errors mentioned in #142.
Lazily create socket in SegmentEmitter (2.x)
@willarmiros
Copy link
Contributor Author

Closing in favor of #226 to preserve the state of aws:2.x branch.

@willarmiros willarmiros closed this Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants