[chore][receiver/nginx] Remove stable feature gate (open-telemetry#28659

) Resolves open-telemetry#4326
ycombinator · Oct 28, 2023 · 5de9937 · 5de9937
1 parent 76ab912
commit 5de9937
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 148 deletions.
diff --git a/receiver/nginxreceiver/documentation.md b/receiver/nginxreceiver/documentation.md
@@ -49,17 +49,3 @@ Total number of requests made to the server since it started
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
 | ---- | ----------- | ---------- | ----------------------- | --------- |
 | requests | Sum | Int | Cumulative | true |
-
-### temp.connections_current
-
-Temporary placeholder for old version of nginx.connections_current. See featuregate 'nginx.connections_as_sum'.
-
-| Unit | Metric Type | Value Type |
-| ---- | ----------- | ---------- |
-| connections | Gauge | Int |
-
-#### Attributes
-
-| Name | Description | Values |
-| ---- | ----------- | ------ |
-| state | The state of a connection | Str: ``active``, ``reading``, ``writing``, ``waiting`` |
diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go
@@ -10,24 +10,12 @@ import (
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/config/confighttp"
  "go.opentelemetry.io/collector/consumer"
- "go.opentelemetry.io/collector/featuregate"
  "go.opentelemetry.io/collector/receiver"
  "go.opentelemetry.io/collector/receiver/scraperhelper"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata"
 )
 
-const (
- connectionsAsSum = "receiver.nginx.emitConnectionsCurrentAsSum"
-)
-
-var _ = featuregate.GlobalRegistry().MustRegister(
- connectionsAsSum,
- featuregate.StageStable,
- featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4326"),
- featuregate.WithRegisterToVersion("v0.87.0"),
-)
-
 // NewFactory creates a factory for nginx receiver.
 func NewFactory() receiver.Factory {
  return receiver.NewFactory(

diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod
@@ -15,7 +15,6 @@ require (
  go.opentelemetry.io/collector/config/configtls v0.88.1-0.20231026220224-6405e152a2d9
  go.opentelemetry.io/collector/confmap v0.88.1-0.20231026220224-6405e152a2d9
  go.opentelemetry.io/collector/consumer v0.88.1-0.20231026220224-6405e152a2d9
- go.opentelemetry.io/collector/featuregate v1.0.0-rcv0017.0.20231026220224-6405e152a2d9
  go.opentelemetry.io/collector/pdata v1.0.0-rcv0017.0.20231026220224-6405e152a2d9
  go.opentelemetry.io/collector/receiver v0.88.1-0.20231026220224-6405e152a2d9
  go.uber.org/zap v1.26.0
@@ -83,6 +82,7 @@ require (
  go.opentelemetry.io/collector/config/internal v0.88.1-0.20231026220224-6405e152a2d9 // indirect
  go.opentelemetry.io/collector/extension v0.88.1-0.20231026220224-6405e152a2d9 // indirect
  go.opentelemetry.io/collector/extension/auth v0.88.1-0.20231026220224-6405e152a2d9 // indirect
+ go.opentelemetry.io/collector/featuregate v1.0.0-rcv0017.0.20231026220224-6405e152a2d9 // indirect
  go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
  go.opentelemetry.io/otel v1.19.0 // indirect
  go.opentelemetry.io/otel/metric v1.19.0 // indirect

diff --git a/receiver/nginxreceiver/internal/metadata/generated_config.go b/receiver/nginxreceiver/internal/metadata/generated_config.go
diff --git a/receiver/nginxreceiver/internal/metadata/generated_config_test.go b/receiver/nginxreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics.go b/receiver/nginxreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go b/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/nginxreceiver/internal/metadata/temporary_metrics.go b/receiver/nginxreceiver/internal/metadata/temporary_metrics.go
diff --git a/receiver/nginxreceiver/internal/metadata/testdata/config.yaml b/receiver/nginxreceiver/internal/metadata/testdata/config.yaml
@@ -9,8 +9,6 @@ all_set:
  enabled: true
  nginx.requests:
  enabled: true
- temp.connections_current:
- enabled: true
 none_set:
  metrics:
  nginx.connections_accepted:
@@ -21,5 +19,3 @@ none_set:
  enabled: false
  nginx.requests:
  enabled: false
- temp.connections_current:
- enabled: false
diff --git a/receiver/nginxreceiver/metadata.yaml b/receiver/nginxreceiver/metadata.yaml
@@ -55,12 +55,3 @@ metrics:
  monotonic: false
  aggregation_temporality: cumulative
  attributes: [state]
-
-# Old version of metric, to be removed when featuregate is stable
- temp.connections_current:
- enabled: true # must be enabled by default in order to apply necessary MetricBuilder option
- description: Temporary placeholder for old version of nginx.connections_current. See featuregate 'nginx.connections_as_sum'.
- unit: connections
- gauge:
- value_type: int
- attributes: [state]
diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go
@@ -31,7 +31,7 @@ func newNginxScraper(
  settings receiver.CreateSettings,
  cfg *Config,
 ) *nginxScraper {
- mb := metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings, metadata.WithCurrentConnectionsAsGaugeDisabled())
+ mb := metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings)
  return &nginxScraper{
  settings: settings.TelemetrySettings,
  cfg: cfg,