diff --git a/go.mod b/go.mod index 1826a2e3..4b880df6 100644 --- a/go.mod +++ b/go.mod @@ -18,5 +18,5 @@ require ( k8s.io/code-generator v0.18.12 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 - knative.dev/pkg v0.0.0-20201216162758-261c9b4624df + knative.dev/pkg v0.0.0-20201218185703-e41409af6cff ) diff --git a/go.sum b/go.sum index 8cbc0a54..2590b29d 100644 --- a/go.sum +++ b/go.sum @@ -1172,8 +1172,8 @@ k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7Mpm k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA= knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20201216162758-261c9b4624df h1:rVbKwiRXpBKEiOET0xBwNDCe0q1gYYTTHXxOpYX6+GQ= -knative.dev/pkg v0.0.0-20201216162758-261c9b4624df/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= +knative.dev/pkg v0.0.0-20201218185703-e41409af6cff h1:qLPWOSpK2Nh5r6GboAFBsWIxmaAKlq+XYWdKOhoKht8= +knative.dev/pkg v0.0.0-20201218185703-e41409af6cff/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/knative.dev/pkg/metrics/config.go b/vendor/knative.dev/pkg/metrics/config.go index d4ae24ad..535c8e9b 100644 --- a/vendor/knative.dev/pkg/metrics/config.go +++ b/vendor/knative.dev/pkg/metrics/config.go @@ -208,7 +208,7 @@ func createMetricsConfig(ctx context.Context, ops ExporterOptions) (*metricsConf } switch lb := metricsBackend(strings.ToLower(backend)); lb { - case stackdriver, prometheus, openCensus: + case stackdriver, prometheus, openCensus, none: mc.backendDestination = lb default: return nil, fmt.Errorf("unsupported metrics backend value %q", backend) diff --git a/vendor/knative.dev/pkg/metrics/exporter.go b/vendor/knative.dev/pkg/metrics/exporter.go index 0c680106..b98a18de 100644 --- a/vendor/knative.dev/pkg/metrics/exporter.go +++ b/vendor/knative.dev/pkg/metrics/exporter.go @@ -23,6 +23,7 @@ import ( "strings" "sync" + "go.opencensus.io/resource" "go.opencensus.io/stats/view" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" @@ -161,13 +162,13 @@ func UpdateExporter(ctx context.Context, ops ExporterOptions, logger *zap.Sugare flushGivenExporter(curMetricsExporter) e, f, err := newMetricsExporter(newConfig, logger) if err != nil { - logger.Errorw("Failed to update a new metrics exporter based on metric config", newConfig, zap.Error(err)) + logger.Errorw("Failed to update a new metrics exporter based on metric config", zap.Error(err), "config", newConfig) return err } existingConfig := curMetricsConfig curMetricsExporter = e if err := setFactory(f); err != nil { - logger.Errorw("Failed to update metrics factory when loading metric config", newConfig, zap.Error(err)) + logger.Errorw("Failed to update metrics factory when loading metric config", zap.Error(err), "config", newConfig) return err } logger.Infof("Successfully updated the metrics exporter; old config: %v; new config %v", existingConfig, newConfig) @@ -212,7 +213,10 @@ func newMetricsExporter(config *metricsConfig, logger *zap.SugaredLogger) (view. openCensus: newOpenCensusExporter, prometheus: newPrometheusExporter, none: func(*metricsConfig, *zap.SugaredLogger) (view.Exporter, ResourceExporterFactory, error) { - return nil, nil, nil + noneFactory := func(*resource.Resource) (view.Exporter, error) { + return &noneExporter{}, nil + } + return &noneExporter{}, noneFactory, nil }, } @@ -272,3 +276,10 @@ func flushGivenExporter(e view.Exporter) bool { } return false } + +type noneExporter struct { +} + +// NoneExporter implements view.Exporter in the nil case. +func (*noneExporter) ExportView(*view.Data) { +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 52e0f1dc..aca948f5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -748,7 +748,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 ## explicit knative.dev/hack -# knative.dev/pkg v0.0.0-20201216162758-261c9b4624df +# knative.dev/pkg v0.0.0-20201218185703-e41409af6cff ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck