diff --git a/api/global/global.go b/api/global/global.go index 9814c80df..af7f8ac8c 100644 --- a/api/global/global.go +++ b/api/global/global.go @@ -55,7 +55,7 @@ func SetTraceProvider(tp trace.Provider) { // MeterProvider returns the registered global meter provider. // If none is registered then an instance of metric.NoopProvider is returned. // Use the trace provider to create a named meter. E.g. -// meter := global.MeterProvider().GetMeter("example.com/foo") +// meter := global.MeterProvider().Meter("example.com/foo") func MeterProvider() metric.Provider { if gp := globalMeter.Load(); gp != nil { return gp.(meterProvider).mp diff --git a/api/global/global_test.go b/api/global/global_test.go index dbd83a5c1..e24b42354 100644 --- a/api/global/global_test.go +++ b/api/global/global_test.go @@ -36,7 +36,7 @@ func (*testTraceProvider) Tracer(_ string) trace.Tracer { return &trace.NoopTracer{} } -func (*testMeterProvider) GetMeter(_ string) metric.Meter { +func (*testMeterProvider) Meter(_ string) metric.Meter { return &metric.NoopMeter{} } diff --git a/api/metric/api.go b/api/metric/api.go index 0e37e83e0..f96bd75d5 100644 --- a/api/metric/api.go +++ b/api/metric/api.go @@ -23,9 +23,9 @@ import ( // Provider supports named Meter instances. type Provider interface { - // GetMeter gets a named Meter interface. If the name is an + // Meter gets a named Meter interface. If the name is an // empty string, the provider uses a default name. - GetMeter(name string) Meter + Meter(name string) Meter } // LabelSet is an implementation-level interface that represents a diff --git a/api/metric/noop.go b/api/metric/noop.go index a504a39e5..770837bb3 100644 --- a/api/metric/noop.go +++ b/api/metric/noop.go @@ -18,7 +18,7 @@ var _ InstrumentImpl = noopInstrument{} var _ HandleImpl = noopHandle{} var _ LabelSet = noopLabelSet{} -func (NoopProvider) GetMeter(name string) Meter { +func (NoopProvider) Meter(name string) Meter { return NoopMeter{} } diff --git a/example/basic/main.go b/example/basic/main.go index c7e6351a7..e5cad77a2 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -81,7 +81,7 @@ func main() { // initialized. See OTEP 0005. tracer := global.TraceProvider().Tracer("ex.com/basic") - meter := global.MeterProvider().GetMeter("ex.com/basic") + meter := global.MeterProvider().Meter("ex.com/basic") oneMetric := meter.NewFloat64Gauge("ex.com.one", metric.WithKeys(fooKey, barKey, lemonsKey), diff --git a/exporter/metric/dogstatsd/example_test.go b/exporter/metric/dogstatsd/example_test.go index 01c5350f7..d5a031757 100644 --- a/exporter/metric/dogstatsd/example_test.go +++ b/exporter/metric/dogstatsd/example_test.go @@ -69,7 +69,7 @@ func ExampleNew() { key := key.New("key") // pusher implements the metric.MeterProvider interface: - meter := pusher.GetMeter("example") + meter := pusher.Meter("example") // Create and update a single counter: counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key)) diff --git a/sdk/metric/controller/push/push.go b/sdk/metric/controller/push/push.go index 709c87a36..774515abd 100644 --- a/sdk/metric/controller/push/push.go +++ b/sdk/metric/controller/push/push.go @@ -105,9 +105,9 @@ func (c *Controller) SetErrorHandler(errorHandler sdk.ErrorHandler) { c.sdk.SetErrorHandler(errorHandler) } -// GetMeter returns a named Meter, satisifying the metric.Provider +// Meter returns a named Meter, satisifying the metric.Provider // interface. -func (c *Controller) GetMeter(name string) metric.Meter { +func (c *Controller) Meter(name string) metric.Meter { return c.sdk } diff --git a/sdk/metric/controller/push/push_test.go b/sdk/metric/controller/push/push_test.go index d9df336ba..2c7b1902c 100644 --- a/sdk/metric/controller/push/push_test.go +++ b/sdk/metric/controller/push/push_test.go @@ -171,7 +171,7 @@ func TestPushTicker(t *testing.T) { fix := newFixture(t) p := push.New(fix.batcher, fix.exporter, time.Second) - meter := p.GetMeter("name") + meter := p.Meter("name") mock := mockClock{clock.NewMock()} p.SetClock(mock) diff --git a/sdk/metric/example_test.go b/sdk/metric/example_test.go index e79d3ebf8..84fb715bd 100644 --- a/sdk/metric/example_test.go +++ b/sdk/metric/example_test.go @@ -45,7 +45,7 @@ func ExampleNew() { ctx := context.Background() key := key.New("key") - meter := pusher.GetMeter("example") + meter := pusher.Meter("example") counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key)) labels := meter.Labels(key.String("value"))