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.

Sign up for GitHub

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

fix: use topic attribute function in manager #614

Merged
merged 3 commits into from
Jan 13, 2025
Merged

fix: use topic attribute function in manager #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bea1521
fix: use topic attribute function in manager
kruskall Jan 10, 2025
0d43fcc
test: add tests for topic attribute func
kruskall Jan 10, 2025
8ff0468
Merge branch 'main' into fix/manager-topic-attr-func
kruskall Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 36 additions & 20 deletions kafka/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,30 @@ func (m *Manager) DeleteTopics(ctx context.Context, topics ...apmqueue.Topic) er
deleteErrors = append(deleteErrors,
fmt.Errorf("failed to delete topic %q: %w", topic, err),
)
attrs := []attribute.KeyValue{
semconv.MessagingSystemKey.String("kafka"),
attribute.String("outcome", "failure"),
attribute.String("topic", topic),
}
if kv := m.cfg.TopicAttributeFunc(topic); kv != (attribute.KeyValue{}) {
attrs = append(attrs, kv)
}
m.deleted.Add(context.Background(), 1, metric.WithAttributeSet(
attribute.NewSet(
semconv.MessagingSystemKey.String("kafka"),
attribute.String("outcome", "failure"),
attribute.String("topic", topic),
),
attribute.NewSet(attrs...),
))
}
continue
}
attrs := []attribute.KeyValue{
semconv.MessagingSystemKey.String("kafka"),
attribute.String("outcome", "success"),
attribute.String("topic", topic),
}
if kv := m.cfg.TopicAttributeFunc(topic); kv != (attribute.KeyValue{}) {
attrs = append(attrs, kv)
}
m.deleted.Add(context.Background(), 1, metric.WithAttributeSet(
attribute.NewSet(
semconv.MessagingSystemKey.String("kafka"),
attribute.String("outcome", "success"),
attribute.String("topic", topic),
),
attribute.NewSet(attrs...),
))
logger.Info("deleted kafka topic")
}
Expand Down Expand Up @@ -284,23 +292,31 @@ func (m *Manager) MonitorConsumerLag(topicConsumers []apmqueue.TopicConsumer) (m
count := memberAssignments[key]
count++
memberAssignments[key] = count
attrs := []attribute.KeyValue{
attribute.String("group", l.Group),
attribute.String("topic", topic),
attribute.Int("partition", int(partition)),
}
if kv := m.cfg.TopicAttributeFunc(topic); kv != (attribute.KeyValue{}) {
attrs = append(attrs, kv)
}
o.ObserveInt64(
consumerGroupLagMetric, lag.Lag,
metric.WithAttributeSet(attribute.NewSet(
attribute.String("group", l.Group),
attribute.String("topic", topic),
attribute.Int("partition", int(partition)),
)),
metric.WithAttributeSet(attribute.NewSet(attrs...)),
)
}
}
for key, count := range memberAssignments {
attrs := []attribute.KeyValue{
attribute.String("group", l.Group),
attribute.String("topic", key.topic),
attribute.String("client_id", key.clientID),
}
if kv := m.cfg.TopicAttributeFunc(key.topic); kv != (attribute.KeyValue{}) {
attrs = append(attrs, kv)
}
o.ObserveInt64(assignmentMetric, count, metric.WithAttributeSet(
attribute.NewSet(
attribute.String("group", l.Group),
attribute.String("topic", key.topic),
attribute.String("client_id", key.clientID),
),
attribute.NewSet(attrs...),
))
}
})
Expand Down
14 changes: 14 additions & 0 deletions kafka/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ func TestManagerDeleteTopics(t *testing.T) {
commonConfig.Logger = zap.New(core)
commonConfig.TracerProvider = tp
commonConfig.MeterProvider = mt.MeterProvider
commonConfig.TopicAttributeFunc = func(topic string) attribute.KeyValue { return attribute.KeyValue{} }
m, err := NewManager(ManagerConfig{CommonConfig: commonConfig})
require.NoError(t, err)
t.Cleanup(func() { m.Close() })
Expand Down Expand Up @@ -180,6 +181,9 @@ func TestManagerMetrics(t *testing.T) {
commonConfig.Logger = zap.New(core)
commonConfig.TracerProvider = tp
commonConfig.MeterProvider = mp
commonConfig.TopicAttributeFunc = func(topic string) attribute.KeyValue {
return attribute.Bool("foo", true)
}
m, err := NewManager(ManagerConfig{CommonConfig: commonConfig})
require.NoError(t, err)
t.Cleanup(func() { m.Close() })
Expand Down Expand Up @@ -459,34 +463,39 @@ func TestManagerMetrics(t *testing.T) {
attribute.String("group", "consumer1"),
attribute.String("topic", "topic1"),
attribute.Int("partition", 1),
attribute.Bool("foo", true),
),
Value: 0, // end offset = 1, committed = 1
}, {
Attributes: attribute.NewSet(
attribute.String("group", "consumer2"),
attribute.String("topic", "topic1"),
attribute.Int("partition", 2),
attribute.Bool("foo", true),
),
Value: 1, // end offset = 2, committed = 1
}, {
Attributes: attribute.NewSet(
attribute.String("group", "consumer2"),
attribute.String("topic", "topic2"),
attribute.Int("partition", 3),
attribute.Bool("foo", true),
),
Value: 2, // end offset = 3, committed = 1
}, {
Attributes: attribute.NewSet(
attribute.String("group", "consumer3"),
attribute.String("topic", "topic3"),
attribute.Int("partition", 4),
attribute.Bool("foo", true),
),
Value: 4, // end offset = 4, nothing committed
}, {
Attributes: attribute.NewSet(
attribute.String("group", "consumer3"),
attribute.String("topic", "mytopic"),
attribute.Int("partition", 1),
attribute.Bool("foo", true),
),
Value: 1, // end offset = 1, nothing committed
}},
Expand All @@ -498,34 +507,39 @@ func TestManagerMetrics(t *testing.T) {
attribute.String("client_id", "client_id"),
attribute.String("group", "consumer1"),
attribute.String("topic", "topic1"),
attribute.Bool("foo", true),
),
Value: 1,
}, {
Attributes: attribute.NewSet(
attribute.String("client_id", "client_id"),
attribute.String("group", "consumer2"),
attribute.String("topic", "topic2"),
attribute.Bool("foo", true),
),
Value: 1,
}, {
Attributes: attribute.NewSet(
attribute.String("client_id", "client_id"),
attribute.String("group", "consumer2"),
attribute.String("topic", "topic1"),
attribute.Bool("foo", true),
),
Value: 1,
}, {
Attributes: attribute.NewSet(
attribute.String("client_id", "client_id"),
attribute.String("group", "consumer3"),
attribute.String("topic", "topic3"),
attribute.Bool("foo", true),
),
Value: 1,
}, {
Attributes: attribute.NewSet(
attribute.String("client_id", "client_id"),
attribute.String("group", "consumer3"),
attribute.String("topic", "mytopic"),
attribute.Bool("foo", true),
),
Value: 1,
}},
Expand Down
Loading