Merge branch 'v3' into fix-panic-with-multiple-logs

Author: aphralG

internal/collector/nginxplusreceiver/scraper.go

@@ -46,6 +46,7 @@ type NginxPlusScraper struct {
 	logger                        *zap.Logger
 	settings                      receiver.Settings
 	init                          sync.Once
+	previousHTTPRequestsTotal     uint64
 }
 
 type ResponseStatuses struct {
@@ -107,6 +108,8 @@ func (nps *NginxPlusScraper) Scrape(ctx context.Context) (pmetric.Metrics, error
 			nps.logger.Error("Failed to get stats from plus API", zap.Error(err))
 			return
 		}
+
+		nps.previousHTTPRequestsTotal = stats.HTTPRequests.Total
 		nps.createPreviousServerZoneResponses(stats)
 		nps.createPreviousLocationZoneResponses(stats)
 	})
@@ -194,7 +197,10 @@ func (nps *NginxPlusScraper) recordMetrics(stats *plusapi.Stats) {
 
 	// HTTP Requests
 	nps.mb.RecordNginxHTTPRequestsDataPoint(now, int64(stats.HTTPRequests.Total), "", 0)
-	nps.mb.RecordNginxHTTPRequestCountDataPoint(now, int64(stats.HTTPRequests.Current))
+
+	requestsDiff := int64(stats.HTTPRequests.Total) - int64(nps.previousHTTPRequestsTotal)
+	nps.mb.RecordNginxHTTPRequestCountDataPoint(now, requestsDiff)
+	nps.previousHTTPRequestsTotal = stats.HTTPRequests.Total
 
 	nps.recordCacheMetrics(stats, now)
 	nps.recordHTTPLimitMetrics(stats, now)

internal/collector/nginxplusreceiver/scraper_test.go

@@ -58,6 +58,8 @@ func TestScraper(t *testing.T) {
 		},
 	}
 
+	scraper.previousHTTPRequestsTotal = 3
+
 	actualMetrics, err := scraper.Scrape(context.Background())
 	require.NoError(t, err)
 

internal/collector/nginxplusreceiver/testdata/expected.yaml

@@ -295,7 +295,7 @@ resourceMetrics:
             gauge:
               aggregationTemporality: 2
               dataPoints:
-                - asInt: "3"
+                - asInt: "44"
                   timeUnixNano: "1000000"
               isMonotonic: true
             unit: requests

scripts/packages/postremove.sh

@@ -24,30 +24,46 @@ cleanup() {
     rm -rf "/var/run/nginx-agent"
 }
 
+full_cleanup() {
+    echo "Purging all nginx-agent data"
+    cleanup
+    rm -rf "/etc/nginx-agent"
+    rm -rf "/var/log/nginx-agent"
+    rm -rf "/var/lib/nginx-agent"
+}
+
 case "$ID" in
     debian|ubuntu)
-        if [ "$1" = "remove" ]; then
-            stop_agent_systemd
-            disable_agent_systemd
-            systemd_daemon_reload
-            cleanup
-        fi
+        case "$1" in
+            remove)
+                stop_agent_systemd
+                disable_agent_systemd
+                systemd_daemon_reload
+                cleanup
+                ;;
+            purge)
+                stop_agent_systemd
+                disable_agent_systemd
+                systemd_daemon_reload
+                full_cleanup
+                ;;
+        esac
         ;;
     rhel|fedora|centos|amzn|almalinux|rocky)
         if [ "$1" = "0" ]; then
             stop_agent_systemd
             disable_agent_systemd
             systemd_daemon_reload
-            cleanup
+            full_cleanup
         fi
         ;;
     alpine)
-        cleanup
+        full_cleanup
         ;;
     *)
         stop_agent_systemd
         disable_agent_systemd
         systemd_daemon_reload
-        cleanup
+        full_cleanup
         ;;
 esac