Bump github.com/prometheus/common from 0.10.0 to 0.29.0 (linkerd#6327)

* Bump github.com/prometheus/common from 0.10.0 to 0.29.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.10.0 to 0.29.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.10.0...v0.29.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Leong <alex@buoyant.io> Co-authored-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
mackjmr · Jun 22, 2021 · a3c21d7 · a3c21d7
1 parent 917b22c
commit a3c21d7
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -29,16 +29,16 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15
 	github.com/prometheus/client_golang v1.11.0
-	github.com/prometheus/common v0.26.0
+	github.com/prometheus/common v0.29.0
 	github.com/sergi/go-diff v1.2.0
 	github.com/servicemeshinterface/smi-sdk-go v0.5.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	go.opencensus.io v0.22.3
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	go.opencensus.io v0.22.4
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
 	golang.org/x/tools v0.1.3
 	google.golang.org/grpc v1.38.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0

diff --git a/go.sum b/go.sum
diff --git a/jaeger/injector/mutator/webhook.go b/jaeger/injector/mutator/webhook.go
@@ -11,7 +11,7 @@ import (
 	"github.com/linkerd/linkerd2/controller/webhook"
 	"github.com/linkerd/linkerd2/jaeger/pkg/labels"
 	l5dLabels "github.com/linkerd/linkerd2/pkg/k8s"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"

diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/linkerd/linkerd2/pkg/k8s"
 	"github.com/linkerd/linkerd2/pkg/k8s/resource"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/util/parsing.go b/pkg/util/parsing.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/linkerd/linkerd2-proxy-init/ports"
 	"github.com/linkerd/linkerd2/controller/gen/config"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/viz/tap/api/sever.go b/viz/tap/api/sever.go
@@ -16,8 +16,8 @@ import (
 	"github.com/linkerd/linkerd2/pkg/prometheus"
 	pkgTls "github.com/linkerd/linkerd2/pkg/tls"
 	pb "github.com/linkerd/linkerd2/viz/tap/gen/tap"
-	"github.com/prometheus/common/log"
 	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/viz/tap/injector/webhook.go b/viz/tap/injector/webhook.go
@@ -9,7 +9,7 @@ import (
 	"github.com/linkerd/linkerd2/controller/k8s"
 	"github.com/linkerd/linkerd2/controller/webhook"
 	vizLabels "github.com/linkerd/linkerd2/viz/pkg/labels"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"