Merge remote-tracking branch 'origin/main' into update-mock-collector-grafana-dashboards

Author: NutsaB

.github/workflows/ci.yml

@@ -90,8 +90,6 @@ jobs:
     strategy:
       matrix:
         container:
-        - image: "ubuntu"
-          version: "22.04"
         - image: "redhatenterprise"
           version: "9"
         - image: "alpine"

.github/workflows/release-branch.yml

@@ -85,6 +85,8 @@ jobs:
     name: Update Release Draft
     runs-on: ubuntu-22.04
     needs: [vars]
+    permissions:
+      contents: write
     outputs:
       release_id: ${{ steps.vars.outputs.RELEASE_ID }}
     steps:
@@ -104,6 +106,7 @@ jobs:
           version: ${{ inputs.packageVersion }}
         with:
           script: |
+            const ref = context.ref.split("/")[2]
             const {version} = process.env
             console.log(`The release version is v${version}`)
 
@@ -181,6 +184,8 @@ jobs:
     name: Tag Release
     runs-on: ubuntu-22.04
     needs: [vars,release-draft]
+    permissions:
+      contents: write
     steps:
       - name: Checkout Repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -205,7 +210,7 @@ jobs:
     needs: [vars,release-draft,tag-release]
     permissions:
       id-token: write
-      contents: read
+      contents: write
     steps:
       - name: Checkout Repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -327,6 +332,8 @@ jobs:
     name: Merge release branch back into V3 branch
     runs-on: ubuntu-22.04
     needs: [vars,tag-release]
+    permissions:
+      pull-requests: write
     steps:
       - name: Checkout Repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2

Makefile

@@ -49,7 +49,7 @@ $(shell mkdir -p $(DIRS))
 VERSION 		?= "v3.0.0"
 COMMIT  		= $(shell git rev-parse --short HEAD)
 DATE    		= $(shell date +%F_%H-%M-%S)
-LDFLAGS 		= "-w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
+LDFLAGS 		= "-s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
 DEBUG_LDFLAGS 	= "-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
 
 OSS_PACKAGES_REPO 	:= "packages.nginx.org"
@@ -114,8 +114,9 @@ no-local-changes:
 	git diff --quiet || { echo "Dependency changes detected. Please commit these before pushing." >&2; exit 1; }
 
 build: ## Build agent executable
+	@echo "🏗️ Building"
 	mkdir -p $(BUILD_DIR)
