Merge branch 'v3' into collector-tokenpath

Author: john-david3

.github/workflows/ci.yml

@@ -306,23 +306,3 @@ jobs:
       - name: Push load test result
         if:  ${{ success() && github.ref_name == 'v3'}}
         run: git push 'https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/nginx/agent.git' benchmark-results:benchmark-results
-
-  publish-packages:
-    name: Publish NGINX Agent v3 packages
-    if: ${{ github.ref_name == 'v3' &&
-      !github.event.pull_request.head.repo.fork }}
-    needs: [ lint, unit-test, performance-tests,
-             load-tests, official-oss-image-integration-tests,
-             official-plus-image-integration-tests,
-             race-condition-test, integration-tests ]
-    uses: ./.github/workflows/release-branch.yml
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      packageVersion: "3.0.0"
-      packageBuildNo: "${{ github.run_number }}"
-      uploadAzure: true
-      publishPackages: true
-      releaseBranch: "v3"

.github/workflows/release-branch.yml

@@ -39,35 +39,6 @@ on:
         description: 'Location to publish packages to'
         required: false
         default: "https://up-ap.nginx.com"
-  workflow_call:
-    inputs:
-      githubRelease:
-        type: boolean
-        default: false
-      packageVersion:
-        type: string
-        default: "3.0.0"
-      packageBuildNo:
-        type: string
-        default: "1"
-      uploadAzure:
-        type: boolean
-        default: true
-      publishPackages:
-        type: boolean
-        default: true
-      tagRelease:
-        type: boolean
-        default: false
-      createPullRequest:
-        type: boolean
-        default: false
-      releaseBranch:
-        type: string
-        required: true
-      uploadUrl:
-        type: string
-        default: "https://up-ap.nginx.com"
 
 env:
   NFPM_VERSION: 'v2.35.3'

internal/collector/nginxplusreceiver/factory.go

@@ -9,13 +9,17 @@ import (
 	"errors"
 	"time"
 
+	"go.opentelemetry.io/collector/scraper"
+	"go.opentelemetry.io/collector/scraper/scraperhelper"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
 )
 
+// nolint: ireturn
 const defaultTimeout = 10 * time.Second
 
 // nolint: ireturn
@@ -43,6 +47,19 @@ func createMetricsReceiver(
 	}
 
 	nps := newNginxPlusScraper(params, cfg)
+	npsMetrics, npsMetricsError := scraper.NewMetrics(
+		nps.Scrape,
+		scraper.WithStart(nps.Start),
+		scraper.WithShutdown(nps.Shutdown),
+	)
+	if npsMetricsError != nil {
+		return nil, npsMetricsError
+	}
 
-	return nps, nil
+	return scraperhelper.NewMetricsController(
+		&cfg.ControllerConfig,
+		params,
+		metricsConsumer,
+		scraperhelper.AddScraper(metadata.Type, npsMetrics),
+	)
 }

internal/config/types.go

@@ -231,7 +231,7 @@ type (
 	}
 
 	ContainerMetricsReceiver struct {
-		CollectionInterval time.Duration `yaml:"-" mapstructure:"collection_interval"`
+		CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
 	}
 
 	HostMetrics struct {

internal/watcher/instance/nginx_process_parser.go

@@ -136,6 +136,8 @@ func (npp *NginxProcessParser) getInfo(ctx context.Context, proc *nginxprocess.P
 		}
 	}
 
+	confPath := getConfPathFromCommand(proc.Cmd)
+
 	var nginxInfo *Info
 
 	outputBuffer, err := npp.executer.RunCmd(ctx, exePath, "-V")
@@ -148,6 +150,10 @@ func (npp *NginxProcessParser) getInfo(ctx context.Context, proc *nginxprocess.P
 	nginxInfo.ExePath = exePath
 	nginxInfo.ProcessID = proc.PID
 
+	if nginxInfo.ConfPath = getNginxConfPath(ctx, nginxInfo); confPath != "" {
+		nginxInfo.ConfPath = confPath
+	}
+
 	loadableModules := getLoadableModules(nginxInfo)
 	nginxInfo.LoadableModules = loadableModules
 
@@ -268,7 +274,6 @@ func parseNginxVersionCommandOutput(ctx context.Context, output *bytes.Buffer) *
 	}
 
 	nginxInfo.Prefix = getNginxPrefix(ctx, nginxInfo)
