go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-07-05 00:28:58 +02:00
Code Issues Releases Activity

Rename GetMeter() to Meter() (#357)

Browse Source
This commit is contained in:
Cheng-Lung Sung
2019-11-27 01:54:05 +08:00
committed by Joshua MacDonald
parent 5f776dbaed
commit 1b08d827a4
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/global/global.go
View File

@ -55,7 +55,7 @@ func SetTraceProvider(tp trace.Provider) {
// MeterProvider returns the registered global meter provider. // MeterProvider returns the registered global meter provider.
// If none is registered then an instance of metric.NoopProvider is returned. // If none is registered then an instance of metric.NoopProvider is returned.
// Use the trace provider to create a named meter. E.g. // 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 { func MeterProvider() metric.Provider {
if gp := globalMeter.Load(); gp != nil { if gp := globalMeter.Load(); gp != nil {
return gp.(meterProvider).mp return gp.(meterProvider).mp

2
api/global/global_test.go
View File

@ -36,7 +36,7 @@ func (*testTraceProvider) Tracer(_ string) trace.Tracer {
return &trace.NoopTracer{} return &trace.NoopTracer{}
} }
func (*testMeterProvider) GetMeter(_ string) metric.Meter { func (*testMeterProvider) Meter(_ string) metric.Meter {
return &metric.NoopMeter{} return &metric.NoopMeter{}
} }

4
api/metric/api.go
View File

@ -23,9 +23,9 @@ import (
// Provider supports named Meter instances. // Provider supports named Meter instances.
type Provider interface { 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. // 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 // LabelSet is an implementation-level interface that represents a

2
api/metric/noop.go
View File

@ -18,7 +18,7 @@ var _ InstrumentImpl = noopInstrument{}
var _ HandleImpl = noopHandle{} var _ HandleImpl = noopHandle{}
var _ LabelSet = noopLabelSet{} var _ LabelSet = noopLabelSet{}
func (NoopProvider) GetMeter(name string) Meter { func (NoopProvider) Meter(name string) Meter {
return NoopMeter{} return NoopMeter{}
} }

2
example/basic/main.go
View File

@ -81,7 +81,7 @@ func main() {
// initialized. See OTEP 0005. // initialized. See OTEP 0005.
tracer := global.TraceProvider().Tracer("ex.com/basic") 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", oneMetric := meter.NewFloat64Gauge("ex.com.one",
metric.WithKeys(fooKey, barKey, lemonsKey), metric.WithKeys(fooKey, barKey, lemonsKey),

2
exporter/metric/dogstatsd/example_test.go
View File

@ -69,7 +69,7 @@ func ExampleNew() {
key := key.New("key") key := key.New("key")
// pusher implements the metric.MeterProvider interface: // pusher implements the metric.MeterProvider interface:
meter := pusher.GetMeter("example") meter := pusher.Meter("example")
// Create and update a single counter: // Create and update a single counter:
counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key)) counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key))

4
sdk/metric/controller/push/push.go
View File

@ -105,9 +105,9 @@ func (c *Controller) SetErrorHandler(errorHandler sdk.ErrorHandler) {
c.sdk.SetErrorHandler(errorHandler) c.sdk.SetErrorHandler(errorHandler)
} }
// GetMeter returns a named Meter, satisifying the metric.Provider // Meter returns a named Meter, satisifying the metric.Provider
// interface. // interface.
func (c *Controller) GetMeter(name string) metric.Meter { func (c *Controller) Meter(name string) metric.Meter {
return c.sdk return c.sdk
} }

2
sdk/metric/controller/push/push_test.go
View File

@ -171,7 +171,7 @@ func TestPushTicker(t *testing.T) {
fix := newFixture(t) fix := newFixture(t)
p := push.New(fix.batcher, fix.exporter, time.Second) p := push.New(fix.batcher, fix.exporter, time.Second)
meter := p.GetMeter("name") meter := p.Meter("name")
mock := mockClock{clock.NewMock()} mock := mockClock{clock.NewMock()}
p.SetClock(mock) p.SetClock(mock)

2
sdk/metric/example_test.go
View File

@ -45,7 +45,7 @@ func ExampleNew() {
ctx := context.Background() ctx := context.Background()
key := key.New("key") key := key.New("key")
meter := pusher.GetMeter("example") meter := pusher.Meter("example")
counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key)) counter := meter.NewInt64Counter("a.counter", metric.WithKeys(key))
labels := meter.Labels(key.String("value")) labels := meter.Labels(key.String("value"))