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

A rebase from the latest master onto our skyman/master branch #381

Merged
merged 13 commits into from
Jan 14, 2021

Conversation

pcwiese
Copy link
Owner

@pcwiese pcwiese commented Jan 14, 2021

Description:
A rebase from master

dependabot bot and others added 13 commits January 12, 2021 14:01
)

Bumps [cloud.google.com/go](https://github.com/googleapis/google-cloud-go) from 0.67.0 to 0.75.0.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/master/CHANGES.md)
- [Commits](googleapis/google-cloud-go@v0.67.0...v0.75.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* [exporter/datadog]: sanitize service names

* [exporter/datadog]: add more test cases and simplify translation logic

* [exporter/datadog] add more tests

* [datadog/exporter]: linting in tests
* add more metadata to awsecscontainer receiver

* use the image.tag instead of image.version for the key value
* Add example showing how to use the Prometheus federation endpoint with prometheus_simple

* add copyright header to the file
Some instrumentation libraries are sending an RPC server span with both RPC and HTTP semantic attributes present (dotnet). In these cases we should favor the RPC attributes when figuring the  Span type.
@pcwiese pcwiese requested a review from vangarp January 14, 2021 05:59
@pcwiese pcwiese merged commit 2362594 into skyman/master Jan 14, 2021
@pcwiese pcwiese deleted the pwiese/rebase-with-master branch May 12, 2021 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
9 participants