chore: upgrade dependencies

vendor/go.opentelemetry.io/otel/sdk/metric/controller/basic/config.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"go.opentelemetry.io/otel"
-	export "go.opentelemetry.io/otel/sdk/export/metric"
+	"go.opentelemetry.io/otel/sdk/metric/export"
 	"go.opentelemetry.io/otel/sdk/resource"
 )
 
@@ -62,7 +62,7 @@ type config struct {
 // Option is the interface that applies the value to a configuration option.
 type Option interface {
 	// apply sets the Option value of a Config.
-	apply(*config)
+	apply(config) config
 }
 
 // WithResource sets the Resource configuration option of a Config by merging it
@@ -73,12 +73,13 @@ func WithResource(r *resource.Resource) Option {
 
 type resourceOption struct{ *resource.Resource }
 
-func (o resourceOption) apply(cfg *config) {
+func (o resourceOption) apply(cfg config) config {
 	res, err := resource.Merge(cfg.Resource, o.Resource)
 	if err != nil {
 		otel.Handle(err)
 	}
 	cfg.Resource = res
+	return cfg
 }
 
 // WithCollectPeriod sets the CollectPeriod configuration option of a Config.
@@ -88,8 +89,9 @@ func WithCollectPeriod(period time.Duration) Option {
 
 type collectPeriodOption time.Duration
 
-func (o collectPeriodOption) apply(cfg *config) {
+func (o collectPeriodOption) apply(cfg config) config {
 	cfg.CollectPeriod = time.Duration(o)
+	return cfg
 }
 
 // WithCollectTimeout sets the CollectTimeout configuration option of a Config.
@@ -99,8 +101,9 @@ func WithCollectTimeout(timeout time.Duration) Option {
 
 type collectTimeoutOption time.Duration
 
-func (o collectTimeoutOption) apply(cfg *config) {
+func (o collectTimeoutOption) apply(cfg config) config {
 	cfg.CollectTimeout = time.Duration(o)
+	return cfg
 }
 
 // WithExporter sets the exporter configuration option of a Config.
@@ -110,8 +113,9 @@ func WithExporter(exporter export.Exporter) Option {
 
 type exporterOption struct{ exporter export.Exporter }
 
-func (o exporterOption) apply(cfg *config) {
+func (o exporterOption) apply(cfg config) config {
 	cfg.Exporter = o.exporter
+	return cfg
 }
 
 // WithPushTimeout sets the PushTimeout configuration option of a Config.
@@ -121,6 +125,7 @@ func WithPushTimeout(timeout time.Duration) Option {
 
 type pushTimeoutOption time.Duration
 
-func (o pushTimeoutOption) apply(cfg *config) {
+func (o pushTimeoutOption) apply(cfg config) config {
 	cfg.PushTimeout = time.Duration(o)
+	return cfg
 }

vendor/go.opentelemetry.io/otel/sdk/metric/controller/basic/controller.go

@@ -21,12 +21,13 @@ import (
 	"time"
 
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/internal/metric/registry"
 	"go.opentelemetry.io/otel/metric"
-	export "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/instrumentation"
 	sdk "go.opentelemetry.io/otel/sdk/metric"
 	controllerTime "go.opentelemetry.io/otel/sdk/metric/controller/time"
+	"go.opentelemetry.io/otel/sdk/metric/export"
+	"go.opentelemetry.io/otel/sdk/metric/registry"
+	"go.opentelemetry.io/otel/sdk/metric/sdkapi"
 	"go.opentelemetry.io/otel/sdk/resource"
 )
 
@@ -99,7 +100,7 @@ func (c *Controller) Meter(instrumentationName string, opts ...metric.MeterOptio
 				library:      library,
 			}))
 	}
-	return metric.WrapMeterImpl(m.(*registry.UniqueInstrumentMeterImpl))
+	return sdkapi.WrapMeterImpl(m.(*registry.UniqueInstrumentMeterImpl))
 }
 
 type accumulatorCheckpointer struct {
@@ -108,17 +109,19 @@ type accumulatorCheckpointer struct {
 	library      instrumentation.Library
 }
 
+var _ sdkapi.MeterImpl = &accumulatorCheckpointer{}
+
 // New constructs a Controller using the provided checkpointer factory
 // and options (including optional exporter) to configure a metric
 // export pipeline.
 func New(checkpointerFactory export.CheckpointerFactory, opts ...Option) *Controller {
-	c := &config{
+	c := config{
 		CollectPeriod:  DefaultPeriod,
 		CollectTimeout: DefaultPeriod,
 		PushTimeout:    DefaultPeriod,
 	}
 	for _, opt := range opts {
-		opt.apply(c)
+		c = opt.apply(c)
 	}
 	if c.Resource == nil {
 		c.Resource = resource.Default()