Merge branch 'v3' into fix-otel-logging-container

Author: aphralG

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,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/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

@@ -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.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/otel_collector_plugin_test.go

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

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

internal/collector/settings_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"
@@ -886,11 +888,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{
@@ -970,5 +974,9 @@ func createConfig() *Config {
 			"label2": "new-value",
 			"label3": 123,
 		},
+		Features: []string{
+			config.FeatureCertificates, config.FeatureFileWatcher, config.FeatureMetrics,
+			config.FeatureAPIAction, config.FeatureLogsNap,
+		},
 	}
 }