some cleanup

middleware-labs · Dec 12, 2024 · 3085c04 · 3085c04
1 parent c4e660e
commit 3085c04
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 71 deletions.
diff --git a/receiver/nginxreceiver/documentation.md b/receiver/nginxreceiver/documentation.md
@@ -114,9 +114,9 @@ The number of responses with 1xx status code.
 
 The number of responses with 2xx status code.
 
-| Unit | Metric Type | Value Type |
-| ---- | ----------- | ---------- |
-| response | Gauge | Int |
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
+| ---- | ----------- | ---------- | ----------------------- | --------- |
+| response | Sum | Int | Cumulative | true |
 
 #### Attributes
 
@@ -142,9 +142,9 @@ The number of responses with 3xx status code.
 
 The number of responses with 4xx status code.
 
-| Unit | Metric Type | Value Type |
-| ---- | ----------- | ---------- |
-| response | Gauge | Int |
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
+| ---- | ----------- | ---------- | ----------------------- | --------- |
+| response | Sum | Int | Cumulative | true |
 
 #### Attributes
 
@@ -156,9 +156,9 @@ The number of responses with 4xx status code.
 
 The number of responses with 5xx status code.
 
-| Unit | Metric Type | Value Type |
-| ---- | ----------- | ---------- |
-| response | Gauge | Int |
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
+| ---- | ----------- | ---------- | ----------------------- | --------- |
+| response | Sum | Int | Cumulative | true |
 
 #### Attributes
 

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/metadata.yaml b/receiver/nginxreceiver/metadata.yaml
@@ -37,7 +37,7 @@ metrics:
       value_type: int
       monotonic: true
       aggregation_temporality: cumulative
-    attributes: []
+    attributes: [] 
   nginx.connections_accepted:
     enabled: true
     description: The total number of accepted client connections
@@ -120,11 +120,12 @@ metrics:
     attributes:
       - serverzone_name
     description: The number of responses with 2xx status code.
-    gauge:
+    sum:
       value_type: int
+      monotonic: true
+      aggregation_temporality: cumulative
     unit:
       response 
-
   nginx.server_zone.responses.3xx:
     enabled: true
     attributes:
@@ -140,21 +141,23 @@ metrics:
     attributes:
       - serverzone_name
     description: The number of responses with 4xx status code.
-    gauge:
+    sum:
       value_type: int
+      monotonic: true
+      aggregation_temporality: cumulative
     unit:
       response
-
   nginx.server_zone.responses.5xx:
     enabled: true
     attributes:
       - serverzone_name
     description: The number of responses with 5xx status code.
-    gauge:
+    sum:
       value_type: int
+      monotonic: true
+      aggregation_temporality: cumulative
     unit:
       response
-
   nginx.server_zone.received:
     enabled: true
     attributes:
@@ -165,7 +168,6 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     unit: By 
-
   nginx.server_zone.sent:
     enabled: true
     attributes:
@@ -176,12 +178,6 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     unit: By 
-
-  ### Request and Traffic
-# - `nginx.upstream.peers.requests` - Number of requests made to upstream servers
-# - `nginx.upstream.peers.received` - Bytes received from upstream servers
-# - `nginx.upstream.peers.sent` - Bytes sent to upstream servers
-
   nginx.upstream.peers.requests:
     enabled: true
     attributes:
@@ -193,7 +189,6 @@ metrics:
       monotonic:  true
       aggregation_temporality: cumulative
     unit: requests
-
   nginx.upstream.peers.received:
     enabled: true
     attributes:
@@ -218,13 +213,6 @@ metrics:
       aggregation_temporality: cumulative
     unit: By
 
-  ### Response Codes
-# - `nginx.upstream.peers.responses.1xx` - Number of responses from upstream with 1xx status codes
-# - `nginx.upstream.peers.responses.2xx` - Number of responses from upstream with 2xx status codes
-# - `nginx.upstream.peers.responses.3xx` - Number of responses from upstream with 3xx status codes
-# - `nginx.upstream.peers.responses.4xx` - Number of responses from upstream with 4xx status codes
-# - `nginx.upstream.peers.responses.5xx` - Number of responses from upstream with 5xx status codes
-
   nginx.upstream.peers.responses.1xx:
     enabled: true
     attributes:
@@ -248,7 +236,7 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     unit: responses
-  
+
   nginx.upstream.peers.responses.3xx:
     enabled: true
     attributes:
@@ -272,7 +260,7 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     unit: responses
-  
+
   nginx.upstream.peers.responses.5xx:
     enabled: true
     attributes:
@@ -284,11 +272,6 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     unit: responses
-
-  ### Server Configuration
-# - `nginx.upstream.peers.weight` - Weight of upstream server
-# - `nginx.upstream.peers.backup` - Whether upstream server is a backup server
-# - `nginx.upstream.peers.health_checks.last_passed` - Status of last health check for upstream server
 
   nginx.upstream.peers.weight:
     enabled: true

diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go
@@ -14,7 +14,6 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 	"go.uber.org/zap"
 
-	"github.com/k0kubun/pp"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata"
 )
 
@@ -50,7 +49,6 @@ func (r *nginxScraper) start(ctx context.Context, host component.Host) error {
 }
 
 func (r *nginxScraper) scrape(context.Context) (pmetric.Metrics, error) {
-	// Init client in scrape method in case there are transient errors in the constructor.
 	if r.client == nil {
 		var err error
 		r.client, err = NewNginxClient(r.httpClient, r.cfg.ClientConfig.Endpoint, r.cfg.VTSEndpoint)
@@ -74,8 +72,6 @@ func (r *nginxScraper) scrape(context.Context) (pmetric.Metrics, error) {
 		return pmetric.Metrics{}, err
 	}
 
-	// pp.Println(vtsStats)
-
 	now := pcommon.NewTimestampFromTime(time.Now())
 
 	r.recordVtsStats(now, vtsStats)
@@ -182,8 +178,6 @@ func (r *nginxScraper) recordTimingStats(now pcommon.Timestamp, vtsStats *NginxV
 
 	for upstreamZones, v := range vtsStats.UpstreamZones {
 		for _, val := range v {
-			pp.Println(val.Server)
-			pp.Println(val.ResponseMsec)
 
 			r.mb.RecordNginxUpstreamPeersResponseTimeDataPoint(
 				now, val.ResponseMsec, upstreamZones, val.Server,