Merge branch 'main' into spm

Signed-off-by: Raghuram Kannan <[email protected]>
jaegertracing · yurishkuro · Jul 24, 2024 · Jun 26, 2024 · Jun 27, 2024 · Jun 27, 2024
commit bae9e39f99eed0269a00f6a66ee7c2bbb65e84a6
@@ -97,6 +97,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.105.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.105.0 // indirect
 	go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.105.0 // indirect
+	go.opentelemetry.io/collector/pdata/testdata v0.105.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
 	go.opentelemetry.io/otel/log v0.4.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect

diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go

 	mqs, err := s.createMetricStorage(host)
 	if err != nil {
 		return err
 	}

 	// metricsQueryService, _ := disabled.NewMetricsReader()
 		return disabled.NewMetricsReader()
 	}

 	mf, err := jaegerstorage.GetMetricsFactory(s.config.MetricStorage, host)
 	if err != nil {
 		return nil, fmt.Errorf("cannot find metrics storage factory: %w", err)
 	}

 	// metricsReader, ok := opts.InitMetricStorage(mf, s.telset.Logger)
 	metricsReader, err := mf.CreateMetricsReader()
 	if errors.Is(err, storage.ErrMetricStorageNotConfigured) || errors.Is(err, storage.ErrMetricStorageNotSupported) {
 		s.telset.Logger.Info("Metric storage not created", zap.String("reason", err.Error()))
 		return disabled.NewMetricsReader()
 	}
 	if err != nil {
 		s.telset.Logger.Error("Cannot init metric storage reader", zap.Error(err))
 		return disabled.NewMetricsReader()
 	}
 	return metricsReader, nil
 }

 func (s *server) makeQueryOptions() *queryApp.QueryOptions {
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go
 	return nil
 }

 func (cfg *MetricBackends) Unmarshal(conf *confmap.Conf) error {
 	// apply defaults
 	if conf.IsSet("prometheus") {
 		v := prometheus.DefaultConfig()
 		cfg.Prometheus = &v
 	}
 	return conf.Unmarshal(cfg)
 }
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
 }

 // GetMetricsFactory locates the extension in Host and retrieves a metrics factory from it with the given name.
 func GetMetricsFactory(name string, host component.Host) (storage.MetricsFactory, error) {
 	var comp component.Component
 	for id, ext := range host.GetExtensions() {
 		if id.Type() == componentType {
 			comp = ext
 			break
 		}
 	}
 	if comp == nil {
 		return nil, fmt.Errorf(
 			"cannot find extension '%s' (make sure it's defined earlier in the config)",
 			componentType,
 		)
 	}
 	mf, ok := comp.(Extension).MetricsFactory(name)
 	if !ok {
 		return nil, fmt.Errorf(
 			"cannot find metric storage '%s' declared by '%s' extension",
 			name, componentType,
 		)
 	}
 	return mf, nil
 }

 func GetStorageFactoryV2(name string, host component.Host) (spanstore.Factory, error) {
 	}

 	for metricStorageName, cfg := range s.config.MetricBackends {
 		s.telset.Logger.Sugar().Infof("Initializing metrics storage '%s'", metricStorageName)
 		var metricsFactory storage.MetricsFactory
 		var err error = errors.New("empty configuration")
 		if cfg.Prometheus != nil {
 			metricsFactory, err = prometheus.NewFactoryWithConfig(*cfg.Prometheus, s.telset.Logger)
 		}
 		if err != nil {
 			return fmt.Errorf("failed to initialize metrics storage '%s': %w", metricStorageName, err)
 		}
 		s.metricsFactories[metricStorageName] = metricsFactory
 	}

 	return nil
 	return f, ok
 }

 func (s *storageExt) MetricsFactory(name string) (storage.MetricsFactory, bool) {
 	mf, ok := s.metricsFactories[name]
 	return mf, ok
 }
diff --git a/pkg/prometheus/config/config.go b/pkg/prometheus/config/config.go
 	NormalizeDuration bool
 }

 func (c *Configuration) Validate() error {
 	_, err := govalidator.ValidateStruct(c)
 	return err
 }
diff --git a/plugin/metrics/prometheus/factory.go b/plugin/metrics/prometheus/factory.go
 func NewFactoryWithConfig(
 	cfg config.Configuration,
 	logger *zap.Logger,
 ) (*Factory, error) {
 	if err := cfg.Validate(); err != nil {
 		return nil, err
 	}

 	f := NewFactory()
 	f.options = &Options{
 		Configuration: cfg,
 	}
 	err := f.Initialize(logger)
 	if err != nil {
 		return nil, err
 	}
 	return f, nil
 }

	mqs, err := s.createMetricStorage(host)
	if err != nil {
	return err
Check warning on line 76 in cmd/jaeger/internal/extension/jaegerquery/server.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerquery/server.go#L76 `Added line #L76 was not covered by tests`
	}

	// metricsQueryService, _ := disabled.NewMetricsReader()
	return disabled.NewMetricsReader()
	}

	mf, err := jaegerstorage.GetMetricsFactory(s.config.MetricStorage, host)
	if err != nil {
	return nil, fmt.Errorf("cannot find metrics storage factory: %w", err)
Check warning on line 142 in cmd/jaeger/internal/extension/jaegerquery/server.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerquery/server.go#L140-L142 `Added lines #L140 - L142 were not covered by tests`
	}

	// metricsReader, ok := opts.InitMetricStorage(mf, s.telset.Logger)
	metricsReader, err := mf.CreateMetricsReader()
	if errors.Is(err, storage.ErrMetricStorageNotConfigured) \|\| errors.Is(err, storage.ErrMetricStorageNotSupported) {
	s.telset.Logger.Info("Metric storage not created", zap.String("reason", err.Error()))
	return disabled.NewMetricsReader()
Check warning on line 149 in cmd/jaeger/internal/extension/jaegerquery/server.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerquery/server.go#L146-L149 `Added lines #L146 - L149 were not covered by tests`
	}
	if err != nil {
	s.telset.Logger.Error("Cannot init metric storage reader", zap.Error(err))
	return disabled.NewMetricsReader()
Check warning on line 153 in cmd/jaeger/internal/extension/jaegerquery/server.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerquery/server.go#L151-L153 `Added lines #L151 - L153 were not covered by tests`
	}
	return metricsReader, nil
