Skip to content

Commit

Permalink
[receiver/kafkametrics] Fix the issue with incorrect cluster admin in…
Browse files Browse the repository at this point in the history
…itialization in consumer scraper
  • Loading branch information
yurytaranau committed Dec 13, 2024
1 parent 7e3d003 commit 2d15b92
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 5 deletions.
27 changes: 27 additions & 0 deletions .chloggen/kafkametricsreceiver-cluster-admin-init.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: bug_fix

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix incorrect cluster admin initialization in consumer scraper

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

# (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: []
13 changes: 8 additions & 5 deletions receiver/kafkametricsreceiver/consumer_scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,18 @@ func (s *consumerScraper) scrape(context.Context) (pmetric.Metrics, error) {
if err != nil {
return pmetric.Metrics{}, fmt.Errorf("failed to create client in consumer scraper: %w", err)
}
clusterAdmin, err := newClusterAdmin(s.config.Brokers, s.saramaConfig)
s.client = client
}

if s.clusterAdmin == nil {
admin, err := newClusterAdmin(s.config.Brokers, s.saramaConfig)
if err != nil {
if client != nil {
_ = client.Close()
if s.client != nil {
_ = s.client.Close()
}
return pmetric.Metrics{}, fmt.Errorf("failed to create cluster admin in consumer scraper: %w", err)
}
s.client = client
s.clusterAdmin = clusterAdmin
s.clusterAdmin = admin
}

cgs, listErr := s.clusterAdmin.ListConsumerGroups()
Expand Down

0 comments on commit 2d15b92

Please sign in to comment.