merge v3

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/collector/otelcol.tmpl

@@ -156,6 +156,7 @@ exporters:
     tls:
       insecure: {{ if .TLS -}}false{{ else -}}true{{- end }}
       {{- if .TLS }}
+      insecure_skip_verify: {{ .TLS.SkipVerify }}
       {{ if gt (len .TLS.Ca) 0 -}}ca_file: "{{- .TLS.Ca -}}"{{- end }}
       {{ if gt (len .TLS.Cert) 0 -}}cert_file: "{{- .TLS.Cert -}}"{{- end }}
       {{ if gt (len .TLS.Key) 0 -}}key_file: "{{- .TLS.Key -}}"{{- end }}

internal/config/config.go

@@ -143,7 +143,7 @@ func checkCollectorConfiguration(collector *Collector, config *Config) {
 	if isOTelExporterConfigured(collector) && config.IsGrpcClientConfigured() && config.IsAuthConfigured() &&
 		config.IsTLSConfigured() {
 		slog.Info("No collector configuration found in NGINX Agent config, command server configuration found."+
-			"Using default collector configuration", configLogOrigin)
+			" Using default collector configuration", configLogOrigin)
 		defaultCollector(collector, config)
 	}
 }
@@ -373,13 +373,25 @@ func registerClientFlags(fs *flag.FlagSet) {
 	fs.Int(
 		ClientGRPCMaxMessageReceiveSizeKey,
 		DefMaxMessageRecieveSize,
-		"Updates the client grpc setting MaxRecvMsgSize with the specific value in MB.",
+		"Updates the client grpc setting MaxRecvMsgSize with the specific value in bytes.",
 	)
 
 	fs.Int(
 		ClientGRPCMaxMessageSendSizeKey,
 		DefMaxMessageSendSize,
-		"Updates the client grpc setting MaxSendMsgSize with the specific value in MB.",
+		"Updates the client grpc setting MaxSendMsgSize with the specific value in bytes.",
+	)
+
+	fs.Uint32(
+		ClientGRPCFileChunkSizeKey,
+		DefFileChunkSize,
+		"File chunk size in bytes.",
+	)
+
+	fs.Uint32(
+		ClientGRPCMaxFileSizeKey,
+		DefMaxFileSize,
+		"Max file size in bytes.",
 	)
 }
 
@@ -716,6 +728,8 @@ func resolveClient() *Client {
 			MaxMessageSize:        viperInstance.GetInt(ClientGRPCMaxMessageSizeKey),
 			MaxMessageReceiveSize: viperInstance.GetInt(ClientGRPCMaxMessageReceiveSizeKey),
 			MaxMessageSendSize:    viperInstance.GetInt(ClientGRPCMaxMessageSendSizeKey),
+			MaxFileSize:           viperInstance.GetUint32(ClientGRPCMaxFileSizeKey),
+			FileChunkSize:         viperInstance.GetUint32(ClientGRPCFileChunkSizeKey),
 		},
 		Backoff: &BackOff{
 			InitialInterval:     viperInstance.GetDuration(ClientBackoffInitialIntervalKey),

internal/config/config_test.go

@@ -104,6 +104,8 @@ func checkDefaultsClientValues(t *testing.T, viperInstance *viper.Viper) {
 	assert.Equal(t, DefMaxMessageSize, viperInstance.GetInt(ClientGRPCMaxMessageSizeKey))
 	assert.Equal(t, DefMaxMessageRecieveSize, viperInstance.GetInt(ClientGRPCMaxMessageReceiveSizeKey))
 	assert.Equal(t, DefMaxMessageSendSize, viperInstance.GetInt(ClientGRPCMaxMessageSendSizeKey))
+	assert.Equal(t, DefFileChunkSize, viperInstance.GetUint32(ClientGRPCFileChunkSizeKey))
+	assert.Equal(t, DefMaxFileSize, viperInstance.GetUint32(ClientGRPCMaxFileSizeKey))
 	assert.Equal(t, make(map[string]string), viperInstance.GetStringMapString(LabelsRootKey))
 }
 
@@ -781,6 +783,8 @@ func createConfig() *Config {
 				MaxMessageSize:        1048575,
 				MaxMessageReceiveSize: 1048575,
 				MaxMessageSendSize:    1048575,
+				MaxFileSize:           485753,
+				FileChunkSize:         48575,
 			},
 			Backoff: &BackOff{
 				InitialInterval:     200 * time.Millisecond,

internal/config/defaults.go

@@ -5,7 +5,6 @@
 package config
 
 import (
-	"math"
 	"time"
 
 	pkg "github.com/nginx/agent/v3/pkg/config"
@@ -28,9 +27,11 @@ const (
 	DefCommandTLServerNameKey  = ""
 
 	// Client GRPC Settings
-	DefMaxMessageSize        = 0       // 0 = unset
-	DefMaxMessageRecieveSize = 4194304 // default 4 MB
-	DefMaxMessageSendSize    = math.MaxInt32
+	DefMaxMessageSize               = 0       // 0 = unset
+	DefMaxMessageRecieveSize        = 4194304 // default 4 MB
+	DefMaxMessageSendSize           = 4194304 // default 4 MB
+	DefMaxFileSize           uint32 = 1048576 // 1MB
+	DefFileChunkSize         uint32 = 524288  // 0.5MB
 
 	// Client HTTP Settings
 	DefHTTPTimeout = 10 * time.Second
@@ -41,11 +42,11 @@ const (
 	DefGRPCKeepAlivePermitWithoutStream = true
 
 	// Client Backoff defaults
-	DefBackoffInitialInterval     = 500 * time.Millisecond
+	DefBackoffInitialInterval     = 1 * time.Second
 	DefBackoffRandomizationFactor = 0.5 // the value is 0 <= and < 1
-	DefBackoffMultiplier          = 1.5
-	DefBackoffMaxInterval         = 5 * time.Second
-	DefBackoffMaxElapsedTime      = 30 * time.Second
+	DefBackoffMultiplier          = 3
+	DefBackoffMaxInterval         = 20 * time.Second
+	DefBackoffMaxElapsedTime      = 1 * time.Minute
 
 	// Watcher defaults
 	DefInstanceWatcherMonitoringFrequency       = 5 * time.Second

internal/config/flags.go

@@ -36,6 +36,8 @@ var (
 	ClientGRPCMaxMessageSendSizeKey    = pre(ClientRootKey) + "grpc_max_message_send_size"
 	ClientGRPCMaxMessageReceiveSizeKey = pre(ClientRootKey) + "grpc_max_message_receive_size"
 	ClientGRPCMaxMessageSizeKey        = pre(ClientRootKey) + "grpc_max_message_size"
+	ClientGRPCMaxFileSizeKey           = pre(ClientRootKey) + "grpc_max_file_size"
+	ClientGRPCFileChunkSizeKey         = pre(ClientRootKey) + "grpc_file_chunk_size"
 
 	ClientBackoffInitialIntervalKey     = pre(ClientRootKey) + "backoff_initial_interval"
 	ClientBackoffMaxIntervalKey         = pre(ClientRootKey) + "backoff_max_interval"

internal/config/testdata/nginx-agent.conf

@@ -35,6 +35,8 @@ client:
        max_message_size: 1048575
        max_message_receive_size: 1048575
        max_message_send_size: 1048575
+       max_file_size: 485753
+       file_chunk_size: 48575
     backoff:
         initial_interval: 200ms
         max_interval: 10s

internal/config/types.go

@@ -83,9 +83,11 @@ type (
 		KeepAlive *KeepAlive `yaml:"keepalive" mapstructure:"keepalive"`
 		// if MaxMessageSize is size set then we use that value,
 		// otherwise MaxMessageRecieveSize and MaxMessageSendSize for individual settings
-		MaxMessageSize        int `yaml:"max_message_size"         mapstructure:"max_message_size"`
-		MaxMessageReceiveSize int `yaml:"max_message_receive_size" mapstructure:"max_message_receive_size"`
-		MaxMessageSendSize    int `yaml:"max_message_send_size"    mapstructure:"max_message_send_size"`
+		MaxMessageSize        int    `yaml:"max_message_size"         mapstructure:"max_message_size"`
+		MaxMessageReceiveSize int    `yaml:"max_message_receive_size" mapstructure:"max_message_receive_size"`
+		MaxMessageSendSize    int    `yaml:"max_message_send_size"    mapstructure:"max_message_send_size"`
+		MaxFileSize           uint32 `yaml:"max_file_size"            mapstructure:"max_file_size"`
+		FileChunkSize         uint32 `yaml:"file_chunk_size"          mapstructure:"file_chunk_size"`
 	}
 
 	KeepAlive struct {
@@ -231,7 +233,7 @@ type (
 	}
 
 	ContainerMetricsReceiver struct {
-		CollectionInterval time.Duration `yaml:"-" mapstructure:"collection_interval"`
+		CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
 	}
 
 	HostMetrics struct {