Skip to content

Migrate from klog v1 to klog/v2 and honor stderrthreshold #309

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

Open
pierluigilenoci wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate from klog v1 to klog/v2 and honor stderrthreshold #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/AliyunContainerService/kube-eventer/manager"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/aws/aws-sdk-go/aws/session"
awsauth "github.com/smartystreets/go-aws-auth"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// AWSSigningTransport used to sign outgoing requests to AWS ES
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/elastic2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package elasticsearch

import (
"fmt"
"k8s.io/klog"
"k8s.io/klog/v2"
"time"

"github.com/pborman/uuid"
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/elastic5.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package elasticsearch
import (
"context"
"fmt"
"k8s.io/klog"
"k8s.io/klog/v2"
"time"

"github.com/pborman/uuid"
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/elastic6.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package elasticsearch
import (
"context"
"fmt"
"k8s.io/klog"
"k8s.io/klog/v2"
"time"

"github.com/pborman/uuid"
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/elastic7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package elasticsearch
import (
"context"
"fmt"
"k8s.io/klog"
"k8s.io/klog/v2"
"time"

elastic7 "github.com/olivere/elastic/v7"
Expand Down
2 changes: 1 addition & 1 deletion common/elasticsearch/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strconv"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion common/filters/generic_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"

v1 "k8s.io/api/core/v1"
log "k8s.io/klog"
log "k8s.io/klog/v2"
)

type GenericFilter struct {
Expand Down
2 changes: 1 addition & 1 deletion common/honeycomb/honeycomb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"path"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
)

type config struct {
Expand Down
2 changes: 1 addition & 1 deletion common/kafka/glogadapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package kafka
//
// * https://github.com/Shopify/sarama/blob/master/sarama.go

import "k8s.io/klog"
import "k8s.io/klog/v2"

type GologAdapterLogger struct {
}
Expand Down
2 changes: 1 addition & 1 deletion common/kafka/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"time"

kafka "github.com/Shopify/sarama"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion common/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"database/sql"
"fmt"
_ "github.com/go-sql-driver/mysql"
"k8s.io/klog"
"k8s.io/klog/v2"
"net/url"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion common/riemann/riemann.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/riemann/riemann-go-client"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// Used to store the Riemann configuration specified in the Heapster cli
Expand Down
4 changes: 3 additions & 1 deletion eventer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/sinks"
"github.com/AliyunContainerService/kube-eventer/sources"
"github.com/AliyunContainerService/kube-eventer/version"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand All @@ -51,6 +51,8 @@ func main() {
quitChannel := make(chan struct{}, 0)

klog.InitFlags(nil)
_ = flag.Set("legacy_stderr_threshold_behavior", "false")
_ = flag.Set("stderrthreshold", "INFO")
defer klog.Flush()

flag.Var(&argSources, "source", "source(s) to read events from")
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
k8s.io/api v0.17.16
k8s.io/apimachinery v0.17.16
k8s.io/client-go v0.17.16
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.140.0
)

require (
Expand All @@ -45,6 +45,7 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
Expand Down Expand Up @@ -89,6 +90,7 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
Expand Down Expand Up @@ -729,6 +731,8 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
Expand Down
2 changes: 1 addition & 1 deletion manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/AliyunContainerService/kube-eventer/core"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion sinks/dingtalk/dingtalk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/AliyunContainerService/kube-eventer/core"
"k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sinks/elasticsearch/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/metrics/core"
"github.com/prometheus/client_golang/prometheus"
kube_api "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sinks/eventbridge/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/google/uuid"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/klog"
"k8s.io/klog/v2"
"math"
"net/url"
"os"
Expand Down
2 changes: 1 addition & 1 deletion sinks/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/sinks/sls"
"github.com/AliyunContainerService/kube-eventer/sinks/webhook"
"github.com/AliyunContainerService/kube-eventer/sinks/wechat"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type SinkFactory struct {
Expand Down
2 changes: 1 addition & 1 deletion sinks/honeycomb/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"net/url"
"sync"

"k8s.io/klog"
"k8s.io/klog/v2"

honeycomb_common "github.com/AliyunContainerService/kube-eventer/common/honeycomb"
event_core "github.com/AliyunContainerService/kube-eventer/core"
Expand Down
2 changes: 1 addition & 1 deletion sinks/influxdb/influxdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
metrics_core "github.com/AliyunContainerService/kube-eventer/metrics/core"
influxdb "github.com/influxdata/influxdb/client"
kube_api "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type influxdbSink struct {
Expand Down
2 changes: 1 addition & 1 deletion sinks/kafka/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"

kafka_common "github.com/AliyunContainerService/kube-eventer/common/kafka"
event_core "github.com/AliyunContainerService/kube-eventer/core"
Expand Down
2 changes: 1 addition & 1 deletion sinks/log/log_sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/util"

"github.com/AliyunContainerService/kube-eventer/core"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type LogSink struct {
Expand Down
2 changes: 1 addition & 1 deletion sinks/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/AliyunContainerService/kube-eventer/core"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sinks/mongo/mongo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
kube_api "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
"net/url"
"sync"
"time"
Expand Down
2 changes: 1 addition & 1 deletion sinks/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/core"
"github.com/AliyunContainerService/kube-eventer/util"
kube_api "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
"net/url"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion sinks/riemann/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/core"
"github.com/riemann/riemann-go-client"
kube_api "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// contains the riemann client, the riemann configuration, and a RWMutex
Expand Down
2 changes: 1 addition & 1 deletion sinks/sls/sls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
sls "github.com/aliyun/aliyun-log-go-sdk"
sls_producer "github.com/aliyun/aliyun-log-go-sdk/producer"
v1 "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sinks/utils/aliyun_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"errors"
"github.com/AliyunContainerService/ack-ram-tool/pkg/ecsmetadata"
"io/ioutil"
"k8s.io/klog"
"k8s.io/klog/v2"
"os"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion sinks/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/core"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sinks/wechat/wechat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/AliyunContainerService/kube-eventer/core"
"k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sources/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/AliyunContainerService/kube-eventer/common/flags"
"github.com/AliyunContainerService/kube-eventer/core"
kube "github.com/AliyunContainerService/kube-eventer/sources/kubernetes"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type SourceFactory struct {
Expand Down
2 changes: 1 addition & 1 deletion sources/kubernetes/kubernetes_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
kubewatch "k8s.io/apimachinery/pkg/watch"

kubev1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
26 changes: 26 additions & 0 deletions vendor/github.com/go-logr/logr/.golangci.yaml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions vendor/github.com/go-logr/logr/CHANGELOG.md
View file
Open in desktop

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

Loading