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

Sync master with upstream master #14

Merged
merged 6 commits into from
Aug 13, 2020
Merged

Conversation

ercl
Copy link

@ercl ercl commented Aug 12, 2020

This PR merges the latest changes from upstream master. It merges in my PR, open-telemetry#210, and keeps the team repo synced up. Additionally, make precommit was run after merging to fix any code formatting issues.

Eric Lee and others added 6 commits August 12, 2020 10:42
* Add addHeaders for adding headers to a HTTP request and TestAddHeaders

* Add buildMessage for creating a compressed protobuf message and tests

* Add buildRequest for creating the HTTP request and TestBuildRequest

* Add sendRequest, TestSendRequest, and test helper function

* Run make precommit

* Change test helper function name, adjust comments, run make precommit
…ion/github.com/Shopify/sarama (#206)

* Bump github.com/Shopify/sarama

Bumps [github.com/Shopify/sarama](https://github.com/Shopify/sarama) from 1.26.4 to 1.27.0.
- [Release notes](https://github.com/Shopify/sarama/releases)
- [Changelog](https://github.com/Shopify/sarama/blob/master/CHANGELOG.md)
- [Commits](IBM/sarama@v1.26.4...v1.27.0)

Signed-off-by: dependabot[bot] <[email protected]>

* Auto-fix go.sum changes in dependent modules

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
#207)

* Bump github.com/aws/aws-sdk-go from 1.34.1 to 1.34.2 in /detectors/aws

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.34.1 to 1.34.2.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-go@v1.34.1...v1.34.2)

Signed-off-by: dependabot[bot] <[email protected]>

* Auto-fix go.sum changes in dependent modules

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
@connorlindsey connorlindsey merged commit affe4a1 into open-o11y:master Aug 13, 2020
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.

2 participants