(IGNORE) POC - Test Gathering Prometheus data

.github/workflows/e2e.yaml

@@ -34,6 +34,12 @@ jobs:
 
       - name: Run e2e tests
         run: ARTIFACT_PATH=/tmp/artifacts make test-e2e
+
+# To not store pprof
+#      - uses: actions/upload-artifact@v4
+#        with:
+#          name: upgrade-e2e-artifacts
+#          path: test/e2e/results/**
 
       - uses: actions/upload-artifact@v4
         if: failure()

cmd/operator-controller/main.go

@@ -83,6 +83,7 @@ var (
 
 type config struct {
 	metricsAddr          string
+	pprofAddr            string
 	certFile             string
 	keyFile              string
 	enableLeaderElection bool
@@ -131,6 +132,7 @@ func init() {
 	//create flagset, the collection of flags for this command
 	flags := operatorControllerCmd.Flags()
 	flags.StringVar(&cfg.metricsAddr, "metrics-bind-address", "", "The address for the metrics endpoint. Requires tls-cert and tls-key. (Default: ':8443')")
+	flags.StringVar(&cfg.pprofAddr, "pprof-bind-address", "0", "The address the pprof endpoint binds to. an empty string or 0 disables pprof")
 	flags.StringVar(&cfg.probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flags.StringVar(&cfg.catalogdCasDir, "catalogd-cas-dir", "", "The directory of TLS certificate authorities to use for verifying HTTPS connections to the Catalogd web service.")
 	flags.StringVar(&cfg.pullCasDir, "pull-cas-dir", "", "The directory of TLS certificate authorities to use for verifying HTTPS connections to image registries.")
@@ -265,6 +267,7 @@ func run() error {
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                        scheme.Scheme,
 		Metrics:                       metricsServerOptions,
+		PprofBindAddress:              cfg.pprofAddr,
 		HealthProbeBindAddress:        cfg.probeAddr,
 		LeaderElection:                cfg.enableLeaderElection,
 		LeaderElectionID:              "9c4404e7.operatorframework.io",

config/base/catalogd/manager/catalogd_service.yaml

@@ -14,6 +14,9 @@ spec:
     protocol: TCP
     port: 80
     targetPort: 8443
+  - name: pprof
+    port: 8083
+    targetPort: 8083
   - name: webhook
     protocol: TCP
     port: 9443

config/base/catalogd/manager/manager.yaml

@@ -45,6 +45,7 @@ spec:
         - ./catalogd
         args:
         - --leader-elect
+        - --pprof-bind-address=:8083
         - --metrics-bind-address=:7443
         - --external-address=catalogd-service.olmv1-system.svc
         image: controller:latest

config/base/operator-controller/manager/manager.yaml

@@ -44,6 +44,7 @@ spec:
         - /operator-controller
         args:
         - "--health-probe-bind-address=:8081"
+        - "--pprof-bind-address=:8082"
         - "--metrics-bind-address=:8443"
         - "--leader-elect"
         image: controller:latest

internal/catalogd/controllers/core/clustercatalog_controller.go

@@ -152,6 +152,7 @@ func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&ocv1.ClusterCatalog{}).
+		Named("catalogd-clustercatalog-controller").
 		Complete(r)
 }
 

internal/catalogd/controllers/core/pull_secret_controller.go

@@ -64,6 +64,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	_, err := ctrl.NewControllerManagedBy(mgr).
 		For(&corev1.Secret{}).
+		Named("catalogd-pull-secret-controller").
 		WithEventFilter(newSecretPredicate(r.SecretKey)).
 		Build(r)
 

internal/operator-controller/controllers/clustercatalog_controller.go

@@ -93,6 +93,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 // SetupWithManager sets up the controller with the Manager.
 func (r *ClusterCatalogReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	_, err := ctrl.NewControllerManagedBy(mgr).
+		Named("con-oper-clustercatalog-controller").
 		For(&ocv1.ClusterCatalog{}).
 		Build(r)
 

internal/operator-controller/controllers/clusterextension_controller.go

@@ -407,6 +407,7 @@ func SetDeprecationStatus(ext *ocv1.ClusterExtension, bundleName string, depreca
 func (r *ClusterExtensionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	controller, err := ctrl.NewControllerManagedBy(mgr).
 		For(&ocv1.ClusterExtension{}).
+		Named("con-oper-cluster-extension-controller").
 		Watches(&ocv1.ClusterCatalog{},
 			crhandler.EnqueueRequestsFromMapFunc(clusterExtensionRequestsForCatalog(mgr.GetClient(), mgr.GetLogger())),
 			builder.WithPredicates(predicate.Funcs{

internal/operator-controller/controllers/pull_secret_controller.go

@@ -63,6 +63,7 @@ func (r *PullSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 // SetupWithManager sets up the controller with the Manager.
 func (r *PullSecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	_, err := ctrl.NewControllerManagedBy(mgr).
+		Named("con-oper-pull-secret-controller").
 		For(&corev1.Secret{}).
 		WithEventFilter(newSecretPredicate(r.SecretKey)).
 		Build(r)

test/e2e/cluster_extension_install_test.go

@@ -377,6 +377,10 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
 					assert.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
 				}
 			}, pollDuration, pollInterval)
+
+			// For this case we cannot get the metrics
+			//FetchCatalogdMetricsExportedEndpoint(t)
+			//FetchOperatorControllerMetricsExportedEndpoint(t)
 		})
 	}
 }
@@ -455,6 +459,9 @@ location = "docker-registry.operator-controller-e2e.svc.cluster.local:5000"`,
 			assert.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionInstallRegistryMultipleBundles(t *testing.T) {
@@ -505,6 +512,9 @@ func TestClusterExtensionInstallRegistryMultipleBundles(t *testing.T) {
 			assert.Contains(ct, cond.Message, "in multiple catalogs with the same priority [extra-test-catalog test-catalog]")
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) {
@@ -568,6 +578,9 @@ func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) {
 			assert.Equal(ct, "error upgrading from currently installed version \"1.0.0\": no bundles found for package \"test\" matching version \"1.2.0\"", cond.Message)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
@@ -618,6 +631,9 @@ func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionInstallSuccessorVersion(t *testing.T) {
@@ -666,6 +682,9 @@ func TestClusterExtensionInstallSuccessorVersion(t *testing.T) {
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
@@ -733,6 +752,9 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
@@ -814,6 +836,9 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionInstallReResolvesWhenManagedContentChanged(t *testing.T) {
@@ -866,6 +891,9 @@ func TestClusterExtensionInstallReResolvesWhenManagedContentChanged(t *testing.T
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		assert.NoError(ct, globalClient.Get(context.Background(), types.NamespacedName{Name: testConfigMap.Name, Namespace: testConfigMap.Namespace}, testConfigMap))
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }
 
 func TestClusterExtensionRecoversFromInitialInstallFailedWhenFailureFixed(t *testing.T) {
@@ -959,4 +987,7 @@ func TestClusterExtensionRecoversFromInitialInstallFailedWhenFailureFixed(t *tes
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 		}
 	}, pollDuration, pollInterval)
+
+	FetchCatalogdMetricsExportedEndpoint(t)
+	FetchOperatorControllerMetricsExportedEndpoint(t)
 }