-	@GOARCH=$(OSARCH) $(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) -pgo=default.pgo -ldflags=$(LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
+	GOARCH=$(OSARCH) $(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) -pgo=default.pgo -ldflags=$(LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
 	@echo "📦 Build Done"
 
 lint: ## Run linter
@@ -180,7 +181,7 @@ run: build ## Run code
 
 dev: ## Run agent executable
 	@echo "🚀 Running App"
-	$(GORUN) -ldflags=$(LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
+	$(GORUN) -ldflags=$(DEBUG_LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
 
 race-condition-dev: ## Run agent executable with race condition detection
 	@echo "🏎️ Running app with race condition detection enabled"

Makefile.packaging

@@ -213,4 +213,3 @@ gpg-key: ## Generate GPG public key
 release: ## Publish tarball to the UPLOAD_URL
 	echo "Publishing nginx-agent packages to ${UPLOAD_URL}"; \
 	curl -XPOST --fail -F "file=@$(PACKAGES_DIR)/$(TARBALL_NAME)" -H "Token: ${TOKEN}" ${UPLOAD_URL}; \
-	curl -XPOST --fail -F "file=@$(GPG_PUBLIC_KEY)" -H "Token: ${TOKEN}" ${UPLOAD_URL}; \

README.md

@@ -24,7 +24,7 @@ The following packages need to be installed:
 ```
 git clone https://github.com/open-telemetry/opentelemetry-collector.git
 cd opentelemetry-collector
-git checkout v0.114.0
+git checkout v0.124.0
 cd cmd/mdatagen
 go install
 ```

api/grpc/mpi/v1/command.pb.go

@@ -65,7 +65,7 @@ message HostInfo {
     // The host identifier
     string host_id = 1 [(buf.validate.field).string.uuid = true];
     // The name of the host
-    string hostname = 2 [(buf.validate.field).string.address = true];
+    string hostname = 2;
     // Release information of the host
     ReleaseInfo release_info = 3;
 }
@@ -89,7 +89,7 @@ message ContainerInfo {
     // The identifier of the container
     string container_id = 1 [(buf.validate.field).string.uuid = true];
     // The name of the host
-    string hostname = 2 [(buf.validate.field).string.address = true];
+    string hostname = 2;
     // Release information of the container
     ReleaseInfo release_info = 3;
 }

api/grpc/mpi/v1/command.proto

@@ -7,6 +7,7 @@ package accesslog
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 	"sync"
@@ -42,7 +43,7 @@ type (
 		logger    *zap.Logger
 		mb        *metadata.MetricsBuilder
 		rb        *metadata.ResourceBuilder
-		pipe      *pipeline.DirectedPipeline
+		pipes     []*pipeline.DirectedPipeline
 		wg        *sync.WaitGroup
 		cancel    context.CancelFunc
 		entries   []*entry.Entry
@@ -103,20 +104,27 @@ func (nls *NginxLogScraper) ID() component.ID {
 	return component.NewID(metadata.Type)
 }
 
+// nolint: unparam
 func (nls *NginxLogScraper) Start(parentCtx context.Context, _ component.Host) error {
 	nls.logger.Info("NGINX access log scraper started")
 	ctx, cancel := context.WithCancel(parentCtx)
 	nls.cancel = cancel
 
-	var err error
-	nls.pipe, err = nls.initStanzaPipeline(nls.operators, nls.logger)
-	if err != nil {
-		return fmt.Errorf("init stanza pipeline: %w", err)
+	for _, op := range nls.operators {
+		nls.logger.Info("Initializing NGINX access log scraper pipeline", zap.Any("operator_id", op.ID()))
+		pipe, err := nls.initStanzaPipeline([]operator.Config{op}, nls.logger)
+		if err != nil {
+			nls.logger.Error("Error initializing pipeline", zap.Any("operator_id", op.ID()), zap.Any("error", err))
+			continue
+		}
+		nls.pipes = append(nls.pipes, pipe)
 	}
 
-	startError := nls.pipe.Start(storage.NewNopClient())
-	if startError != nil {
-		return fmt.Errorf("stanza pipeline start: %w", startError)
+	for _, pipe := range nls.pipes {
+		startError := pipe.Start(storage.NewNopClient())
+		if startError != nil {
+			nls.logger.Error("Error starting pipeline", zap.Any("error", startError))
+		}
 	}
 
 	nls.wg.Add(1)
@@ -206,7 +214,14 @@ func (nls *NginxLogScraper) Shutdown(_ context.Context) error {
 	}
 	nls.wg.Wait()
 
-	return nls.pipe.Stop()
+	var err error
+	for _, pipe := range nls.pipes {
+		if stopErr := pipe.Stop(); stopErr != nil {
+			err = errors.Join(err, stopErr)
+		}
+	}
+
+	return err
 }
 
 func (nls *NginxLogScraper) initStanzaPipeline(

default.pgo

@@ -82,15 +82,6 @@ func TestAccessLogScraper(t *testing.T) {
 		pmetrictest.IgnoreResourceAttributeValue("instance.id")))
 }
 
-func TestAccessLogScraperError(t *testing.T) {
-	t.Run("include config missing", func(tt *testing.T) {
-		logScraper := NewScraper(receivertest.NewNopSettings(component.Type{}), &config.Config{})
-		err := logScraper.Start(context.Background(), componenttest.NewNopHost())
-		require.Error(tt, err)
-		assert.Contains(tt, err.Error(), "init stanza pipeline")
-	})
-}
-
 // Copies the contents of one file to another with the given delay. Used to simulate writing log entries to a log file.
 // Reason for nolint: we must use testify's assert instead of require,
 // for more info see https://github.com/stretchr/testify/issues/772#issuecomment-945166599