Check warning on line 155 in cmd/jaeger/internal/extension/jaegerquery/server.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerquery/server.go#L155 `Added line #L155 was not covered by tests`
	}

	func (s server) makeQueryOptions() queryApp.QueryOptions {
	return nil
	}

	func (cfg MetricBackends) Unmarshal(conf confmap.Conf) error {
Check warning on line 110 in cmd/jaeger/internal/extension/jaegerstorage/config.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/config.go#L110 `Added line #L110 was not covered by tests`
	// apply defaults
	if conf.IsSet("prometheus") {
	v := prometheus.DefaultConfig()
	cfg.Prometheus = &v
Check warning on line 114 in cmd/jaeger/internal/extension/jaegerstorage/config.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/config.go#L112-L114 `Added lines #L112 - L114 were not covered by tests`
	}
	return conf.Unmarshal(cfg)
Check warning on line 116 in cmd/jaeger/internal/extension/jaegerstorage/config.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/config.go#L116 `Added line #L116 was not covered by tests`
	}
	}

	// GetMetricsFactory locates the extension in Host and retrieves a metrics factory from it with the given name.
	func GetMetricsFactory(name string, host component.Host) (storage.MetricsFactory, error) {
	var comp component.Component
	for id, ext := range host.GetExtensions() {
	if id.Type() == componentType {
	comp = ext
	break
Check warning on line 73 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L68-L73 `Added lines #L68 - L73 were not covered by tests`
	}
	}
	if comp == nil {
	return nil, fmt.Errorf(
	"cannot find extension '%s' (make sure it's defined earlier in the config)",
	componentType,
	)
Check warning on line 80 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L76-L80 `Added lines #L76 - L80 were not covered by tests`
	}
	mf, ok := comp.(Extension).MetricsFactory(name)
	if !ok {
	return nil, fmt.Errorf(
	"cannot find metric storage '%s' declared by '%s' extension",
	name, componentType,
	)
Check warning on line 87 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L82-L87 `Added lines #L82 - L87 were not covered by tests`
	}
	return mf, nil
Check warning on line 89 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L89 `Added line #L89 was not covered by tests`
	}

	func GetStorageFactoryV2(name string, host component.Host) (spanstore.Factory, error) {
	}

	for metricStorageName, cfg := range s.config.MetricBackends {
	s.telset.Logger.Sugar().Infof("Initializing metrics storage '%s'", metricStorageName)
	var metricsFactory storage.MetricsFactory
	var err error = errors.New("empty configuration")
	if cfg.Prometheus != nil {
	metricsFactory, err = prometheus.NewFactoryWithConfig(*cfg.Prometheus, s.telset.Logger)
Check warning on line 142 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L138-L142 `Added lines #L138 - L142 were not covered by tests`
	}
	if err != nil {
	return fmt.Errorf("failed to initialize metrics storage '%s': %w", metricStorageName, err)
Check warning on line 145 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L144-L145 `Added lines #L144 - L145 were not covered by tests`
	}
	s.metricsFactories[metricStorageName] = metricsFactory
Check warning on line 147 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L147 `Added line #L147 was not covered by tests`
	}

	return nil
	return f, ok
	}

	func (s *storageExt) MetricsFactory(name string) (storage.MetricsFactory, bool) {
	mf, ok := s.metricsFactories[name]
	return mf, ok
Check warning on line 173 in cmd/jaeger/internal/extension/jaegerstorage/extension.go Codecov / codecov/patch cmd/jaeger/internal/extension/jaegerstorage/extension.go#L171-L173 `Added lines #L171 - L173 were not covered by tests`
	}
	NormalizeDuration bool
	}

	func (c *Configuration) Validate() error {
	_, err := govalidator.ValidateStruct(c)
	return err
Check warning on line 41 in pkg/prometheus/config/config.go Codecov / codecov/patch pkg/prometheus/config/config.go#L39-L41 `Added lines #L39 - L41 were not covered by tests`
	}
	func NewFactoryWithConfig(
	cfg config.Configuration,
	logger *zap.Logger,
	) (*Factory, error) {
	if err := cfg.Validate(); err != nil {
	return nil, err
Check warning on line 76 in plugin/metrics/prometheus/factory.go Codecov / codecov/patch plugin/metrics/prometheus/factory.go#L74-L76 `Added lines #L74 - L76 were not covered by tests`
	}

	f := NewFactory()
	f.options = &Options{
	Configuration: cfg,
Check warning on line 81 in plugin/metrics/prometheus/factory.go Codecov / codecov/patch plugin/metrics/prometheus/factory.go#L79-L81 `Added lines #L79 - L81 were not covered by tests`
	}
	err := f.Initialize(logger)
	if err != nil {
	return nil, err
Check warning on line 85 in plugin/metrics/prometheus/factory.go Codecov / codecov/patch plugin/metrics/prometheus/factory.go#L83-L85 `Added lines #L83 - L85 were not covered by tests`
	}
	return f, nil
Check warning on line 87 in plugin/metrics/prometheus/factory.go Codecov / codecov/patch plugin/metrics/prometheus/factory.go#L87 `Added line #L87 was not covered by tests`
	}