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

Jump to bottom

Replace github.com/prometheus/common/log with standard libary log #246

Merged
merged 5 commits into from
Sep 7, 2021
Merged

Replace github.com/prometheus/common/log with standard libary log #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3da1186
Replace github.com/prometheus/common/log with standard libary log
mihail-i4v Aug 2, 2021
f58f1c9
go mod vendor
mihail-i4v Aug 2, 2021
a47c954
go mod tidy
mihail-i4v Aug 2, 2021
b2769a0
Set vendor properly
mihail-i4v Aug 2, 2021
c51cc9a
Merge branch 'master' into master
danielqsj Sep 7, 2021
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
15 changes: 12 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,18 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/krallistic/kazoo-go v0.0.0-20170526135507-a15279744f4e
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/common v0.25.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.30.0
github.com/prometheus/procfs v0.7.1 // indirect
github.com/prometheus/promu v0.12.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/xdg/scram v1.0.3
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)
66 changes: 66 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 25 additions & 27 deletions kafka_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
plog "github.com/prometheus/common/log"
"github.com/prometheus/common/version"
"github.com/rcrowley/go-metrics"
"gopkg.in/alecthomas/kingpin.v2"
Expand Down Expand Up @@ -204,7 +203,7 @@ func NewExporter(opts kafkaOpts, topicFilter string, groupFilter string) (*Expor
}

