diff --git a/go.mod b/go.mod index 2a9cf7141..bf12f624b 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,8 @@ require ( k8s.io/api v0.17.6 k8s.io/apimachinery v0.17.6 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible - knative.dev/eventing v0.15.1-0.20200601090703-acdd167a60b2 - knative.dev/pkg v0.0.0-20200529164702-389d28f9b67a - knative.dev/test-infra v0.0.0-20200531185603-9c9dad87b366 // indirect + knative.dev/eventing v0.15.1-0.20200602150917-5e1333ffb969 + knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f ) replace ( diff --git a/go.sum b/go.sum index 7cdc0ca58..c1de5ab7b 100644 --- a/go.sum +++ b/go.sum @@ -1333,8 +1333,8 @@ k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200124190032-861946025e34 h1:HjlUD6M0K3P8nRXmr2B9o4F9dUy9TCj/aEpReeyi6+k= k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg= -knative.dev/eventing v0.15.1-0.20200601090703-acdd167a60b2 h1:FywVYNvQ8Yy0LSzPX0CXH2Wk6UGeFNso1ayEx7hf3JM= -knative.dev/eventing v0.15.1-0.20200601090703-acdd167a60b2/go.mod h1:sHgMoXa+Hs9fqjQRy7Nqi7eq6FDlFZ1CKe96/Mg0aCE= +knative.dev/eventing v0.15.1-0.20200602150917-5e1333ffb969 h1:m14BdQ+HUiK6OQAczTL3n+yQ5+exGYQPnEoIS/gJNtc= +knative.dev/eventing v0.15.1-0.20200602150917-5e1333ffb969/go.mod h1:lZFMpe5qQtW58fpCxiaBjpeV6SGt8rpFPyUwlC5Y7gk= knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g= knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= @@ -1344,12 +1344,8 @@ knative.dev/pkg v0.0.0-20200515002500-16d7b963416f h1:kcpAMvYUqftHMA69wZ7g83zEW4 knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200520073958-94316e20e860 h1:JcN76DOgYvpykb4f6GksDg3mwC5zGnA7nYITw7TEuKo= knative.dev/pkg v0.0.0-20200520073958-94316e20e860/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= -knative.dev/pkg v0.0.0-20200527024749-495174c96651 h1:/LhCktTMhJrCDXGg3KCWeSQTLLGy3Ms4AaqM9O/05dI= -knative.dev/pkg v0.0.0-20200527024749-495174c96651/go.mod h1:4ipprwHqpqiyYHbrEjSf1kNwL+sJOqHhj1ujO2WxvpE= -knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82 h1:uC65bOUmC5UsVJgUI28QWis/oiqnZrU49wLM828ioJM= -knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM= -knative.dev/pkg v0.0.0-20200529164702-389d28f9b67a h1:G5FDEM10xOTyWD1+JQFk2+QveGOJ9+InMw0eVvhzZXw= -knative.dev/pkg v0.0.0-20200529164702-389d28f9b67a/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM= +knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f h1:xVWLh9bMhQiFgU1ommpDLW5djc5fPOwi6ulnCt80CO0= +knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 h1:JxqONCZVS7or+Fv3ebVQoipuIBH7Ig3Qbx170hgIF+A= @@ -1358,10 +1354,8 @@ knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9 h1:kKfV3QWsxugwXsqgjFd knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE= knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a h1:c0qTABRcNoxZVu5gsryLWPZtGa/s4zsvovz0nGefuzg= knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a/go.mod h1:n9eQkzmSNj8BiqNFl1lzoz68D09uMeJfyOjc132Gbik= -knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879 h1:3spi67ya78+ofPZLHpJkZlBSj6pBowXa8/1Zdha6MCY= -knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY= -knative.dev/test-infra v0.0.0-20200531185603-9c9dad87b366 h1:QZ0vlo1v2qNQ+9kJodNhhizkX+AQd40qKsMua4n+cr4= -knative.dev/test-infra v0.0.0-20200531185603-9c9dad87b366/go.mod h1:c02XF+uTFJ4WfBKjSlT3XCAv14hXVTZxLjMDA7lH63E= +knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4 h1:1l1kPOYdCd6d++wskVD32h5Bt56X1tpFKQF3FGkcu6w= +knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4/go.mod h1:JV4E61erdHLn4jT0X+svUP7lZYggJyXMCGDewTSQuO8= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go index 41ccd7b00..9f1898ee5 100644 --- a/pkg/adapter/adapter.go +++ b/pkg/adapter/adapter.go @@ -66,8 +66,8 @@ func (a *Adapter) newEvent() cloudevents.Event { } // Start runs the adapter. -// Returns if stopCh is closed or Send() returns an error. -func (a *Adapter) Start(stopCh <-chan struct{}) error { +// Returns if ctx is cancelled or Send() returns an error. +func (a *Adapter) Start(ctx context.Context) error { a.logger.Infow("Starting heartbeat", zap.String("interval", a.interval.String())) for { select { @@ -79,7 +79,7 @@ func (a *Adapter) Start(stopCh <-chan struct{}) error { // We got an error but it could be transient, try again next interval. continue } - case <-stopCh: + case <-ctx.Done(): a.logger.Info("Shutting down...") return nil } diff --git a/pkg/adapter/adapter_test.go b/pkg/adapter/adapter_test.go index 19311ad97..24902016c 100644 --- a/pkg/adapter/adapter_test.go +++ b/pkg/adapter/adapter_test.go @@ -41,13 +41,13 @@ func TestAdapter(t *testing.T) { // Keep the adapter logging quiet for tests. ctx := logging.WithLogger(context.Background(), zap.NewNop().Sugar()) a := NewAdapter(ctx, &envConfig{Interval: time.Millisecond}, c) - stop := make(chan struct{}) + ctx, cancel := context.WithCancel(ctx) go func() { - if err := a.Start(stop); err != nil { + if err := a.Start(ctx); err != nil { logging.FromContext(ctx).Errorw("failed to start adapter", zap.Error(err)) } }() - defer func() { close(stop) }() + defer func() { cancel() }() verify(t, sink.received) } diff --git a/vendor/knative.dev/eventing/pkg/adapter/v2/main.go b/vendor/knative.dev/eventing/pkg/adapter/v2/main.go index a0ae3c98d..ccbb663e7 100644 --- a/vendor/knative.dev/eventing/pkg/adapter/v2/main.go +++ b/vendor/knative.dev/eventing/pkg/adapter/v2/main.go @@ -35,7 +35,7 @@ import ( ) type Adapter interface { - Start(stopCh <-chan struct{}) error + Start(ctx context.Context) error } type AdapterConstructor func(ctx context.Context, env EnvConfigAccessor, client cloudevents.Client) Adapter @@ -113,7 +113,7 @@ func MainWithContext(ctx context.Context, component string, ector EnvConfigConst logger.Info("Starting Receive Adapter", zap.Any("adapter", adapter)) - if err := adapter.Start(ctx.Done()); err != nil { + if err := adapter.Start(ctx); err != nil { logger.Warn("start returned an error", zap.Error(err)) } } diff --git a/vendor/knative.dev/eventing/pkg/adapter/v2/main_message.go b/vendor/knative.dev/eventing/pkg/adapter/v2/main_message.go index 662c9f824..902ff7900 100644 --- a/vendor/knative.dev/eventing/pkg/adapter/v2/main_message.go +++ b/vendor/knative.dev/eventing/pkg/adapter/v2/main_message.go @@ -36,7 +36,7 @@ import ( ) type MessageAdapter interface { - Start(stopCh <-chan struct{}) error + Start(ctx context.Context) error } type MessageAdapterConstructor func(ctx context.Context, env EnvConfigAccessor, adapter *kncloudevents.HttpMessageSender, reporter source.StatsReporter) MessageAdapter @@ -116,7 +116,7 @@ func MainMessageAdapterWithContext(ctx context.Context, component string, ector logger.Info("Starting Receive MessageAdapter", zap.Any("adapter", adapter)) - if err := adapter.Start(ctx.Done()); err != nil { + if err := adapter.Start(ctx); err != nil { logger.Warn("start returned an error", zap.Error(err)) } } diff --git a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go index 87bb722a2..e4c2d08dc 100644 --- a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go +++ b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go @@ -102,10 +102,13 @@ func init() { func newOpencensusSDExporter(o stackdriver.Options) (view.Exporter, error) { e, err := stackdriver.NewExporter(o) - if err == nil { - // Start the exporter. - // TODO(https://github.com/knative/pkg/issues/866): Move this to an interface. - e.StartMetricsExporter() + if err != nil { + return nil, err + } + // Start the exporter. + // TODO(https://github.com/knative/pkg/issues/866): Move this to an interface. + if err := e.StartMetricsExporter(); err != nil { + return nil, err } return e, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 74fd01eee..ae4249b6f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -728,7 +728,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.15.1-0.20200601090703-acdd167a60b2 +# knative.dev/eventing v0.15.1-0.20200602150917-5e1333ffb969 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/configs @@ -793,7 +793,7 @@ knative.dev/eventing/pkg/kncloudevents knative.dev/eventing/pkg/logging knative.dev/eventing/pkg/reconciler/source knative.dev/eventing/pkg/tracing -# knative.dev/pkg v0.0.0-20200529164702-389d28f9b67a +# knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f knative.dev/pkg/apis knative.dev/pkg/apis/duck knative.dev/pkg/apis/duck/v1 @@ -840,7 +840,7 @@ knative.dev/pkg/webhook/configmaps knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/test-infra v0.0.0-20200531185603-9c9dad87b366 +# knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4 knative.dev/test-infra/scripts # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml