Skip to content

Commit

Permalink
[chore] Remove unused ocRegistry, no longer used (#10215)
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdandrutu committed May 23, 2024
1 parent 570a425 commit f05f556
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions service/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ import (
"net/http"
"strconv"

ocmetric "go.opencensus.io/metric"
"go.opencensus.io/metric/metricproducer"
"go.opentelemetry.io/contrib/config"
"go.opentelemetry.io/otel/metric"
noopmetric "go.opentelemetry.io/otel/metric/noop"
"go.opentelemetry.io/otel/metric/noop"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
"go.uber.org/multierr"
Expand All @@ -31,8 +29,7 @@ const (

type meterProvider struct {
*sdkmetric.MeterProvider
ocRegistry *ocmetric.Registry
servers []*http.Server
servers []*http.Server
}

type meterProviderSettings struct {
Expand All @@ -43,7 +40,7 @@ type meterProviderSettings struct {

func newMeterProvider(set meterProviderSettings, disableHighCardinality bool) (metric.MeterProvider, error) {
if set.cfg.Level == configtelemetry.LevelNone || (set.cfg.Address == "" && len(set.cfg.Readers) == 0) {
return noopmetric.NewMeterProvider(), nil
return noop.NewMeterProvider(), nil
}

if len(set.cfg.Address) != 0 {
Expand All @@ -70,12 +67,8 @@ func newMeterProvider(set meterProviderSettings, disableHighCardinality bool) (m
})
}

mp := &meterProvider{
// Initialize the ocRegistry, still used by the process metrics.
ocRegistry: ocmetric.NewRegistry(),
}
metricproducer.GlobalManager().AddProducer(mp.ocRegistry)
opts := []sdkmetric.Option{}
mp := &meterProvider{}
var opts []sdkmetric.Option
for _, reader := range set.cfg.Readers {
// https://github.com/open-telemetry/opentelemetry-collector/issues/8045
r, server, err := proctelemetry.InitMetricReader(context.Background(), reader, set.asyncErrorChannel)
Expand Down Expand Up @@ -111,8 +104,6 @@ func (mp *meterProvider) LogAboutServers(logger *zap.Logger, cfg telemetry.Metri
// Shutdown the meter provider and all the associated resources.
// The type signature of this method matches that of the sdkmetric.MeterProvider.
func (mp *meterProvider) Shutdown(ctx context.Context) error {
metricproducer.GlobalManager().DeleteProducer(mp.ocRegistry)

var errs error
for _, server := range mp.servers {
if server != nil {
Expand Down

0 comments on commit f05f556

Please sign in to comment.