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

[cmd/opampsupervisor] Add config option for setting the timeout for the initial bootstrap information retrieval from the agent #35000

Merged

Conversation

bacherfl
Copy link
Contributor

@bacherfl bacherfl commented Sep 4, 2024

Description: This PR adds a configuration option for setting the timeout for the initial bootstrap information retrieval from the agent.

Link to tracking Issue: #34996

Testing: Added unit tests

Documentation: Added description for the new option in the specification readme

…he initial bootstrap information retrieval from the agent

Signed-off-by: Florian Bacher <[email protected]>
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl bacherfl marked this pull request as ready for review September 5, 2024 10:53
@bacherfl bacherfl requested a review from a team September 5, 2024 10:53
@BinaryFissionGames
Copy link
Contributor

@bacherfl Can you resolve conflicts on this PR? We can ping Dan to merge once those conflicts are resolved.

# Conflicts:
#	cmd/opampsupervisor/supervisor/config/config.go
#	cmd/opampsupervisor/supervisor/config/config_test.go
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl bacherfl requested a review from a team as a code owner September 26, 2024 14:04
@bacherfl
Copy link
Contributor Author

@bacherfl Can you resolve conflicts on this PR? We can ping Dan to merge once those conflicts are resolved.

thanks for the notification @BinaryFissionGames, seems like the merge conflicts went under my radar - they should be fixed now

@BinaryFissionGames
Copy link
Contributor

Sweet, LGTM.

@djaglowski Could you merge this once CI passes?

@djaglowski djaglowski merged commit 4b90b60 into open-telemetry:main Sep 27, 2024
156 checks passed
@github-actions github-actions bot added this to the next release milestone Sep 27, 2024
jriguera pushed a commit to springernature/opentelemetry-collector-contrib that referenced this pull request Oct 4, 2024
…he initial bootstrap information retrieval from the agent (open-telemetry#35000)

**Description:** This PR adds a configuration option for setting the
timeout for the initial bootstrap information retrieval from the agent.

**Link to tracking Issue:** open-telemetry#34996

**Testing:** Added unit tests

**Documentation:** Added description for the new option in the
specification readme

---------

Signed-off-by: Florian Bacher <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants