instrument cloud/scope

Author: meobilivang

cloud/scope/clients.go

@@ -32,6 +32,7 @@ import (
 	"k8s.io/client-go/pkg/version"
 	"k8s.io/client-go/util/flowcontrol"
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -90,6 +91,11 @@ func defaultClientOptions(ctx context.Context, credentialsRef *infrav1.ObjectRef
 }
 
 func newComputeService(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client, endpoints *infrav1.ServiceEndpoints) (*compute.Service, error) {
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.clients.newComputeService",
+	)
+	defer span.End()
+
 	opts, err := defaultClientOptions(ctx, credentialsRef, crClient)
 	if err != nil {
 		return nil, fmt.Errorf("getting default gcp client options: %w", err)
@@ -108,6 +114,11 @@ func newComputeService(ctx context.Context, credentialsRef *infrav1.ObjectRefere
 }
 
 func newClusterManagerClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client, endpoints *infrav1.ServiceEndpoints) (*container.ClusterManagerClient, error) {
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.clients.newClusterManagerClient",
+	)
+	defer span.End()
+
 	opts, err := defaultClientOptions(ctx, credentialsRef, crClient)
 	if err != nil {
 		return nil, fmt.Errorf("getting default gcp client options: %w", err)
@@ -126,6 +137,11 @@ func newClusterManagerClient(ctx context.Context, credentialsRef *infrav1.Object
 }
 
 func newIamCredentialsClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client, endpoints *infrav1.ServiceEndpoints) (*credentials.IamCredentialsClient, error) {
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.clients.newIamCredentialsClient",
+	)
+	defer span.End()
+
 	opts, err := defaultClientOptions(ctx, credentialsRef, crClient)
 	if err != nil {
 		return nil, fmt.Errorf("getting default gcp client options: %w", err)
@@ -144,6 +160,11 @@ func newIamCredentialsClient(ctx context.Context, credentialsRef *infrav1.Object
 }
 
 func newInstanceGroupManagerClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client, endpoints *infrav1.ServiceEndpoints) (*computerest.InstanceGroupManagersClient, error) {
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.clients.newInstanceGroupManagerClient",
+	)
+	defer span.End()
+
 	opts, err := defaultClientOptions(ctx, credentialsRef, crClient)
 	if err != nil {
 		return nil, fmt.Errorf("getting default gcp client options: %w", err)

cloud/scope/cluster.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/utils/ptr"
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud"
+	"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -43,6 +44,12 @@ type ClusterScopeParams struct {
 // NewClusterScope creates a new Scope from the supplied parameters.
 // This is meant to be called for each reconcile iteration.
 func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterScope, error) {
+
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.clusterScope.NewClusterScope",
+	)
+	defer span.End()
+
 	if params.Cluster == nil {
 		return nil, errors.New("failed to generate new scope from nil Cluster")
 	}

cloud/scope/managedcluster.go

@@ -27,6 +27,7 @@ import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud"
 	infrav1exp "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -44,6 +45,12 @@ type ManagedClusterScopeParams struct {
 // NewManagedClusterScope creates a new Scope from the supplied parameters.
 // This is meant to be called for each reconcile iteration.
 func NewManagedClusterScope(ctx context.Context, params ManagedClusterScopeParams) (*ManagedClusterScope, error) {
+
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.managedClusterScope.NewManagedClusterScope",
+	)
+	defer span.End()
+
 	if params.Cluster == nil {
 		return nil, errors.New("failed to generate new scope from nil Cluster")
 	}

cloud/scope/managedcontrolplane.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 
 	"sigs.k8s.io/cluster-api-provider-gcp/util/location"
+	"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
 
 	"sigs.k8s.io/cluster-api/util/conditions"
 
@@ -54,6 +55,12 @@ type ManagedControlPlaneScopeParams struct {
 // NewManagedControlPlaneScope creates a new Scope from the supplied parameters.
 // This is meant to be called for each reconcile iteration.
 func NewManagedControlPlaneScope(ctx context.Context, params ManagedControlPlaneScopeParams) (*ManagedControlPlaneScope, error) {
+
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.managedControlPlaneScope.NewManagedControlPlaneScope",
+	)
+	defer span.End()
+
 	if params.Cluster == nil {
 		return nil, errors.New("failed to generate new scope from nil Cluster")
 	}

cloud/scope/managedmachinepool.go

@@ -25,6 +25,7 @@ import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud"
 	"sigs.k8s.io/cluster-api-provider-gcp/util/location"
+	"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
 
 	"sigs.k8s.io/cluster-api/util/conditions"
 
@@ -54,6 +55,12 @@ type ManagedMachinePoolScopeParams struct {
 // NewManagedMachinePoolScope creates a new Scope from the supplied parameters.
 // This is meant to be called for each reconcile iteration.
 func NewManagedMachinePoolScope(ctx context.Context, params ManagedMachinePoolScopeParams) (*ManagedMachinePoolScope, error) {
+
+	ctx, span := telemetry.Tracer().Start(
+		ctx, "cloud.managedMachinePoolScope.NewManagedMachinePoolScope",
+	)
+	defer span.End()
+
 	if params.Cluster == nil {
 		return nil, errors.New("failed to generate new scope from nil Cluster")
 	}