You've already forked opentelemetry-go
							
							
				mirror of
				https://github.com/open-telemetry/opentelemetry-go.git
				synced 2025-10-31 00:07:40 +02:00 
			
		
		
		
	Rename GetMeter() to Meter() (#357)
This commit is contained in:
		
				
					committed by
					
						 Joshua MacDonald
						Joshua MacDonald
					
				
			
			
				
	
			
			
			
						parent
						
							5f776dbaed
						
					
				
				
					commit
					1b08d827a4
				
			| @@ -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 | ||||
|   | ||||
| @@ -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{} | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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{} | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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), | ||||
|   | ||||
| @@ -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)) | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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")) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user