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

Implement ApplyConfig for Tempo #424

Merged
merged 4 commits into from
Feb 22, 2021
Merged

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 22, 2021

PR Description

This PR adds an ApplyConfig field for applying a new config to the Tempo subsystem. This isn't hooked into anything for now, but will be used as part of #147.

It works by checking to see if a Tempo instance config has changed, and replacing the OpenTelemetry-collector instance if it has. Instances that have been removed from the updated config will be shut down.

Which issue(s) this PR fixes

Related to #147, but doesn't implement it fully.

Notes to the Reviewer

Related to #416 which did the same for Loki.

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

i.logger.Info(fmt.Sprintf("shutting down %s", dep.name))
if err := dep.shutdown(); err != nil {
i.logger.Error(fmt.Sprintf("failed to shutdown %s", dep.name), zap.Error(err))
}
}
Copy link
Member Author

Choose a reason for hiding this comment

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

@joe-elliott heads up: you were shutting down receivers twice, but I think you meant to shutdown the exporter here instead.

@rfratto rfratto merged commit c281b05 into grafana:main Feb 22, 2021
@rfratto rfratto deleted the tempo-applyconfig branch February 22, 2021 21:52
@rfratto rfratto mentioned this pull request Feb 26, 2021
3 tasks
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
* implement ApplyConfig for tempo

* add integration tests, fix bugs in ApplyConfig from testing

* i before e except after c

* fix test failure
@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 17, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 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.

2 participants