-	nginxInfo.ConfPath = getNginxConfPath(ctx, nginxInfo)
 
 	return nginxInfo
 }
@@ -392,3 +397,17 @@ func convertToMap(processes []*nginxprocess.Process) map[int32]*nginxprocess.Pro
 
 	return processesByPID
 }
+
+func getConfPathFromCommand(command string) string {
+	commands := strings.Split(command, " ")
+
+	for i, command := range commands {
+		if command == "-c" {
+			if i < len(commands)-1 {
+				return commands[i+1]
+			}
+		}
+	}
+
+	return ""
+}

internal/watcher/instance/nginx_process_parser_test.go

@@ -616,3 +616,14 @@ func TestNginxProcessParser_GetExe(t *testing.T) {
 		})
 	}
 }
+
+func TestGetConfigPathFromCommand(t *testing.T) {
+	result := getConfPathFromCommand("nginx: master process nginx -c /tmp/nginx.conf")
+	assert.Equal(t, "/tmp/nginx.conf", result)
+
+	result = getConfPathFromCommand("nginx: master process nginx -c")
+	assert.Equal(t, "", result)
+
+	result = getConfPathFromCommand("")
+	assert.Equal(t, "", result)
+}

pkg/files/file_helpers.go

@@ -8,15 +8,15 @@ package files
 
 import (
 	"cmp"
+	"crypto/sha256"
 	"crypto/x509"
+	"encoding/base64"
 	"fmt"
 	"net"
 	"os"
 	"slices"
 	"strconv"
 
-	"github.com/google/uuid"
-
 	mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
 	"github.com/nginx/agent/v3/internal/datasource/cert"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -135,7 +135,10 @@ func GenerateConfigVersion(fileSlice []*mpi.File) string {
 
 // GenerateHash returns the hash value of a file's contents.
 func GenerateHash(b []byte) string {
-	return uuid.NewMD5(uuid.Nil, b).String()
+	hash := sha256.New()
+	hash.Write(b)
+
+	return base64.StdEncoding.EncodeToString(hash.Sum(nil))
 }
 
 // ConvertToMapOfFiles converts a list of files to a map of files with the file name as the key

pkg/files/file_helpers_test.go

@@ -6,12 +6,13 @@
 package files
 
 import (
+	"crypto/sha256"
 	"crypto/x509"
+	"encoding/base64"
 	"net"
 	"os"
 	"testing"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -136,6 +137,10 @@ func Test_GenerateConfigVersion(t *testing.T) {
 }
 
 func TestGenerateHash(t *testing.T) {
+	hash1 := sha256.New()
+	hash2 := sha256.New()
+	hash1.Write([]byte(""))
+	hash2.Write([]byte("test"))
 	tests := []struct {
 		name     string
 		expected string
@@ -144,12 +149,12 @@ func TestGenerateHash(t *testing.T) {
 		{
 			name:     "Test 1: empty byte slice",
 			input:    []byte{},
-			expected: uuid.NewMD5(uuid.Nil, []byte("")).String(),
+			expected: base64.StdEncoding.EncodeToString(hash1.Sum(nil)),
 		},
 		{
 			name:     "Test 2: non-empty byte slice",
 			input:    []byte("test"),
-			expected: uuid.NewMD5(uuid.Nil, []byte("test")).String(),
+			expected: base64.StdEncoding.EncodeToString(hash2.Sum(nil)),
 		},
 	}
 

test/mock/collector/nginx-agent.conf

@@ -28,14 +28,15 @@ allowed_directories:
     - /var/run/nginx
 
 client:
-  timeout: 10s
+  http:
+    timeout: 10s
 
 collector:
   log:
     level: DEBUG
   receivers:
     container_metrics:
-        collection_interval: 10s
+      collection_interval: 1m0s
     host_metrics:
       collection_interval: 1m0s
       initial_delay: 1s
@@ -49,9 +50,8 @@ collector:
       - server:
           host: "127.0.0.1"
           port: 4317
-          type: 0
         auth:
-          Token: secret-receiver-token
+          token: secret-receiver-token
         tls:
           server_name: test-local-server
           ca: /tmp/ca.pem