Skip to content

Commit

Permalink
[cmd/opampsupervisor] Use nop components during bootstrapping (open-t…
Browse files Browse the repository at this point in the history
…elemetry#32554)

**Description:** <Describe what has changed.>
Switch the Supervisor's bootstrap config to use nopreceiver and
nopexporter

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

---------

Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
  • Loading branch information
dmolenda-sumo and evan-bradley authored Apr 23, 2024
1 parent ce71dc3 commit 52f08dc
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 14 deletions.
27 changes: 27 additions & 0 deletions .chloggen/nop-coponents-during-bootstrapping.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: cmd/opampsupervisor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Switch the OpAMP Supervisor's bootstrap config to use the nopreceiver and nopexporter

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [32455]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
6 changes: 0 additions & 6 deletions cmd/opampsupervisor/supervisor/supervisor.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,6 @@ func (s *Supervisor) loadConfig(configFile string) error {
}

func (s *Supervisor) getBootstrapInfo() (err error) {
port, err := s.findRandomPort()
if err != nil {
return err
}

supervisorPort, err := s.findRandomPort()
if err != nil {
return err
Expand All @@ -232,7 +227,6 @@ func (s *Supervisor) getBootstrapInfo() (err error) {
var cfg bytes.Buffer

err = s.bootstrapTemplate.Execute(&cfg, map[string]any{
"EndpointPort": port,
"InstanceUid": s.instanceID.String(),
"SupervisorPort": supervisorPort,
})
Expand Down
12 changes: 4 additions & 8 deletions cmd/opampsupervisor/supervisor/templates/bootstrap.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
receivers:
otlp:
protocols:
http:
endpoint: "localhost:{{.EndpointPort}}"
nop:
exporters:
debug:
verbosity: basic
nop:

extensions:
opamp:
Expand All @@ -19,6 +15,6 @@ extensions:
service:
pipelines:
traces:
receivers: [otlp]
exporters: [debug]
receivers: [nop]
exporters: [nop]
extensions: [opamp]

0 comments on commit 52f08dc

Please sign in to comment.