Add some more review changes

Author: bjee19

internal/controller/manager.go

@@ -200,20 +200,6 @@ func StartManager(cfg config.Config) error {
 		return fmt.Errorf("cannot register grpc server: %w", err)
 	}
 
-	agentLabelCollector := telemetry.NewLabelCollectorConfigImpl(telemetry.LabelCollectorConfig{
-		K8sClientReader: mgr.GetAPIReader(),
-		Version:         cfg.GatewayPodConfig.Version,
-		PodNSName: types.NamespacedName{
-			Namespace: cfg.GatewayPodConfig.Namespace,
-			Name:      cfg.GatewayPodConfig.Name,
-		},
-	})
-
-	agentLabels, err := agentLabelCollector.Collect(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to collect agent labels: %w", err)
-	}
-
 	nginxProvisioner, provLoop, err := provisioner.NewNginxProvisioner(
 		ctx,
 		mgr,
@@ -229,7 +215,6 @@ func StartManager(cfg config.Config) error {
 			Plus:                           cfg.Plus,
 			NginxDockerSecretNames:         cfg.NginxDockerSecretNames,
 			PlusUsageConfig:                &cfg.UsageReportConfig,
-			AgentLabels:                    agentLabels,
 			NginxOneConsoleTelemetryConfig: cfg.NginxOneConsoleTelemetryConfig,
 		},
 	)

internal/controller/provisioner/objects.go

@@ -413,11 +413,11 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 	}
 
 	if logging != nil && logging.AgentLevel != nil {
-		agentFields["LogLevel"] = logging.AgentLevel
+		agentFields["LogLevel"] = *logging.AgentLevel
 	}
 
 	if p.cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName != "" {
-		agentFields["DataplaneKeySecretName"] = p.cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName
+		agentFields["NginxOneReporting"] = true
 		agentFields["EndpointHost"] = p.cfg.NginxOneConsoleTelemetryConfig.EndpointHost
 		agentFields["EndpointPort"] = strconv.Itoa(p.cfg.NginxOneConsoleTelemetryConfig.EndpointPort)
 		agentFields["EndpointTLSSkipVerify"] = p.cfg.NginxOneConsoleTelemetryConfig.EndpointTLSSkipVerify

internal/controller/provisioner/provisioner.go

@@ -76,6 +76,23 @@ type NginxProvisioner struct {
 
 var apiChecker openshift.APIChecker = &openshift.APICheckerImpl{}
 
+var labelCollectorFactory func(mgr manager.Manager, cfg Config) AgentLabelCollector = defaultLabelCollectorFactory
+
+func defaultLabelCollectorFactory(mgr manager.Manager, cfg Config) AgentLabelCollector {
+	return telemetry.NewLabelCollectorConfigImpl(telemetry.LabelCollectorConfig{
+		K8sClientReader: mgr.GetAPIReader(),
+		Version:         cfg.GatewayPodConfig.Version,
+		PodNSName: types.NamespacedName{
+			Namespace: cfg.GatewayPodConfig.Namespace,
+			Name:      cfg.GatewayPodConfig.Name,
+		},
+	})
+}
+
+type AgentLabelCollector interface {
+	Collect(ctx context.Context) (telemetry.AgentLabels, error)
+}
+
 // NewNginxProvisioner returns a new instance of a Provisioner that will deploy nginx resources.
 func NewNginxProvisioner(
 	ctx context.Context,
@@ -112,6 +129,13 @@ func NewNginxProvisioner(
 		cfg.Logger.Error(err, "could not determine if running in openshift, will not create Role/RoleBinding")
 	}
 
+	agentLabelCollector := labelCollectorFactory(mgr, cfg)
+	agentLabels, err := agentLabelCollector.Collect(ctx)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to collect agent labels: %w", err)
+	}
+	cfg.AgentLabels = agentLabels
+
 	provisioner := &NginxProvisioner{
 		k8sClient:                  mgr.GetClient(),
 		store:                      store,

internal/controller/provisioner/provisioner_test.go

@@ -203,6 +203,12 @@ func defaultNginxProvisioner(
 	}, fakeClient, deploymentStore
 }
 
+type fakeLabelCollector struct{}
+
+func (f *fakeLabelCollector) Collect(_ context.Context) (telemetry.AgentLabels, error) {
+	return telemetry.AgentLabels{ProductType: "fake"}, nil
+}
+
 func TestNewNginxProvisioner(t *testing.T) {
 	t.Parallel()
 	g := NewWithT(t)
@@ -219,6 +225,10 @@ func TestNewNginxProvisioner(t *testing.T) {
 	}
 
 	apiChecker = &openshiftfakes.FakeAPIChecker{}
+	labelCollectorFactory = func(_ manager.Manager, _ Config) AgentLabelCollector {
+		return &fakeLabelCollector{}
+	}
+
 	provisioner, eventLoop, err := NewNginxProvisioner(context.TODO(), mgr, cfg)
 	g.Expect(err).ToNot(HaveOccurred())
 	g.Expect(provisioner).NotTo(BeNil())

internal/controller/provisioner/templates.go

@@ -66,13 +66,13 @@ labels:
     {{ $key }}: {{ $value }}
     {{- end }}
 
-{{- if .DataplaneKeySecretName }}
+{{- if .NginxOneReporting }}
 auxiliary_command:
-    server: 
+    server:
         host: {{ .EndpointHost }}
         port: {{ .EndpointPort }}
         type: grpc
-    auth: 
+    auth:
         tokenpath: /etc/nginx-agent/secrets/dataplane.key
     tls:
         skip_verify: {{ .EndpointTLSSkipVerify }}