Skip to content

Commit ddfadc2

Browse files
authored
[opampsupervisor] avoid nil pointer access when reporting remote config status (open-telemetry#36849)
#### Description When working on an unrelated PR I noticed that one of the opamp supervisor e2e tests was randomly failing, due to a nil pointer access - see https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/12350739300/job/34464544343?pr=36844#step:8:647 This PR avoids this by using the `GetConfigHash()` method of the `remoteConfig` instead of directly accessing the `ConfigHash` property. #### Link to tracking issue Fixes open-telemetry#36850 --------- Signed-off-by: Florian Bacher <[email protected]>
1 parent 1f10e2d commit ddfadc2

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: opampsupervisor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: avoid nil pointer access when reporting the last received remote config
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [ 36850 ]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

cmd/opampsupervisor/supervisor/supervisor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ func (s *Supervisor) saveLastReceivedOwnTelemetrySettings(set *protobufs.Telemet
12431243

12441244
func (s *Supervisor) reportConfigStatus(status protobufs.RemoteConfigStatuses, errorMessage string) {
12451245
err := s.opampClient.SetRemoteConfigStatus(&protobufs.RemoteConfigStatus{
1246-
LastRemoteConfigHash: s.remoteConfig.ConfigHash,
1246+
LastRemoteConfigHash: s.remoteConfig.GetConfigHash(),
12471247
Status: status,
12481248
ErrorMessage: errorMessage,
12491249
})

0 commit comments

Comments
 (0)