Fix names and default values of Agent Config settings.

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
 ```

internal/collector/nginxossreceiver/metadata.yaml

@@ -7,7 +7,7 @@ status:
     beta: [metrics]
   distributions: [contrib]
   codeowners:
-    active: [aphralG, dhurley, craigell, sean-breen, Rashmiti, CVanF5]
+    active: [ aphralG, dhurley, craigell, sean-breen, CVanF5 ]
 
 resource_attributes:
   instance.id:

internal/collector/nginxplusreceiver/metadata.yaml

@@ -7,7 +7,7 @@ status:
     beta: [metrics]
   distributions: [contrib]
   codeowners:
-    active: [aphralG, dhurley, craigell, sean-breen, Rashmiti, CVanF5]
+    active: [ aphralG, dhurley, craigell, sean-breen, CVanF5 ]
 
 resource_attributes:
   instance.id:

internal/collector/otel_collector_plugin.go

@@ -26,8 +26,9 @@ import (
 )
 
 const (
-	maxTimeToWaitForShutdown = 30 * time.Second
-	filePermission           = 0o600
+	maxTimeToWaitForShutdown  = 30 * time.Second
+	defaultCollectionInterval = 1 * time.Minute
+	filePermission            = 0o600
 	// To conform to the rfc3164 spec the timestamp in the logs need to be formatted correctly.
 	// Here are some examples of what the timestamp conversions look like.
 	// Notice how if the day begins with a zero that the zero is replaced with an empty space.
@@ -405,6 +406,7 @@ func (oc *Collector) checkForNewReceivers(nginxConfigContext *model.NginxConfigC
 					Listen:   nginxConfigContext.PlusAPI.Listen,
 					Location: nginxConfigContext.PlusAPI.Location,
 				},
+				CollectionInterval: defaultCollectionInterval,
 			},
 		)
 
@@ -438,7 +440,8 @@ func (oc *Collector) addNginxOssReceiver(nginxConfigContext *model.NginxConfigCo
 					Listen:   nginxConfigContext.StubStatus.Listen,
 					Location: nginxConfigContext.StubStatus.Location,
 				},
-				AccessLogs: toConfigAccessLog(nginxConfigContext.AccessLogs),
+				AccessLogs:         toConfigAccessLog(nginxConfigContext.AccessLogs),
+				CollectionInterval: defaultCollectionInterval,
 			},
 		)
 

internal/collector/otel_collector_plugin_test.go

@@ -184,6 +184,7 @@ func TestCollector_ProcessNginxConfigUpdateTopic(t *testing.T) {
 							Listen:   "",
 							Location: "",
 						},
+						CollectionInterval: defaultCollectionInterval,
 					},
 				},
 			},
@@ -229,6 +230,7 @@ func TestCollector_ProcessNginxConfigUpdateTopic(t *testing.T) {
 								LogFormat: "$$remote_addr - $$remote_user [$$time_local] \\\"$$request\\\"",
 							},
 						},
+						CollectionInterval: defaultCollectionInterval,
 					},
 				},
 			},

internal/collector/otelcol.tmpl

@@ -81,7 +81,9 @@ receivers:
       url: "{{- .StubStatus.URL -}}"
       listen: "{{- .StubStatus.Listen -}}"
       location: "{{- .StubStatus.Location -}}"
-    collection_interval: 10s
+    {{- if .CollectionInterval }}
+    collection_interval: {{ .CollectionInterval }}
+    {{- end }}
     {{- if gt (len .AccessLogs) 0 }}
     access_logs:
     {{- range .AccessLogs }}
@@ -96,7 +98,9 @@ receivers:
         url: "{{- .PlusAPI.URL -}}"
         listen: "{{- .PlusAPI.Listen -}}"
         location: "{{- .PlusAPI.Location -}}"
-    collection_interval: 10s
+    {{- if .CollectionInterval }}
+    collection_interval: {{ .CollectionInterval }}
+    {{- end }}
 {{- end }}
 {{- range $index, $tcplogReceiver := .Receivers.TcplogReceivers }}
   tcplog/{{$index}}:

internal/collector/settings_test.go

@@ -97,6 +97,7 @@ func TestTemplateWrite(t *testing.T) {
 			Location: "",
 			Listen:   "",
 		},
+		CollectionInterval: 30 * time.Second,
 		AccessLogs: []config.AccessLog{
 			{
 				LogFormat: accessLogFormat,

internal/config/config_test.go

@@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/nginx/agent/v3/pkg/config"
+
 	"github.com/nginx/agent/v3/test/helpers"
 
 	"github.com/stretchr/testify/require"
@@ -882,11 +884,13 @@ func createConfig() *Config {
 								FilePath: "/var/log/nginx/access-custom.conf",
 							},
 						},
+						CollectionInterval: 30 * time.Second,
 					},
 				},
 				NginxPlusReceivers: []NginxPlusReceiver{
 					{
-						InstanceID: "cd7b8911-c2c5-4daf-b311-dbead151d939",
+						InstanceID:         "cd7b8911-c2c5-4daf-b311-dbead151d939",
+						CollectionInterval: 30 * time.Second,
 					},
 				},
 				HostMetrics: &HostMetrics{
@@ -966,5 +970,9 @@ func createConfig() *Config {
 			"label2": "new-value",
 			"label3": 123,
 		},
+		Features: []string{
+			config.FeatureCertificates, config.FeatureFileWatcher, config.FeatureMetrics,
+			config.FeatureAPIAction, config.FeatureLogsNap,
+		},
 	}
 }

internal/config/defaults.go

@@ -44,7 +44,7 @@ const (
 	DefBackoffInitialInterval     = 500 * time.Millisecond
 	DefBackoffRandomizationFactor = 0.5 // the value is 0 <= and < 1
 	DefBackoffMultiplier          = 1.5
-	DefBackoffMaxInterval         = 5 * time.Second
+	DefBackoffMaxInterval         = 10 * time.Minute
 	DefBackoffMaxElapsedTime      = 30 * time.Second
 
 	// Watcher defaults

internal/config/flags.go

@@ -47,7 +47,7 @@ var (
 	CollectorExportersKey                       = pre(CollectorRootKey) + "exporters"
 	CollectorAttributeProcessorKey              = pre(CollectorProcessorsKey) + "attribute"
 	CollectorDebugExporterKey                   = pre(CollectorExportersKey) + "debug"
-	CollectorPrometheusExporterKey              = pre(CollectorExportersKey) + "prometheus_exporter"
+	CollectorPrometheusExporterKey              = pre(CollectorExportersKey) + "prometheus"
 	CollectorPrometheusExporterServerHostKey    = pre(CollectorPrometheusExporterKey) + "server_host"
 	CollectorPrometheusExporterServerPortKey    = pre(CollectorPrometheusExporterKey) + "server_port"
 	CollectorPrometheusExporterTLSKey           = pre(CollectorPrometheusExporterKey) + "tls"
@@ -56,7 +56,7 @@ var (
 	CollectorPrometheusExporterTLSCaKey         = pre(CollectorPrometheusExporterTLSKey) + "ca"
 	CollectorPrometheusExporterTLSSkipVerifyKey = pre(CollectorPrometheusExporterTLSKey) + "skip_verify"
 	CollectorPrometheusExporterTLSServerNameKey = pre(CollectorPrometheusExporterTLSKey) + "server_name"
-	CollectorOtlpExportersKey                   = pre(CollectorExportersKey) + "otlp_exporters"
+	CollectorOtlpExportersKey                   = pre(CollectorExportersKey) + "otlp"
 	CollectorProcessorsKey                      = pre(CollectorRootKey) + "processors"
 	CollectorBatchProcessorKey                  = pre(CollectorProcessorsKey) + "batch"
 	CollectorBatchProcessorSendBatchSizeKey     = pre(CollectorBatchProcessorKey) + "send_batch_size"

internal/config/testdata/nginx-agent.conf

@@ -17,6 +17,13 @@ labels:
   label2: new-value
   label3: 123
 
+features:
+      - certificates
+      - file-watcher
+      - metrics
+      - api-action
+      - logs-nap
+
 data_plane_config:
     nginx:
         reload_monitoring_period: 30s
@@ -53,7 +60,6 @@ command:
     server: 
         host: "127.0.0.1"
         port: 8888
-        type: grpc
     auth: 
         token: "1234"
         tokenpath: "path/to/my_token"
@@ -67,7 +73,7 @@ command:
 collector:
   config_path: "/etc/nginx-agent/nginx-agent-otelcol.yaml"
   receivers:
-    otlp_receivers:
+    otlp:
         - server:
             host: "127.0.0.1"
             port: 4317
@@ -80,13 +86,15 @@ collector:
             ca: /tmp/ca.pem
             cert: /tmp/cert.pem
             key: /tmp/key.pem
-    nginx_receivers:
+    nginx:
         - instance_id: cd7b8911-c2c5-4daf-b311-dbead151d938
           access_logs:
             - file_path: "/var/log/nginx/access-custom.conf"
               log_format: "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\""
-    nginx_plus_receivers:
+          collection_interval: 30s
+    nginx_plus:
         - instance_id: cd7b8911-c2c5-4daf-b311-dbead151d939
+          collection_interval: 30s
     host_metrics:
         collection_interval: 10s
         initial_delay: 2s
@@ -103,7 +111,7 @@ collector:
               action: "insert"
               value: "value"
   exporters:
-    otlp_exporters:
+    otlp:
       - server:
           host: "127.0.0.1"
           port: 5643
@@ -114,7 +122,7 @@ collector:
           cert: /path/to/server-cert.pem
           key: /path/to/server-key.pem
           ca: /path/to/server-cert.pem
-    prometheus_exporter:
+    prometheus:
          server:
             host: "127.0.0.1"
             port: 1235

internal/config/types.go

@@ -104,9 +104,9 @@ type (
 	}
 
 	Exporters struct {
-		Debug              *DebugExporter      `yaml:"debug"               mapstructure:"debug"`
-		PrometheusExporter *PrometheusExporter `yaml:"prometheus_exporter" mapstructure:"prometheus_exporter"`
-		OtlpExporters      []OtlpExporter      `yaml:"otlp_exporters"      mapstructure:"otlp_exporters"`
+		Debug              *DebugExporter      `yaml:"debug"      mapstructure:"debug"`
+		PrometheusExporter *PrometheusExporter `yaml:"prometheus" mapstructure:"prometheus"`
+		OtlpExporters      []OtlpExporter      `yaml:"otlp"       mapstructure:"otlp"`
 	}
 
 	OtlpExporter struct {
@@ -181,12 +181,12 @@ type (
 
 	// OTel Collector Receiver configuration.
 	Receivers struct {
-		ContainerMetrics   *ContainerMetricsReceiver `yaml:"container_metrics"    mapstructure:"container_metrics"`
-		HostMetrics        *HostMetrics              `yaml:"host_metrics"         mapstructure:"host_metrics"`
-		OtlpReceivers      []OtlpReceiver            `yaml:"otlp_receivers"       mapstructure:"otlp_receivers"`
-		NginxReceivers     []NginxReceiver           `yaml:"nginx_receivers"      mapstructure:"nginx_receivers"`
-		NginxPlusReceivers []NginxPlusReceiver       `yaml:"nginx_plus_receivers" mapstructure:"nginx_plus_receivers"`
-		TcplogReceivers    []TcplogReceiver          `yaml:"tcplog_receivers"     mapstructure:"tcplog_receivers"`
+		ContainerMetrics   *ContainerMetricsReceiver `yaml:"container_metrics" mapstructure:"container_metrics"`
+		HostMetrics        *HostMetrics              `yaml:"host_metrics"      mapstructure:"host_metrics"`
+		OtlpReceivers      []OtlpReceiver            `yaml:"otlp"              mapstructure:"otlp"`
+		NginxReceivers     []NginxReceiver           `yaml:"nginx"             mapstructure:"nginx"`
+		NginxPlusReceivers []NginxPlusReceiver       `yaml:"nginx_plus"        mapstructure:"nginx_plus"`
+		TcplogReceivers    []TcplogReceiver          `yaml:"tcplog"            mapstructure:"tcplog"`
 	}
 
 	OtlpReceiver struct {
@@ -209,9 +209,10 @@ type (
 	}
 
 	NginxReceiver struct {
-		InstanceID string      `yaml:"instance_id" mapstructure:"instance_id"`
-		StubStatus APIDetails  `yaml:"api_details" mapstructure:"api_details"`
-		AccessLogs []AccessLog `yaml:"access_logs" mapstructure:"access_logs"`
+		InstanceID         string        `yaml:"instance_id"         mapstructure:"instance_id"`
+		StubStatus         APIDetails    `yaml:"api_details"         mapstructure:"api_details"`
+		AccessLogs         []AccessLog   `yaml:"access_logs"         mapstructure:"access_logs"`
+		CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
 	}
 
 	APIDetails struct {
@@ -226,12 +227,13 @@ type (
 	}
 
 	NginxPlusReceiver struct {
-		InstanceID string     `yaml:"instance_id" mapstructure:"instance_id"`
-		PlusAPI    APIDetails `yaml:"api_details" mapstructure:"api_details"`
+		InstanceID         string        `yaml:"instance_id"         mapstructure:"instance_id"`
+		PlusAPI            APIDetails    `yaml:"api_details"         mapstructure:"api_details"`
+		CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
 	}
 
 	ContainerMetricsReceiver struct {
-		CollectionInterval time.Duration `yaml:"-" mapstructure:"collection_interval"`
+		CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
 	}
 
 	HostMetrics struct {

test/config/agent/nginx-agent-otel-load.conf

@@ -19,14 +19,14 @@ allowed_directories:
 
 collector:
   receivers:
-    otlp_receivers:
+    otlp:
       - server:
           host: "127.0.0.1"
           port: 4317
   processors:
     batch: {}
   exporters:
-    otlp_exporters:
+    otlp:
       - server:
           host: "127.0.0.1"
           port: 5643

test/config/collector/test-opentelemetry-collector-agent.yaml

@@ -31,7 +31,7 @@ receivers:
       url: "http://localhost:80/status"
       listen: ""
       location: ""
-    collection_interval: 10s
+    collection_interval: 30s
     access_logs:
       - log_format: "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\"\"$upstream_cache_status\""
         file_path: "/var/log/nginx/access-custom.conf"

test/mock/collector/nginx-agent.conf

@@ -28,30 +28,28 @@ 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
       scrapers:
-        cpu: {}
-        memory: {}
         disk: {}
         network: {}
         filesystem: {}
-    otlp_receivers:
+    otlp:
       - 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
@@ -62,7 +60,7 @@ collector:
     batch: {}
   exporters:
     debug:
-    otlp_exporters:
+    otlp:
       - server:
           host: "otel-collector"
           port: 4317