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] Implement Collector bootstrapping #29848

Merged

Conversation

evan-bradley
Copy link
Contributor

Description:

Utilize the OpAMP extension to get identifying attributes from the Collector.

A few things I want to call out:

  • I moved the Supervisor's various config fragments into separate files that are embedded into the binary. I think this makes them easier to edit. I can also move the changes for the existing fragments to a separate PR if it adds too much to the diff.
  • I opted to use the OTLP receiver instead of the filelog receiver because it is included in both existing upstream distributions and I expect it is slightly more common. Ideally we should look at other approaches to solve this.

Link to tracking Issue:

Resolves #21071

Testing:

Added an integration test.

cmd/opampsupervisor/supervisor/supervisor.go Outdated Show resolved Hide resolved
cmd/opampsupervisor/supervisor/supervisor.go Outdated Show resolved Hide resolved
cmd/opampsupervisor/supervisor/supervisor.go Outdated Show resolved Hide resolved
@evan-bradley evan-bradley force-pushed the supervisor-bootstrapping branch from 3f36c01 to 68a633f Compare December 14, 2023 18:00
@evan-bradley
Copy link
Contributor Author

@atoulme This should be in a good spot, could you please take a look?

Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@evan-bradley
Copy link
Contributor Author

@atoulme Please take a look whenever you have time.

@evan-bradley evan-bradley force-pushed the supervisor-bootstrapping branch from e896ec2 to f283734 Compare January 2, 2024 20:13
@github-actions github-actions bot removed the Stale label Jan 3, 2024
@tigrannajaryan
Copy link
Member

LGTM

@srikanthccv
Copy link
Member

@evan-bradley can we get this merged?

@evan-bradley evan-bradley force-pushed the supervisor-bootstrapping branch from 0278280 to 21ee243 Compare January 12, 2024 18:54
@evan-bradley evan-bradley merged commit cee8ccd into open-telemetry:main Jan 12, 2024
87 checks passed
@github-actions github-actions bot added this to the next release milestone Jan 12, 2024
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Feb 1, 2024
…ry#29848)

**Description:**

Utilize the OpAMP extension to get identifying attributes from the
Collector.

A few things I want to call out:
* I moved the Supervisor's various config fragments into separate files
that are embedded into the binary. I think this makes them easier to
edit. I can also move the changes for the existing fragments to a
separate PR if it adds too much to the diff.
* I opted to use the OTLP receiver instead of the filelog receiver
because it is included in both existing upstream distributions and I
expect it is slightly more common. Ideally we should look at other
approaches to solve this.

**Link to tracking Issue:**

Resolves
open-telemetry#21071

**Testing:**

Added an integration test.

---------

Co-authored-by: Antoine Toulme <[email protected]>
Co-authored-by: Evan Bradley <[email protected]>
MovieStoreGuy pushed a commit that referenced this pull request Apr 9, 2024
**Link to tracking Issue:** <Issue number if applicable>

Part of #21043; based on top of
#29848
to add test

**Testing:** <Describe what testing was performed and which tests were
added.>

Added integration test

---------

Co-authored-by: Evan Bradley <[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.

[cmd/opampsupervisor] Implement Collector bootstrapping
5 participants