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

Supprt TLS insecure skip verify for tempo #276

Merged
merged 6 commits into from
Dec 7, 2020

Conversation

bombsimon
Copy link
Contributor

@bombsimon bombsimon commented Dec 7, 2020

PR Description

This adds support to have the Tempo Open Telemetry exporter use insecure skip verify for TLS. This was added in opentelemetry-collector v0.16.0 so this PR also updates the dependency.

Which issue(s) this PR fixes

Closes #257
Closes #272

Notes to the Reviewer

Since we had breaking changes in the opentelemetry-collector, a small change has been made to pkg/tempo/promsdprocessor/prom_sd_processor.go since the resource no longer has a IsNil() method.

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

This will bump the opentelemetry-collector to v.0.16.0 which now
supports insecure_skip_verify for TLS. This can be configured under the
push_config to be passed to the otel collector.
@CLAassistant
Copy link

CLAassistant commented Dec 7, 2020

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for working on this! I'll merge as soon as this goes green with my docs changes.

I'm planning on a release this week (probably Thursday or Friday) that will include this.

@rfratto rfratto merged commit 01df1d6 into grafana:master Dec 7, 2020
@bombsimon
Copy link
Contributor Author

Awesome! Thanks for the suuuper quick turnaround! 🎉

@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
* Add support to skip TLS verification for Tempo exporter

This will bump the opentelemetry-collector to v.0.16.0 which now
supports insecure_skip_verify for TLS. This can be configured under the
push_config to be passed to the otel collector.

* Run go mod tidy to fix go.mod/go.sum

* Vendor dependencies after update go.mod

* Document Opentemetry-collector bump in CHANGELOG

* docs: Add insecure_skip_verify to tempo_config section

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 22, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update go.opentelemetry.io/collector to v0.16.0 Support insecure skip verify for Tempo
3 participants