Revert the renaming from "endpoint" to "metrics_endpoint" for consist…

…ency

pkg/backends/otlp/backend.go

@@ -32,7 +32,7 @@ type Backend struct {
  droppedMetrics uint64
  droppedEvents uint64
 
- metricsEndpoint string
+ endpoint  string
  logsEndpoint string
  convertTimersToGauges bool
  is data.InstrumentationScope
@@ -63,7 +63,7 @@ func NewClientFromViper(v *viper.Viper, logger logrus.FieldLogger, pool *transpo
  }
 
  return &Backend{
- metricsEndpoint: cfg.MetricsEndpoint,
+ endpoint:  cfg.Endpoint,
  logsEndpoint: cfg.LogsEndpoint,
  convertTimersToGauges: cfg.Conversion == ConversionAsGauge,
  is: data.NewInstrumentationScope("gostatsd/aggregation", version),
@@ -254,7 +254,7 @@ func (bd *Backend) SendMetricsAsync(ctx context.Context, mm *gostatsd.MetricMap,
  err := bd.postMetrics(ctx, group.Values())
  if err != nil {
  bd.logger.WithError(err).WithFields(logrus.Fields{
- "metricsEndpoint": bd.metricsEndpoint,
+ "endpoint": bd.endpoint,
  }).Error("Issues trying to submit data")
  }
  cb(multierr.Errors(err))
@@ -266,7 +266,7 @@ func (c *Backend) postMetrics(ctx context.Context, resourceMetrics []data.Resour
  statser.Gauge("backend.dropped", float64(atomic.LoadUint64(&c.droppedMetrics)), nil)
  }()
 
- req, err := data.NewMetricsRequest(ctx, c.metricsEndpoint, resourceMetrics)
+ req, err := data.NewMetricsRequest(ctx, c.endpoint, resourceMetrics)
  if err != nil {
  atomic.AddUint64(&c.droppedMetrics, uint64(len(resourceMetrics)))
  return err

pkg/backends/otlp/backend_test.go

@@ -268,7 +268,7 @@ func TestBackendSendAsyncMetrics(t *testing.T) {
  t.Cleanup(s.Close)
 
  v := viper.New()
- v.Set("otlp.metrics_endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/metrics"))
+ v.Set("otlp.endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/metrics"))
  v.Set("otlp.logs_endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/logs"))
  if tc.enableHistograms {
  v.Set("otlp.conversion", ConversionAsHistogram)
@@ -350,7 +350,7 @@ func TestSendEvent(t *testing.T) {
  t.Cleanup(s.Close)
 
  v := viper.New()
- v.Set("otlp.metrics_endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/metrics"))
+ v.Set("otlp.endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/metrics"))
  v.Set("otlp.logs_endpoint", fmt.Sprintf("%s/%s", s.URL, "v1/logs"))
  for k, vv := range tc.configMap {
  v.Set(k, vv)

pkg/backends/otlp/config.go

@@ -18,9 +18,9 @@ const (
 
 type Config struct {
  gostatsd.TimerSubtypes `mapstructure:"disabled_timer_aggregations"`
- // MetricsEndpoint (Required) is the FQDN with path for the metrics ingestion metricsEndpoint
- MetricsEndpoint string `mapstructure:"metrics_endpoint"`
- // LogsEndpoint (Required) is the FQDN with path for the logs ingestion metricsEndpoint
+ // Endpoint (Required) is the FQDN with path for the metrics ingestion endpoint
+ Endpoint string `mapstructure:"endpoint"`
+ // LogsEndpoint (Required) is the FQDN with path for the logs ingestion endpoint
  LogsEndpoint string `mapstructure:"logs_endpoint"`
  // MaxRequests (Optional, default: cpu.count * 2) is the upper limit on the number of inflight requests
  MaxRequests int `mapstructure:"max_requests"`
@@ -74,7 +74,7 @@ func NewConfig(v *viper.Viper) (*Config, error) {
 }
 
 func (c *Config) Validate() (errs error) {
- if c.MetricsEndpoint == "" {
+ if c.Endpoint == "" {
  errs = multierr.Append(errs, errors.New("no metrics endpoint defined"))
  }
  if c.LogsEndpoint == "" {

pkg/backends/otlp/config_test.go

@@ -26,18 +26,18 @@ func TestNewConfig(t *testing.T) {
  name: "min configuration defined",
  v: func() *viper.Viper {
  v := viper.New()
- v.SetDefault("otlp.metrics_endpoint", "http://local/v1/metrics")
+ v.SetDefault("otlp.endpoint", "http://local/v1/metrics")
  v.SetDefault("otlp.logs_endpoint", "http://local/v1/logs")
  v.SetDefault("otlp.max_requests", 1)
  return v
  }(),
  expect: &Config{
- MetricsEndpoint: "http://local/v1/metrics",
- LogsEndpoint:  "http://local/v1/logs",
- MaxRequests:  1,
- Conversion:  "AsGauge",
- Transport:  "default",
- UserAgent:  "gostatsd",
+ Endpoint:  "http://local/v1/metrics",
+ LogsEndpoint: "http://local/v1/logs",
+ MaxRequests: 1,
+ Conversion: "AsGauge",
+ Transport: "default",
+ UserAgent: "gostatsd",
  },
  errVal: "",
  },

pkg/backends/otlp/testdata/all-options.toml

@@ -1,5 +1,5 @@
 [ otlp ]
-metrics_endpoint = 'an-example-of-an-awesome-hostname/with/path/to/otlp/metric/endpoint'
+endpoint = 'an-example-of-an-awesome-hostname/with/path/to/otlp/metric/endpoint'
 logs_endpoint = 'an-example-of-an-awesome-hostname/with/path/to/otlp/logs/endpoint'
 max_requests = 7
 resource_keys = [ 'service.name', 'service.version', 'deployment.environment']

pkg/backends/otlp/testdata/metrics_endpoint_only.toml

@@ -1,2 +1,2 @@
 [otlp]
-metrics_endpoint='my-example-of-a-metrics-endpoint'
+endpoint='my-example-of-a-metrics-endpoint'

pkg/backends/otlp/testdata/minimal.toml

@@ -1,3 +1,3 @@
 [otlp]
-metrics_endpoint='my-example-of-a-metrics-endpoint'
+endpoint='my-example-of-a-metrics-endpoint'
 logs_endpoint='my-example-of-a-logs-endpoint'