Update otel to 0.13.0

This updates the dependency to the latest release: 0.13.0

Author: vladdy

cmd/secrets-store-csi-driver/main.go

@@ -79,11 +79,10 @@ func main() {
 	// Issue: https://github.com/open-telemetry/opentelemetry-go/issues/677
 	// this has been resolved in otel release v0.5.0
 	// TODO (aramase) update to latest version of otel and deps
-	m, err := metrics.NewMetricsExporter()
+	err := metrics.InitMetricsExporter()
 	if err != nil {
 		klog.Fatalf("failed to initialize metrics exporter, error: %+v", err)
 	}
-	defer m.Stop()
 
 	config := ctrl.GetConfigOrDie()
 	config.UserAgent = "csi-secrets-store/controller"

go.mod

@@ -6,15 +6,17 @@ require (
 	github.com/blang/semver v3.5.0+incompatible
 	github.com/container-storage-interface/spec v1.0.0
 	github.com/go-logr/logr v0.2.1 // indirect
-	github.com/golang/protobuf v1.4.2
-	github.com/google/go-cmp v0.5.0
+	github.com/golang/protobuf v1.4.3
+	github.com/google/go-cmp v0.5.2
 	github.com/kubernetes-csi/csi-lib-utils v0.6.1
 	github.com/kubernetes-csi/csi-test v1.1.0
 	github.com/onsi/gomega v1.10.1
-	github.com/stretchr/testify v1.5.1
-	go.opentelemetry.io/otel v0.4.3
-	go.opentelemetry.io/otel/exporters/metric/prometheus v0.4.3
+	github.com/prometheus/client_golang v1.8.0 // indirect
+	github.com/stretchr/testify v1.6.1
+	go.opentelemetry.io/otel v0.13.0
+	go.opentelemetry.io/otel/exporters/metric/prometheus v0.13.0
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf // indirect
 	google.golang.org/grpc v1.27.1
 	google.golang.org/protobuf v1.25.0
 	k8s.io/api v0.19.3

go.sum

@@ -18,8 +18,6 @@ import (
 	"fmt"
 	"strings"
 
-	"go.opentelemetry.io/otel/sdk/metric/controller/push"
-
 	"k8s.io/klog/v2"
 )
 
@@ -30,18 +28,14 @@ var (
 
 const prometheusExporter = "prometheus"
 
-func NewMetricsExporter() (m *push.Controller, err error) {
+func InitMetricsExporter() error {
 	mb := strings.ToLower(*metricsBackend)
 	klog.Infof("metrics backend: %s", mb)
 	switch mb {
 	// Prometheus is the only exporter for now
 	case prometheusExporter:
-		m, err = newPrometheusExporter()
+		return initPrometheusExporter()
 	default:
-		err = fmt.Errorf("unsupported metrics backend %v", *metricsBackend)
-	}
-	if err != nil {
-		return nil, err
+		return fmt.Errorf("unsupported metrics backend %v", *metricsBackend)
 	}
-	return m, nil
 }

pkg/metrics/exporter.go

@@ -17,41 +17,25 @@ import (
 	"fmt"
 	"net/http"
 
-	"go.opentelemetry.io/otel/api/core"
 	"go.opentelemetry.io/otel/exporters/metric/prometheus"
-	"go.opentelemetry.io/otel/sdk/metric/controller/push"
 )
 
-func newPrometheusExporter() (*push.Controller, error) {
+func initPrometheusExporter() error {
 	/*
 		Prometheus exporter for opentelemetry is under active development
-		Histogram support was added in v0.4.3 - https://github.com/open-telemetry/opentelemetry-go/pull/601
 		Defining the buckets is due to change in future release - https://github.com/open-telemetry/opentelemetry-go/issues/689
 	*/
-	pusher, hf, err := prometheus.InstallNewPipeline(prometheus.Config{
-		DefaultHistogramBoundaries: []core.Number{
-			core.NewFloat64Number(0.1),
-			core.NewFloat64Number(0.2),
-			core.NewFloat64Number(0.3),
-			core.NewFloat64Number(0.4),
-			core.NewFloat64Number(0.5),
-			core.NewFloat64Number(1),
-			core.NewFloat64Number(1.5),
-			core.NewFloat64Number(2),
-			core.NewFloat64Number(2.5),
-			core.NewFloat64Number(3.0),
-			core.NewFloat64Number(5.0),
-			core.NewFloat64Number(10.0),
-			core.NewFloat64Number(15.0),
-			core.NewFloat64Number(30.0),
+	pusher, err := prometheus.InstallNewPipeline(prometheus.Config{
+		DefaultHistogramBoundaries: []float64{
+			0.1, 0.2, 0.3, 0.4, 0.5, 1, 1.5, 2, 2.5, 3.0, 5.0, 10.0, 15.0, 30.0,
 		}})
 	if err != nil {
-		return nil, err
+		return err
 	}
-	http.HandleFunc("/", hf)
+	http.HandleFunc("/", pusher.ServeHTTP)
 	go func() {
 		_ = http.ListenAndServe(fmt.Sprintf(":%v", *prometheusPort), nil)
 	}()
 
-	return pusher, nil
+	return nil
 }

pkg/metrics/prometheus_exporter.go

@@ -17,10 +17,9 @@ import (
 	"context"
 	"runtime"
 
-	"go.opentelemetry.io/otel/api/core"
 	"go.opentelemetry.io/otel/api/global"
-	"go.opentelemetry.io/otel/api/key"
 	"go.opentelemetry.io/otel/api/metric"
+	"go.opentelemetry.io/otel/label"
 )
 
 var (
@@ -30,7 +29,7 @@ var (
 	rotatedKey                  = "rotated"
 	rotationReconcileTotal      metric.Int64Counter
 	rotationReconcileErrorTotal metric.Int64Counter
-	rotationReconcileDuration   metric.Float64Measure
+	rotationReconcileDuration   metric.Float64ValueRecorder
 	runtimeOS                   = runtime.GOOS
 )
 
@@ -48,20 +47,20 @@ func newStatsReporter() StatsReporter {
 	meter := global.Meter("secretsstore")
 	rotationReconcileTotal = metric.Must(meter).NewInt64Counter("total_rotation_reconcile", metric.WithDescription("Total number of rotation reconciles"))
 	rotationReconcileErrorTotal = metric.Must(meter).NewInt64Counter("total_rotation_reconcile_error", metric.WithDescription("Total number of rotation reconciles with error"))
-	rotationReconcileDuration = metric.Must(meter).NewFloat64Measure("rotation_reconcile_duration_sec", metric.WithDescription("Distribution of how long it took to rotate secrets-store content for pods"))
+	rotationReconcileDuration = metric.Must(meter).NewFloat64ValueRecorder("rotation_reconcile_duration_sec", metric.WithDescription("Distribution of how long it took to rotate secrets-store content for pods"))
 	return &reporter{meter: meter}
 }
 
 func (r *reporter) reportRotationCtMetric(provider string, wasRotated bool) {
-	labels := []core.KeyValue{key.String(providerKey, provider), key.String(osTypeKey, runtimeOS), key.Bool(rotatedKey, wasRotated)}
+	labels := []label.KeyValue{label.String(providerKey, provider), label.String(osTypeKey, runtimeOS), label.Bool(rotatedKey, wasRotated)}
 	rotationReconcileTotal.Add(context.Background(), 1, labels...)
 }
 
 func (r *reporter) reportRotationErrorCtMetric(provider, errType string, wasRotated bool) {
-	labels := []core.KeyValue{key.String(providerKey, provider), key.String(errorKey, errType), key.String(osTypeKey, runtimeOS), key.Bool(rotatedKey, wasRotated)}
+	labels := []label.KeyValue{label.String(providerKey, provider), label.String(errorKey, errType), label.String(osTypeKey, runtimeOS), label.Bool(rotatedKey, wasRotated)}
 	rotationReconcileErrorTotal.Add(context.Background(), 1, labels...)
 }
 
 func (r *reporter) reportRotationDuration(duration float64) {
-	r.meter.RecordBatch(context.Background(), []core.KeyValue{key.String(osTypeKey, runtimeOS)}, rotationReconcileDuration.Measurement(duration))
+	r.meter.RecordBatch(context.Background(), []label.KeyValue{label.String(osTypeKey, runtimeOS)}, rotationReconcileDuration.Measurement(duration))
 }

pkg/rotation/stats_reporter.go

@@ -17,10 +17,9 @@ import (
 	"context"
 	"runtime"
 
-	"go.opentelemetry.io/otel/api/core"
 	"go.opentelemetry.io/otel/api/global"
-	"go.opentelemetry.io/otel/api/key"
 	"go.opentelemetry.io/otel/api/metric"
+	"go.opentelemetry.io/otel/label"
 )
 
 var (
@@ -32,7 +31,7 @@ var (
 	nodePublishErrorTotal   metric.Int64Counter
 	nodeUnPublishErrorTotal metric.Int64Counter
 	syncK8sSecretTotal      metric.Int64Counter
-	syncK8sSecretDuration   metric.Float64Measure
+	syncK8sSecretDuration   metric.Float64ValueRecorder
 	runtimeOS               = runtime.GOOS
 )
 
@@ -56,33 +55,33 @@ func NewStatsReporter() StatsReporter {
 	nodePublishErrorTotal = metric.Must(meter).NewInt64Counter("total_node_publish_error", metric.WithDescription("Total number of node publish calls with error"))
 	nodeUnPublishErrorTotal = metric.Must(meter).NewInt64Counter("total_node_unpublish_error", metric.WithDescription("Total number of node unpublish calls with error"))
 	syncK8sSecretTotal = metric.Must(meter).NewInt64Counter("total_sync_k8s_secret", metric.WithDescription("Total number of k8s secrets synced"))
-	syncK8sSecretDuration = metric.Must(meter).NewFloat64Measure("sync_k8s_secret_duration_sec", metric.WithDescription("Distribution of how long it took to sync k8s secret"))
+	syncK8sSecretDuration = metric.Must(meter).NewFloat64ValueRecorder("sync_k8s_secret_duration_sec", metric.WithDescription("Distribution of how long it took to sync k8s secret"))
 	return &reporter{meter: meter}
 }
 
 func (r *reporter) ReportNodePublishCtMetric(provider string) {
-	labels := []core.KeyValue{key.String(providerKey, provider), key.String(osTypeKey, runtimeOS)}
+	labels := []label.KeyValue{label.String(providerKey, provider), label.String(osTypeKey, runtimeOS)}
 	nodePublishTotal.Add(context.Background(), 1, labels...)
 }
 
 func (r *reporter) ReportNodeUnPublishCtMetric() {
-	nodeUnPublishTotal.Add(context.Background(), 1, []core.KeyValue{key.String(osTypeKey, runtimeOS)}...)
+	nodeUnPublishTotal.Add(context.Background(), 1, []label.KeyValue{label.String(osTypeKey, runtimeOS)}...)
 }
 
 func (r *reporter) ReportNodePublishErrorCtMetric(provider, errType string) {
-	labels := []core.KeyValue{key.String(providerKey, provider), key.String(errorKey, errType), key.String(osTypeKey, runtimeOS)}
+	labels := []label.KeyValue{label.String(providerKey, provider), label.String(errorKey, errType), label.String(osTypeKey, runtimeOS)}
 	nodePublishErrorTotal.Add(context.Background(), 1, labels...)
 }
 
 func (r *reporter) ReportNodeUnPublishErrorCtMetric() {
-	nodeUnPublishErrorTotal.Add(context.Background(), 1, []core.KeyValue{key.String(osTypeKey, runtimeOS)}...)
+	nodeUnPublishErrorTotal.Add(context.Background(), 1, []label.KeyValue{label.String(osTypeKey, runtimeOS)}...)
 }
 
 func (r *reporter) ReportSyncK8SecretCtMetric(provider string, count int) {
-	labels := []core.KeyValue{key.String(providerKey, provider), key.String(osTypeKey, runtimeOS)}
+	labels := []label.KeyValue{label.String(providerKey, provider), label.String(osTypeKey, runtimeOS)}
 	syncK8sSecretTotal.Add(context.Background(), int64(count), labels...)
 }
 
 func (r *reporter) ReportSyncK8SecretDuration(duration float64) {
-	r.meter.RecordBatch(context.Background(), []core.KeyValue{key.String(osTypeKey, runtimeOS)}, syncK8sSecretDuration.Measurement(duration))
+	r.meter.RecordBatch(context.Background(), []label.KeyValue{label.String(osTypeKey, runtimeOS)}, syncK8sSecretDuration.Measurement(duration))
 }