if opts.useZooKeeperLag {
plog.Infoln("Using zookeeper lag, so connecting to zookeeper")
log.Println("Using zookeeper lag, so connecting to zookeeper")
zookeeperClient, err = kazoo.NewKazoo(opts.uriZookeeper, nil)
if err != nil {
return nil, errors.Wrap(err, "error connecting to zookeeper")
Expand All @@ -224,7 +223,7 @@ func NewExporter(opts kafkaOpts, topicFilter string, groupFilter string) (*Expor
return nil, errors.Wrap(err, "Error Init Kafka Client")
}

plog.Infoln("Done Init Clients")
log.Println("Done Init Clients")
// Init our exporter.
return &Exporter{
client: client,
Expand Down Expand Up @@ -269,18 +268,18 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
now := time.Now()

if now.After(e.nextMetadataRefresh) {
plog.Info("Refreshing client metadata")
log.Print("Refreshing client metadata")

if err := e.client.RefreshMetadata(); err != nil {
plog.Errorf("Cannot refresh topics, using cached data: %v", err)
log.Printf("error: Cannot refresh topics, using cached data: %v", err)
}

e.nextMetadataRefresh = now.Add(e.metadataRefreshInterval)
}

topics, err := e.client.Topics()
if err != nil {
plog.Errorf("Cannot get topics: %v", err)
log.Printf("error: Cannot get topics: %v", err)
return
}

Expand All @@ -291,7 +290,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
}
partitions, err := e.client.Partitions(topic)
if err != nil {
plog.Errorf("Cannot get partitions of topic %s: %v", topic, err)
log.Printf("error: Cannot get partitions of topic %s: %v", topic, err)
return
}
ch <- prometheus.MustNewConstMetric(
Expand All @@ -303,7 +302,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
for _, partition := range partitions {
broker, err := e.client.Leader(topic, partition)
if err != nil {
plog.Errorf("Cannot get leader of topic %s partition %d: %v", topic, partition, err)
log.Printf("error: Cannot get leader of topic %s partition %d: %v", topic, partition, err)
} else {
ch <- prometheus.MustNewConstMetric(
topicPartitionLeader, prometheus.GaugeValue, float64(broker.ID()), topic, strconv.FormatInt(int64(partition), 10),
Expand All @@ -312,7 +311,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

currentOffset, err := e.client.GetOffset(topic, partition, sarama.OffsetNewest)
if err != nil {
plog.Errorf("Cannot get current offset of topic %s partition %d: %v", topic, partition, err)
log.Printf("error: Cannot get current offset of topic %s partition %d: %v", topic, partition, err)
} else {
e.mu.Lock()
offset[topic][partition] = currentOffset
Expand All @@ -324,7 +323,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

oldestOffset, err := e.client.GetOffset(topic, partition, sarama.OffsetOldest)
if err != nil {
plog.Errorf("Cannot get oldest offset of topic %s partition %d: %v", topic, partition, err)
log.Printf("error: Cannot get oldest offset of topic %s partition %d: %v", topic, partition, err)
} else {
ch <- prometheus.MustNewConstMetric(
topicOldestOffset, prometheus.GaugeValue, float64(oldestOffset), topic, strconv.FormatInt(int64(partition), 10),
Expand All @@ -333,7 +332,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

replicas, err := e.client.Replicas(topic, partition)
if err != nil {
plog.Errorf("Cannot get replicas of topic %s partition %d: %v", topic, partition, err)
log.Printf("error: Cannot get replicas of topic %s partition %d: %v", topic, partition, err)
} else {
ch <- prometheus.MustNewConstMetric(
topicPartitionReplicas, prometheus.GaugeValue, float64(len(replicas)), topic, strconv.FormatInt(int64(partition), 10),
Expand All @@ -342,7 +341,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

inSyncReplicas, err := e.client.InSyncReplicas(topic, partition)
if err != nil {
plog.Errorf("Cannot get in-sync replicas of topic %s partition %d: %v", topic, partition, err)
log.Printf("error: Cannot get in-sync replicas of topic %s partition %d: %v", topic, partition, err)
} else {
ch <- prometheus.MustNewConstMetric(
topicPartitionInSyncReplicas, prometheus.GaugeValue, float64(len(inSyncReplicas)), topic, strconv.FormatInt(int64(partition), 10),
Expand Down Expand Up @@ -373,7 +372,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
ConsumerGroups, err := e.zookeeperClient.Consumergroups()

if err != nil {
plog.Errorf("Cannot get consumer group %v", err)
log.Printf("error: Cannot get consumer group %v", err)
}

for _, group := range ConsumerGroups {
Expand All @@ -400,14 +399,14 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
getConsumerGroupMetrics := func(broker *sarama.Broker) {
defer wg.Done()
if err := broker.Open(e.client.Config()); err != nil && err != sarama.ErrAlreadyConnected {
plog.Errorf("Cannot connect to broker %d: %v", broker.ID(), err)
log.Printf("error: Cannot connect to broker %d: %v", broker.ID(), err)
return
}
defer broker.Close()

groups, err := broker.ListGroups(&sarama.ListGroupsRequest{})
if err != nil {
plog.Errorf("Cannot get consumer group: %v", err)
log.Printf("error: Cannot get consumer group: %v", err)
return
}
groupIds := make([]string, 0)
Expand All @@ -419,7 +418,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {

describeGroups, err := broker.DescribeGroups(&sarama.DescribeGroupsRequest{Groups: groupIds})
if err != nil {
plog.Errorf("Cannot get describe groups: %v", err)
log.Printf("error: Cannot get describe groups: %v", err)
return
}
for _, group := range describeGroups.Groups {
Expand All @@ -428,7 +427,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
for _, member := range group.Members {
assignment, err := member.GetMemberAssignment()
if err != nil {
plog.Errorf("Cannot get GetMemberAssignment of group member %v : %v", member, err)
log.Printf("Cannot get GetMemberAssignment of group member %v : %v", member, err)
return
}
for topic, partions := range assignment.Topics {
Expand All @@ -450,7 +449,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
)
offsetFetchResponse, err := broker.FetchOffset(&offsetFetchRequest)
if err != nil {
plog.Errorf("Cannot get offset of group %s: %v", group.GroupId, err)
log.Printf("error: Cannot get offset of group %s: %v", group.GroupId, err)
continue
}

Expand All @@ -473,7 +472,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
for partition, offsetFetchResponseBlock := range partitions {
err := offsetFetchResponseBlock.Err
if err != sarama.ErrNoError {
plog.Errorf("Error for partition %d :%v", partition, err.Error())
log.Printf("error: Error for partition %d :%v", partition, err.Error())
continue
}
currentOffset := offsetFetchResponseBlock.Offset
Expand All @@ -496,7 +495,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
consumergroupLag, prometheus.GaugeValue, float64(lag), group.GroupId, topic, strconv.FormatInt(int64(partition), 10),
)
} else {
plog.Errorf("No offset of topic %s partition %d, cannot get consumer group lag", topic, partition)
log.Printf("error: No offset of topic %s partition %d, cannot get consumer group lag", topic, partition)
}
e.mu.Unlock()
}
Expand All @@ -517,7 +516,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
}
wg.Wait()
} else {
plog.Errorln("No valid broker, cannot get consumer group metrics")
log.Printf("error: No valid broker, cannot get consumer group metrics")
}
}

Expand Down Expand Up @@ -558,13 +557,12 @@ func main() {
kingpin.Flag("kafka.labels", "Kafka cluster name").Default("").StringVar(&opts.labels)
kingpin.Flag("refresh.metadata", "Metadata refresh interval").Default("30s").StringVar(&opts.metadataRefreshInterval)

plog.AddFlags(kingpin.CommandLine)
kingpin.Version(version.Print("kafka_exporter"))
kingpin.HelpFlag.Short('h')
kingpin.Parse()

plog.Infoln("Starting kafka_exporter", version.Info())
plog.Infoln("Build context", version.BuildContext())
log.Println("Starting kafka_exporter", version.Info())
log.Println("Build context", version.BuildContext())

labels := make(map[string]string)

Expand Down Expand Up @@ -683,7 +681,7 @@ func setup(

exporter, err := NewExporter(opts, topicFilter, groupFilter)
if err != nil {
plog.Fatalln(err)
log.Fatalln(err)
}
defer exporter.client.Close()
prometheus.MustRegister(exporter)
Expand All @@ -703,6 +701,6 @@ func setup(
w.Write([]byte("ok"))
})

plog.Infoln("Listening on", listenAddress)
plog.Fatal(http.ListenAndServe(listenAddress, nil))
log.Println("Listening on", listenAddress)
log.Fatal(http.ListenAndServe(listenAddress, nil))
}
9 changes: 0 additions & 9 deletions vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions vendor/github.com/konsorten/go-windows-terminal-sequences/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go
View file
Open in desktop

This file was deleted.

39 changes: 3 additions & 36 deletions vendor/github.com/prometheus/client_golang/prometheus/expvar_collector.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading