Migrate from OpenCensus library

cmd/hydration-controller/main.go

@@ -19,6 +19,7 @@ import (
 	"flag"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/GoogleContainerTools/config-sync/pkg/api/configsync"
 	"github.com/GoogleContainerTools/config-sync/pkg/hydrate"
@@ -79,19 +80,22 @@ func main() {
 	profiler.Service()
 	ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
 
-	// Register the kustomize usage metric views.
-	if err := kmetrics.RegisterKustomizeMetricsViews(); err != nil {
-		klog.Fatalf("Failed to register OpenCensus views: %v", err)
+	// Initialize the kustomize metrics
+	if err := kmetrics.InitializeOTelKustomizeMetrics(); err != nil {
+		klog.Fatalf("Failed to initialize kustomize metrics: %v", err)
 	}
 
 	// Register the OC Agent exporter
-	oce, err := kmetrics.RegisterOCAgentExporter(reconcilermanager.HydrationController)
+	ctx := context.Background()
+	oce, err := kmetrics.RegisterOTelExporter(ctx, reconcilermanager.HydrationController)
 	if err != nil {
 		klog.Fatalf("Failed to register the OC Agent exporter: %v", err)
 	}
 
 	defer func() {
-		if err := oce.Stop(); err != nil {
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := oce.Shutdown(shutdownCtx); err != nil {
 			klog.Fatalf("Unable to stop the OC Agent exporter: %v", err)
 		}
 	}()

cmd/reconciler-manager/main.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"time"
 
 	traceapi "cloud.google.com/go/trace/apiv2"
 	"github.com/GoogleContainerTools/config-sync/pkg/api/configsync"
@@ -182,20 +183,23 @@ func main() {
 	}
 	setupLog.Info("OtelSA controller registration successful")
 
-	// Register the OpenCensus views
-	if err := metrics.RegisterReconcilerManagerMetricsViews(); err != nil {
-		setupLog.Error(err, "failed to register OpenCensus views")
+	// Initialize the metrics
+	if err := metrics.InitializeOTelMetrics(); err != nil {
+		setupLog.Error(err, "failed to initialize metrics")
 	}
 
 	// Register the OC Agent exporter
-	oce, err := metrics.RegisterOCAgentExporter(reconcilermanager.ManagerName)
+	ctx := context.Background()
+	oce, err := metrics.RegisterOTelExporter(ctx, reconcilermanager.ManagerName)
 	if err != nil {
 		setupLog.Error(err, "failed to register the OC Agent exporter")
 		os.Exit(1)
 	}
 
 	defer func() {
-		if err := oce.Stop(); err != nil {
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := oce.Shutdown(shutdownCtx); err != nil {
 			setupLog.Error(err, "failed to stop the OC Agent exporter")
 		}
 	}()
@@ -206,7 +210,9 @@ func main() {
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")
 		// os.Exit(1) does not run deferred functions so explicitly stopping the OC Agent exporter.
-		if err := oce.Stop(); err != nil {
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := oce.Shutdown(shutdownCtx); err != nil {
 			setupLog.Error(err, "failed to stop the OC Agent exporter")
 		}
 		os.Exit(1)

cmd/reconciler/main.go

@@ -15,10 +15,12 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/GoogleContainerTools/config-sync/pkg/api/configsync"
 	"github.com/GoogleContainerTools/config-sync/pkg/declared"
@@ -140,19 +142,22 @@ func main() {
 		status.EnablePanicOnMisuse()
 	}
 
-	// Register the OpenCensus views
-	if err := ocmetrics.RegisterReconcilerMetricsViews(); err != nil {
-		klog.Fatalf("Failed to register OpenCensus views: %v", err)
+	// Initialize the metrics
+	if err := ocmetrics.InitializeOTelMetrics(); err != nil {
+		klog.Fatalf("Failed to initialize metrics: %v", err)
 	}
 
 	// Register the OC Agent exporter
-	oce, err := ocmetrics.RegisterOCAgentExporter(reconcilermanager.Reconciler)
+	ctx := context.Background()
+	oce, err := ocmetrics.RegisterOTelExporter(ctx, reconcilermanager.Reconciler)
 	if err != nil {
 		klog.Fatalf("Failed to register the OC Agent exporter: %v", err)
 	}
 
 	defer func() {
-		if err := oce.Stop(); err != nil {
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := oce.Shutdown(shutdownCtx); err != nil {
 			klog.Fatalf("Unable to stop the OC Agent exporter: %v", err)
 		}
 	}()

docs/custom-metric-filter.md

@@ -171,7 +171,7 @@ To **turn off the custom metrics** in Cloud Monitoring, remove this section:
 ```yaml
 # Remove this entire section
 metrics/cloudmonitoring:
-  receivers: [opencensus]
+  receivers: [otlp]
   processors: [batch, filter/cloudmonitoring, metricstransform/cloudmonitoring, resourcedetection]
   exporters: [googlecloud]
 ```
@@ -183,7 +183,7 @@ To **turn off the report to Cloud Monarch**, remove this section:
 ```yaml
 # Remove this entire section
 metrics/kubernetes:
-  receivers: [opencensus]
+  receivers: [otlp]
   processors: [batch, filter/kubernetes, metricstransform/kubernetes, resourcedetection]
   exporters: [googlecloud/kubernetes]
 ```
@@ -235,7 +235,12 @@ metadata:
 data:
   otel-collector-config.yaml: |
     receivers:
-      opencensus:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: 0.0.0.0:4317
+          http:
+            endpoint: 0.0.0.0:4318
     exporters:
       debug:
         verbosity: detailed
@@ -245,7 +250,7 @@ data:
       batch:
       pipelines:
         metrics:
-          receivers: [opencensus]
+          receivers: [otlp]
           processors: [batch]
           exporters: [debug]
 ```