From a4884f1d4b8442ad8cc5ebdb5cfe5137dd23349c Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Thu, 10 Dec 2020 13:38:26 -0800 Subject: [PATCH] Remove exporters component code (#553) --- Readme.md | 1 - docs/developing-component.md | 1 - exporters/Readme.md | 29 -------- exporters/exporter.go | 12 ---- exporters/metadata.go | 12 ---- exporters/native/native_exporter.go | 76 -------------------- exporters/native/native_exporter_test.go | 23 ------ exporters/stringexporter/string_exporter.go | 49 ------------- exporters/zipkin/zipkin_exporter.go | 79 --------------------- exporters/zipkin/zipkin_exporter_test.go | 23 ------ go.mod | 4 -- go.sum | 11 --- 12 files changed, 320 deletions(-) delete mode 100644 exporters/Readme.md delete mode 100644 exporters/exporter.go delete mode 100644 exporters/metadata.go delete mode 100644 exporters/native/native_exporter.go delete mode 100644 exporters/native/native_exporter_test.go delete mode 100644 exporters/stringexporter/string_exporter.go delete mode 100644 exporters/zipkin/zipkin_exporter.go delete mode 100644 exporters/zipkin/zipkin_exporter_test.go diff --git a/Readme.md b/Readme.md index 63be1e2f7..27e867ce2 100644 --- a/Readme.md +++ b/Readme.md @@ -17,7 +17,6 @@ Available component types: * [Pub Sub](pubsub/Readme.md) * [State Stores](state/Readme.md) * [Secret Stores](secretstores/Readme.md) -* [Tracing Exporters](exporters/Readme.md) For documentation on how components are being used in Dapr in a language/platform agnostic way, visit [Dapr Docs](https://docs.dapr.io). diff --git a/docs/developing-component.md b/docs/developing-component.md index 14ed446bb..6d3250b10 100644 --- a/docs/developing-component.md +++ b/docs/developing-component.md @@ -36,7 +36,6 @@ git clone https://github.com/dapr/components-contrib.git github.com/dapr/compone | Bindings | [components-contrib/bindings](https://github.com/dapr/components-contrib/tree/master/bindings) | [Kafka](https://github.com/dapr/components-contrib/tree/master/bindings/kafka) | [concept](https://docs.dapr.io/developing-applications/building-blocks/bindings/bindings-overview/), [input howto](https://docs.dapr.io/developing-applications/building-blocks/bindings/howto-triggers/), [output howto](https://docs.dapr.io/developing-applications/building-blocks/bindings/howto-bindings/), [api spec](https://docs.dapr.io/reference/api/bindings_api/) | | Secret Store | [components-contrib/secretstore](https://github.com/dapr/components-contrib/tree/master/secretstores) | [Kubernetes](https://github.com/dapr/components-contrib/tree/master/secretstores/kubernetes), [Azure Keyvault](https://github.com/dapr/components-contrib/tree/master/secretstores/azure/keyvault) | [concept](https://docs.dapr.io/developing-applications/building-blocks/secrets/secrets-overview/), [howto](https://docs.dapr.io/developing-applications/building-blocks/secrets/howto-secrets/)| | Middleware | [components-contrib/middleware](https://github.com/dapr/components-contrib/tree/master/middleware) | [Oauth2](https://github.com/dapr/components-contrib/blob/master/middleware/http/oauth2/oauth2_middleware.go) | [concept](https://docs.dapr.io/concepts/middleware-concept/), [howto](https://docs.dapr.io/operations/security/oauth/) | -| Exporter | [components-contrib/exporters](https://github.com/dapr/components-contrib/tree/master/exporters) | [Zipkin](https://github.com/dapr/components-contrib/blob/master/exporters/zipkin/zipkin_exporter.go) | [concept](https://docs.dapr.io/concepts/observability-concept/), [howto](https://docs.dapr.io/operations/troubleshooting/setup-tracing/) | | Service Discovery | [components-contrib/servicediscovery](https://github.com/dapr/components-contrib/tree/master/servicediscovery) | [mdns](https://github.com/dapr/components-contrib/blob/master/servicediscovery/mdns/mdns.go) | [howto](https://docs.dapr.io/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services/) | ### Running unit-test diff --git a/exporters/Readme.md b/exporters/Readme.md deleted file mode 100644 index f85f713c7..000000000 --- a/exporters/Readme.md +++ /dev/null @@ -1,29 +0,0 @@ -# Tracing Exporters - -Tracing Exporters are [OpenTelemetry](https://opentelemetry.io/) exporter wrappers for Dapr. The actual export implementations should be contributed to the [OpenTelemetry repository](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter). - -Currently supported exporters are: - -* Native - - OpenTelemetry default exporter - -* String - - Export to a string buffer. This is mostly used for testing purposes. - -* Zipkin - - Export to a [Zipkin](https://zipkin.io/) back-end. - -## Implementing a new Exporter wrapper - -A compliant exporter wrapper needs to implement one interface: `Exporter`, which has a single method: - -```go -type Exporter interface { - Init(daprID string, hostAddress string, metadata Metadata) error -} -``` - -The implementation should configure the exporter according to the settings specified in the metadata. diff --git a/exporters/exporter.go b/exporters/exporter.go deleted file mode 100644 index 9291b3050..000000000 --- a/exporters/exporter.go +++ /dev/null @@ -1,12 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package exporters - -// Exporter is the interface for tracing exporter wrappers -type Exporter interface { - Init(daprID string, hostAddress string, metadata Metadata) error - Unregister() -} diff --git a/exporters/metadata.go b/exporters/metadata.go deleted file mode 100644 index 50141da8f..000000000 --- a/exporters/metadata.go +++ /dev/null @@ -1,12 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package exporters - -// Metadata represents a set of exporter specific properties -type Metadata struct { - Properties map[string]string `json:"properties"` - Buffer *string `json:"-"` -} diff --git a/exporters/native/native_exporter.go b/exporters/native/native_exporter.go deleted file mode 100644 index a3264add4..000000000 --- a/exporters/native/native_exporter.go +++ /dev/null @@ -1,76 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package native - -import ( - "encoding/json" - "strconv" - - "contrib.go.opencensus.io/exporter/ocagent" - "github.com/dapr/components-contrib/exporters" - "github.com/dapr/dapr/pkg/logger" - "go.opencensus.io/trace" -) - -// Metadata is the native exporter config -type nativeExporterMetadata struct { - AgentEndpoint string `json:"agentEndpoint"` - Enabled string `json:"enabled"` -} - -// NewNativeExporter returns a new native exporter instance -func NewNativeExporter(logger logger.Logger) *Exporter { - return &Exporter{logger: logger} -} - -// Exporter is an OpenCensus native exporter -type Exporter struct { - logger logger.Logger - traceExporter trace.Exporter -} - -// Init creates a new native endpoint and reporter -func (l *Exporter) Init(daprID string, hostAddress string, metadata exporters.Metadata) error { - meta, err := l.getNativeMetadata(metadata) - if err != nil { - return err - } - - enabled, _ := strconv.ParseBool(meta.Enabled) - if !enabled { - return nil - } - - l.traceExporter, err = ocagent.NewExporter(ocagent.WithInsecure(), ocagent.WithServiceName(daprID), ocagent.WithAddress(meta.AgentEndpoint)) - if err != nil { - return err - } - - trace.RegisterExporter(l.traceExporter) - trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) - - return nil -} - -func (l *Exporter) getNativeMetadata(metadata exporters.Metadata) (*nativeExporterMetadata, error) { - b, err := json.Marshal(metadata.Properties) - if err != nil { - return nil, err - } - - var nExporterMetadata nativeExporterMetadata - err = json.Unmarshal(b, &nExporterMetadata) - if err != nil { - return nil, err - } - - return &nExporterMetadata, nil -} - -// Unregister removes the exporter -func (l *Exporter) Unregister() { - trace.UnregisterExporter(l.traceExporter) -} diff --git a/exporters/native/native_exporter_test.go b/exporters/native/native_exporter_test.go deleted file mode 100644 index fb004aa23..000000000 --- a/exporters/native/native_exporter_test.go +++ /dev/null @@ -1,23 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package native - -import ( - "testing" - - "github.com/dapr/components-contrib/exporters" - "github.com/dapr/dapr/pkg/logger" - "github.com/stretchr/testify/assert" -) - -func TestParseMetadata(t *testing.T) { - m := exporters.Metadata{} - m.Properties = map[string]string{"agentEndpoint": "c"} - exporter := NewNativeExporter(logger.NewLogger("test")) - metadata, err := exporter.getNativeMetadata(m) - assert.Nil(t, err) - assert.Equal(t, "c", metadata.AgentEndpoint) -} diff --git a/exporters/stringexporter/string_exporter.go b/exporters/stringexporter/string_exporter.go deleted file mode 100644 index 76e77b18c..000000000 --- a/exporters/stringexporter/string_exporter.go +++ /dev/null @@ -1,49 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package stringexporter - -import ( - "strconv" - - "github.com/dapr/components-contrib/exporters" - "github.com/dapr/dapr/pkg/logger" - "go.opencensus.io/trace" -) - -// Metadata is the string exporter config -type Metadata struct { - Buffer *string -} - -// NewStringExporter returns a new string exporter instance -func NewStringExporter(logger logger.Logger) *Exporter { - return &Exporter{logger: logger} -} - -// Exporter is an OpenCensus string exporter -type Exporter struct { - Buffer *string - logger logger.Logger -} - -// ExportSpan exports span content to the buffer -func (se *Exporter) ExportSpan(sd *trace.SpanData) { - *se.Buffer = strconv.Itoa(int(sd.Status.Code)) -} - -// Init creates a new string exporter endpoint and reporter -func (se *Exporter) Init(daprID string, hostAddress string, metadata exporters.Metadata) error { - se.Buffer = metadata.Buffer - trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) - trace.RegisterExporter(se) - - return nil -} - -// Unregister removes the exporter -func (se *Exporter) Unregister() { - trace.UnregisterExporter(se) -} diff --git a/exporters/zipkin/zipkin_exporter.go b/exporters/zipkin/zipkin_exporter.go deleted file mode 100644 index 12d1866e4..000000000 --- a/exporters/zipkin/zipkin_exporter.go +++ /dev/null @@ -1,79 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package zipkin - -import ( - "encoding/json" - "strconv" - - "contrib.go.opencensus.io/exporter/zipkin" - "github.com/dapr/components-contrib/exporters" - "github.com/dapr/dapr/pkg/logger" - openzipkin "github.com/openzipkin/zipkin-go" - zipkinHTTP "github.com/openzipkin/zipkin-go/reporter/http" - "go.opencensus.io/trace" -) - -// Metadata is the zipkin config -type zipkinMetadata struct { - ExporterAddress string `json:"exporterAddress"` - Enabled string `json:"enabled"` -} - -// NewZipkinExporter returns a new zipkin exporter instance -func NewZipkinExporter(logger logger.Logger) *Exporter { - return &Exporter{logger: logger} -} - -// Exporter is an OpenCensus zipkin exporter -type Exporter struct { - logger logger.Logger - traceExporter trace.Exporter -} - -// Init creates a new zipkin endpoint and reporter -func (z *Exporter) Init(daprID string, hostAddress string, metadata exporters.Metadata) error { - meta, err := z.getZipkinMetadata(metadata) - if err != nil { - return err - } - - enabled, _ := strconv.ParseBool(meta.Enabled) - if !enabled { - return nil - } - - localEndpoint, err := openzipkin.NewEndpoint(daprID, hostAddress) - if err != nil { - return err - } - reporter := zipkinHTTP.NewReporter(meta.ExporterAddress) - z.traceExporter = zipkin.NewExporter(reporter, localEndpoint) - trace.RegisterExporter(z.traceExporter) - trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) - - return nil -} - -func (z *Exporter) getZipkinMetadata(metadata exporters.Metadata) (*zipkinMetadata, error) { - b, err := json.Marshal(metadata.Properties) - if err != nil { - return nil, err - } - - var zipkinMeta zipkinMetadata - err = json.Unmarshal(b, &zipkinMeta) - if err != nil { - return nil, err - } - - return &zipkinMeta, nil -} - -// Unregister removes the exporter -func (z *Exporter) Unregister() { - trace.UnregisterExporter(z.traceExporter) -} diff --git a/exporters/zipkin/zipkin_exporter_test.go b/exporters/zipkin/zipkin_exporter_test.go deleted file mode 100644 index 26ea3174c..000000000 --- a/exporters/zipkin/zipkin_exporter_test.go +++ /dev/null @@ -1,23 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. -// ------------------------------------------------------------ - -package zipkin - -import ( - "testing" - - "github.com/dapr/components-contrib/exporters" - "github.com/dapr/dapr/pkg/logger" - "github.com/stretchr/testify/assert" -) - -func TestParseMetadata(t *testing.T) { - m := exporters.Metadata{} - m.Properties = map[string]string{"exporterAddress": "c"} - exporter := NewZipkinExporter(logger.NewLogger("test")) - metadata, err := exporter.getZipkinMetadata(m) - assert.Nil(t, err) - assert.Equal(t, "c", metadata.ExporterAddress) -} diff --git a/go.mod b/go.mod index 6ee03cf71..faea0862c 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,6 @@ require ( cloud.google.com/go/datastore v1.1.0 cloud.google.com/go/pubsub v1.3.1 cloud.google.com/go/storage v1.10.0 - contrib.go.opencensus.io/exporter/ocagent v0.7.0 - contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/Azure/azure-amqp-common-go/v3 v3.1.0 // indirect github.com/Azure/azure-event-hubs-go v1.3.1 github.com/Azure/azure-sdk-for-go v48.2.0+incompatible @@ -56,7 +54,6 @@ require ( github.com/nats-io/nats.go v1.9.1 github.com/nats-io/stan.go v0.6.0 github.com/open-policy-agent/opa v0.23.2 - github.com/openzipkin/zipkin-go v0.1.6 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/robfig/cron/v3 v3.0.1 @@ -71,7 +68,6 @@ require ( github.com/valyala/fasthttp v1.6.0 github.com/vmware/vmware-go-kcl v0.0.0-20191104173950-b6c74c3fe74e go.mongodb.org/mongo-driver v1.1.2 - go.opencensus.io v0.22.4 goji.io v2.0.2+incompatible // indirect golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b diff --git a/go.sum b/go.sum index 533577709..5038265a2 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,6 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= contrib.go.opencensus.io/exporter/ocagent v0.6.0 h1:Z1n6UAyr0QwM284yUuh5Zd8JlvxUGAhFZcgMJkMPrGM= contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= -contrib.go.opencensus.io/exporter/ocagent v0.7.0 h1:BEfdCTXfMV30tLZD8c9n64V/tIZX5+9sXiuFLnrr1k8= -contrib.go.opencensus.io/exporter/ocagent v0.7.0/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g= contrib.go.opencensus.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -185,7 +183,6 @@ github.com/alicebob/miniredis/v2 v2.13.3 h1:kohgdtN58KW/r9ZDVmMJE3MrfbumwsDQStd0 github.com/alicebob/miniredis/v2 v2.13.3/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg= github.com/aliyun/aliyun-oss-go-sdk v2.0.7+incompatible h1:HXvOJsZw8JT/ldxjX74Aq4H2IY4ojV/mXMDPWFitpv8= github.com/aliyun/aliyun-oss-go-sdk v2.0.7+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/pulsar-client-go v0.1.0 h1:2BFZztxtNgFyOzBc+5On84CX6aIZW5xwh7KM0MWigGI= github.com/apache/pulsar-client-go v0.1.0/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4= github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= @@ -484,8 +481,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.4 h1:5xLhQjsk4zqPf9EHCrja2qFZMx+yBqkO3XgJ14bNnU0= github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= -github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/consul/api v1.2.0 h1:oPsuzLp2uk7I7rojPKuncWbZ+m5TMoD4Ivs+2Rkeh4Y= @@ -818,7 +813,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uY github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= @@ -1052,7 +1046,6 @@ golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1245,7 +1238,6 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= @@ -1286,10 +1278,8 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1379,7 +1369,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=