Skip to content

Commit 2d15b92

Browse files
committed
[receiver/kafkametrics] Fix the issue with incorrect cluster admin initialization in consumer scraper
1 parent 7e3d003 commit 2d15b92

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
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: kafkametricsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix incorrect cluster admin initialization in consumer scraper
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: [36818]
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: []

receiver/kafkametricsreceiver/consumer_scraper.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,18 @@ func (s *consumerScraper) scrape(context.Context) (pmetric.Metrics, error) {
4949
if err != nil {
5050
return pmetric.Metrics{}, fmt.Errorf("failed to create client in consumer scraper: %w", err)
5151
}
52-
clusterAdmin, err := newClusterAdmin(s.config.Brokers, s.saramaConfig)
52+
s.client = client
53+
}
54+
55+
if s.clusterAdmin == nil {
56+
admin, err := newClusterAdmin(s.config.Brokers, s.saramaConfig)
5357
if err != nil {
54-
if client != nil {
55-
_ = client.Close()
58+
if s.client != nil {
59+
_ = s.client.Close()
5660
}
5761
return pmetric.Metrics{}, fmt.Errorf("failed to create cluster admin in consumer scraper: %w", err)
5862
}
59-
s.client = client
60-
s.clusterAdmin = clusterAdmin
63+
s.clusterAdmin = admin
6164
}
6265

6366
cgs, listErr := s.clusterAdmin.ListConsumerGroups()

0 commit comments

Comments
 (0)