address PR feedback

Author: aphralG

internal/collector/nginxossreceiver/internal/scraper/stubstatus/stub_status_scraper_test.go

@@ -39,6 +39,12 @@ func TestStubStatusScraper(t *testing.T) {
 	err := stubStatusScraper.Start(context.Background(), componenttest.NewNopHost())
 	require.NoError(t, err)
 
+	_, err = stubStatusScraper.Scrape(context.Background())
+	require.NoError(t, err)
+
+	// To test the nginx.http.request.count metric calculation we need to set the previousRequests and
+	// call scrape a second time as the first time it is called the previous requests is set using the API
+	stubStatusScraper.previousRequests = 31070460
 	actualMetrics, err := stubStatusScraper.Scrape(context.Background())
 	require.NoError(t, err)
 

internal/collector/nginxossreceiver/internal/scraper/stubstatus/testdata/expected.yaml

@@ -64,7 +64,7 @@ resourceMetrics:
             gauge:
               aggregationTemporality: 2
               dataPoints:
-                - asInt: "0"
+                - asInt: "5"
                   timeUnixNano: "1000000"
               isMonotonic: true
             unit: requests

internal/collector/nginxplusreceiver/scraper_test.go

@@ -30,6 +30,32 @@ func TestScraper(t *testing.T) {
 	scraper, err := newNginxPlusScraper(receivertest.NewNopSettings(), cfg)
 	require.NoError(t, err)
 
+	_, err = scraper.scrape(context.Background())
+	require.NoError(t, err)
+
+	// To test the nginx.http.response.count metric calculation we need to set the previousLocationZoneResponses &
+	// previousSeverZoneResponses then call scrape a second time as the first time it is called the previous responses
+	// are set using the API
+	scraper.previousLocationZoneResponses = map[string]ResponseStatuses{
+		"location_test": {
+			oneHundredStatusRange:   3,  // 4
+			twoHundredStatusRange:   29, // 2
+			threeHundredStatusRange: 0,
+			fourHundredStatusRange:  1, // 2
+			fiveHundredStatusRange:  0,
+		},
+	}
+
+	scraper.previousServerZoneResponses = map[string]ResponseStatuses{
+		"test": {
+			oneHundredStatusRange:   3, // 2
+			twoHundredStatusRange:   0, // 29
+			threeHundredStatusRange: 0,
+			fourHundredStatusRange:  1, // 1
+			fiveHundredStatusRange:  0,
+		},
+	}
+
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)
 

internal/collector/nginxplusreceiver/testdata/expected.yaml

@@ -2137,7 +2137,7 @@ resourceMetrics:
             gauge:
               aggregationTemporality: 2
               dataPoints:
-                - asInt: "0"
+                - asInt: "2"
                   attributes:
                     - key: nginx.status_range
                       value:
@@ -2148,7 +2148,7 @@ resourceMetrics:
                     - key: nginx.zone.type
                       value:
                         stringValue: SERVER
-                - asInt: "0"
+                - asInt: "29"
                   attributes:
                     - key: nginx.status_range
                       value:
@@ -2170,7 +2170,7 @@ resourceMetrics:
                     - key: nginx.zone.type
                       value:
                         stringValue: SERVER
-                - asInt: "0"
+                - asInt: "1"
                   attributes:
                     - key: nginx.status_range
                       value:
@@ -2192,7 +2192,7 @@ resourceMetrics:
                     - key: nginx.zone.type
                       value:
                         stringValue: SERVER
-                - asInt: "0"
+                - asInt: "4"
                   attributes:
                     - key: nginx.status_range
                       value:
@@ -2203,7 +2203,7 @@ resourceMetrics:
                     - key: nginx.zone.type
                       value:
                         stringValue: LOCATION
-                - asInt: "0"
+                - asInt: "2"
                   attributes:
                     - key: nginx.status_range
                       value:
@@ -2225,7 +2225,7 @@ resourceMetrics:
                     - key: nginx.zone.type
                       value:
                         stringValue: LOCATION
-                - asInt: "0"
+                - asInt: "2"
                   attributes:
                     - key: nginx.status_range
                       value: