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 otlp collector examples #841

Merged
merged 15 commits into from
Jun 23, 2020
Merged

Merge otlp collector examples #841

merged 15 commits into from
Jun 23, 2020

Conversation

wtong98
Copy link

@wtong98 wtong98 commented Jun 18, 2020

For issue #795

This PR merges the OTLP example with the otel-collector example, adding a Prometheus backend to handle metrics.

Copy link
Contributor

@MrAlias MrAlias left a comment

Choose a reason for hiding this comment

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

This looks great, thanks for the help!

example/otel-collector/README.md Outdated Show resolved Hide resolved
example/otel-collector/main.go Outdated Show resolved Hide resolved
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@MrAlias
Copy link
Contributor

MrAlias commented Jun 22, 2020

@wtong98 can you merge master into this and fix the impending conflict? I think this is ready to merge once that is done.

@wtong98
Copy link
Author

wtong98 commented Jun 23, 2020

@MrAlias All set! Thanks for taking a look!

@MrAlias MrAlias merged commit 526b815 into open-telemetry:master Jun 23, 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