Skip to content

Commit 5172186

Browse files
meobilivangrichardcase
meobilivang
authored and
richardcase
committed
instrument cloud/services/compute
1 parent 7e60c01 commit 5172186

File tree

5 files changed

+130
-0
lines changed

5 files changed

+130
-0
lines changed

‎cloud/services/compute/firewalls/reconcile.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ import (
2222
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
2323

2424
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
25+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2526
"sigs.k8s.io/controller-runtime/pkg/log"
2627
)
2728

2829
// Reconcile reconcile cluster firewall compoenents.
2930
func (s *Service) Reconcile(ctx context.Context) error {
31+
ctx, span := telemetry.Tracer().Start(
32+
ctx, "firewalls.Services.Reconcile",
33+
)
34+
defer span.End()
35+
3036
log := log.FromContext(ctx)
3137
if s.scope.IsSharedVpc() {
3238
log.V(2).Info("Shared VPC enabled. Ignore Reconciling firewall resources")
@@ -53,6 +59,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
5359

5460
// Delete delete cluster firewall compoenents.
5561
func (s *Service) Delete(ctx context.Context) error {
62+
ctx, span := telemetry.Tracer().Start(
63+
ctx, "firewalls.Services.Delete",
64+
)
65+
defer span.End()
66+
5667
log := log.FromContext(ctx)
5768
if s.scope.IsSharedVpc() {
5869
log.V(2).Info("Shared VPC enabled. Ignore Deleting firewall resources")

‎cloud/services/compute/instances/reconcile.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ import (
3232
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
3333

3434
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
35+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
3536
"sigs.k8s.io/controller-runtime/pkg/log"
3637
)
3738

3839
// Reconcile reconcile machine instance.
3940
func (s *Service) Reconcile(ctx context.Context) error {
41+
ctx, span := telemetry.Tracer().Start(
42+
ctx, "instances.Services.Reconcile",
43+
)
44+
defer span.End()
45+
4046
log := log.FromContext(ctx)
4147
log.Info("Reconciling instance resources")
4248
instance, err := s.createOrGetInstance(ctx)
@@ -99,6 +105,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
99105

100106
// Delete delete machine instance.
101107
func (s *Service) Delete(ctx context.Context) error {
108+
ctx, span := telemetry.Tracer().Start(
109+
ctx, "instances.Services.Reconcile",
110+
)
111+
defer span.End()
112+
102113
log := log.FromContext(ctx)
103114
log.Info("Deleting instance resources")
104115
instanceSpec := s.scope.InstanceSpec(log)

‎cloud/services/compute/loadbalancers/reconcile.go

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"k8s.io/utils/ptr"
2828
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
2929
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
30+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
3031
"sigs.k8s.io/controller-runtime/pkg/log"
3132
)
3233

@@ -48,6 +49,11 @@ const (
4849

4950
// Reconcile reconcile cluster control-plane loadbalancer components.
5051
func (s *Service) Reconcile(ctx context.Context) error {
52+
ctx, span := telemetry.Tracer().Start(
53+
ctx, "loadbalancers.Services.Reconcile",
54+
)
55+
defer span.End()
56+
5157
log := log.FromContext(ctx)
5258
log.Info("Reconciling loadbalancer resources")
5359

@@ -82,6 +88,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
8288

8389
// Delete deletes cluster control-plane loadbalancer components.
8490
func (s *Service) Delete(ctx context.Context) error {
91+
ctx, span := telemetry.Tracer().Start(
92+
ctx, "loadbalancers.Services.Delete",
93+
)
94+
defer span.End()
95+
8596
log := log.FromContext(ctx)
8697
var allErrs []error
8798
lbSpec := s.scope.LoadBalancer()
@@ -253,6 +264,11 @@ func (s *Service) createInternalLoadBalancer(ctx context.Context, name string, l
253264
}
254265

255266
func (s *Service) createOrGetInstanceGroups(ctx context.Context) ([]*compute.InstanceGroup, error) {
267+
ctx, span := telemetry.Tracer().Start(
268+
ctx, "loadbalancers.Services.createOrGetInstanceGroups",
269+
)
270+
defer span.End()
271+
256272
log := log.FromContext(ctx)
257273
fd := s.scope.FailureDomains()
258274
zones := make([]string, 0, len(fd))
@@ -297,6 +313,11 @@ func (s *Service) createOrGetInstanceGroups(ctx context.Context) ([]*compute.Ins
297313
}
298314

299315
func (s *Service) createOrGetHealthCheck(ctx context.Context, lbname string) (*compute.HealthCheck, error) {
316+
ctx, span := telemetry.Tracer().Start(
317+
ctx, "loadbalancers.Services.createOrGetHealthCheck",
318+
)
319+
defer span.End()
320+
300321
log := log.FromContext(ctx)
301322
healthcheckSpec := s.scope.HealthCheckSpec(lbname)
302323
log.V(2).Info("Looking for healthcheck", "name", healthcheckSpec.Name)
@@ -324,6 +345,11 @@ func (s *Service) createOrGetHealthCheck(ctx context.Context, lbname string) (*c
324345
}
325346

326347
func (s *Service) createOrGetRegionalHealthCheck(ctx context.Context, lbname string) (*compute.HealthCheck, error) {
348+
ctx, span := telemetry.Tracer().Start(
349+
ctx, "loadbalancers.Services.createOrGetBackendService",
350+
)
351+
defer span.End()
352+
327353
log := log.FromContext(ctx)
328354
healthcheckSpec := s.scope.HealthCheckSpec(lbname)
329355
healthcheckSpec.Region = s.scope.Region()
@@ -460,6 +486,11 @@ func (s *Service) createOrGetRegionalBackendService(ctx context.Context, lbname
460486
}
461487

462488
func (s *Service) createOrGetTargetTCPProxy(ctx context.Context, service *compute.BackendService) (*compute.TargetTcpProxy, error) {
489+
ctx, span := telemetry.Tracer().Start(
490+
ctx, "loadbalancers.Services.createOrGetTargetTCPProxy",
491+
)
492+
defer span.End()
493+
463494
log := log.FromContext(ctx)
464495
targetSpec := s.scope.TargetTCPProxySpec()
465496
targetSpec.Service = service.SelfLink
@@ -488,6 +519,11 @@ func (s *Service) createOrGetTargetTCPProxy(ctx context.Context, service *comput
488519

489520
// createOrGetAddress is used to obtain a Global address.
490521
func (s *Service) createOrGetAddress(ctx context.Context, lbname string) (*compute.Address, error) {
522+
ctx, span := telemetry.Tracer().Start(
523+
ctx, "loadbalancers.Services.createOrGetAddress",
524+
)
525+
defer span.End()
526+
491527
log := log.FromContext(ctx)
492528
addrSpec := s.scope.AddressSpec(lbname)
493529
log.V(2).Info("Looking for address", "name", addrSpec.Name)
@@ -553,6 +589,11 @@ func (s *Service) createOrGetInternalAddress(ctx context.Context, lbname string)
553589

554590
// createOrGetForwardingRule is used obtain a Global ForwardingRule.
555591
func (s *Service) createOrGetForwardingRule(ctx context.Context, lbname string, target *compute.TargetTcpProxy, addr *compute.Address) (*compute.ForwardingRule, error) {
592+
ctx, span := telemetry.Tracer().Start(
593+
ctx, "loadbalancers.Services.createOrGetForwardingRule",
594+
)
595+
defer span.End()
596+
556597
log := log.FromContext(ctx)
557598
spec := s.scope.ForwardingRuleSpec(lbname)
558599
spec.Target = target.SelfLink
@@ -655,6 +696,11 @@ func (s *Service) createOrGetRegionalForwardingRule(ctx context.Context, lbname
655696
}
656697

657698
func (s *Service) deleteForwardingRule(ctx context.Context, lbname string) error {
699+
ctx, span := telemetry.Tracer().Start(
700+
ctx, "loadbalancers.Services.deleteForwardingRule",
701+
)
702+
defer span.End()
703+
658704
log := log.FromContext(ctx)
659705
spec := s.scope.ForwardingRuleSpec(lbname)
660706
key := meta.GlobalKey(spec.Name)
@@ -681,6 +727,11 @@ func (s *Service) deleteRegionalForwardingRule(ctx context.Context, lbname strin
681727
}
682728

683729
func (s *Service) deleteAddress(ctx context.Context, lbname string) error {
730+
ctx, span := telemetry.Tracer().Start(
731+
ctx, "loadbalancers.Services.deleteAddress",
732+
)
733+
defer span.End()
734+
684735
log := log.FromContext(ctx)
685736
spec := s.scope.AddressSpec(lbname)
686737
key := meta.GlobalKey(spec.Name)
@@ -705,6 +756,11 @@ func (s *Service) deleteInternalAddress(ctx context.Context, lbname string) erro
705756
}
706757

707758
func (s *Service) deleteTargetTCPProxy(ctx context.Context) error {
759+
ctx, span := telemetry.Tracer().Start(
760+
ctx, "loadbalancers.Services.deleteTargetTCPProxy",
761+
)
762+
defer span.End()
763+
708764
log := log.FromContext(ctx)
709765
spec := s.scope.TargetTCPProxySpec()
710766
key := meta.GlobalKey(spec.Name)
@@ -718,6 +774,11 @@ func (s *Service) deleteTargetTCPProxy(ctx context.Context) error {
718774
}
719775

720776
func (s *Service) deleteBackendService(ctx context.Context, lbname string) error {
777+
ctx, span := telemetry.Tracer().Start(
778+
ctx, "loadbalancers.Services.deleteBackendService",
779+
)
780+
defer span.End()
781+
721782
log := log.FromContext(ctx)
722783
spec := s.scope.BackendServiceSpec(lbname)
723784
key := meta.GlobalKey(spec.Name)
@@ -744,6 +805,11 @@ func (s *Service) deleteRegionalBackendService(ctx context.Context, lbname strin
744805
}
745806

746807
func (s *Service) deleteHealthCheck(ctx context.Context, lbname string) error {
808+
ctx, span := telemetry.Tracer().Start(
809+
ctx, "loadbalancers.Services.deleteHealthCheck",
810+
)
811+
defer span.End()
812+
747813
log := log.FromContext(ctx)
748814
spec := s.scope.HealthCheckSpec(lbname)
749815
key := meta.GlobalKey(spec.Name)
@@ -770,6 +836,11 @@ func (s *Service) deleteRegionalHealthCheck(ctx context.Context, lbname string)
770836
}
771837

772838
func (s *Service) deleteInstanceGroups(ctx context.Context) error {
839+
ctx, span := telemetry.Tracer().Start(
840+
ctx, "loadbalancers.Services.deleteInstanceGroups",
841+
)
842+
defer span.End()
843+
773844
log := log.FromContext(ctx)
774845
for zone := range s.scope.Network().APIServerInstanceGroups {
775846
spec := s.scope.InstanceGroupSpec(zone)

‎cloud/services/compute/networks/reconcile.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ import (
2626

2727
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
2828
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
29+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2930
"sigs.k8s.io/controller-runtime/pkg/log"
3031
)
3132

3233
// Reconcile reconcile cluster network components.
3334
func (s *Service) Reconcile(ctx context.Context) error {
35+
ctx, span := telemetry.Tracer().Start(
36+
ctx, "networks.Services.Reconcile",
37+
)
38+
defer span.End()
39+
3440
log := log.FromContext(ctx)
3541
log.Info("Reconciling network resources")
3642
network, err := s.createOrGetNetwork(ctx)
@@ -53,6 +59,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
5359

5460
// Delete delete cluster network components.
5561
func (s *Service) Delete(ctx context.Context) error {
62+
ctx, span := telemetry.Tracer().Start(
63+
ctx, "networks.Services.Delete",
64+
)
65+
defer span.End()
66+
5667
log := log.FromContext(ctx)
5768
if s.scope.IsSharedVpc() {
5869
log.V(2).Info("Shared VPC enabled. Ignore Deleting network resources")
@@ -100,6 +111,11 @@ func (s *Service) Delete(ctx context.Context) error {
100111

101112
// createOrGetNetwork creates a network if not exist otherwise return existing network.
102113
func (s *Service) createOrGetNetwork(ctx context.Context) (*compute.Network, error) {
114+
ctx, span := telemetry.Tracer().Start(
115+
ctx, "networks.Services.createOrGetNetwork",
116+
)
117+
defer span.End()
118+
103119
log := log.FromContext(ctx)
104120
log.V(2).Info("Looking for network", "name", s.scope.NetworkName())
105121
networkKey := meta.GlobalKey(s.scope.NetworkName())
@@ -132,6 +148,11 @@ func (s *Service) createOrGetNetwork(ctx context.Context) (*compute.Network, err
132148

133149
// createOrGetRouter creates a cloudnat router if not exist otherwise return the existing.
134150
func (s *Service) createOrGetRouter(ctx context.Context, network *compute.Network) (*compute.Router, error) {
151+
ctx, span := telemetry.Tracer().Start(
152+
ctx, "networks.Services.createOrGetRouter",
153+
)
154+
defer span.End()
155+
135156
log := log.FromContext(ctx)
136157
spec := s.scope.NatRouterSpec()
137158
log.V(2).Info("Looking for cloudnat router", "name", spec.Name)

‎cloud/services/compute/subnets/reconcile.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,17 @@ import (
2525
"google.golang.org/api/compute/v1"
2626

2727
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
28+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2829
"sigs.k8s.io/controller-runtime/pkg/log"
2930
)
3031

3132
// Reconcile reconciles cluster network components.
3233
func (s *Service) Reconcile(ctx context.Context) error {
34+
ctx, span := telemetry.Tracer().Start(
35+
ctx, "subnets.Services.Reconcile",
36+
)
37+
defer span.End()
38+
3339
logger := log.FromContext(ctx)
3440
logger.Info("Reconciling subnetwork resources")
3541

@@ -43,6 +49,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
4349

4450
// Delete deletes cluster subnetwork components.
4551
func (s *Service) Delete(ctx context.Context) error {
52+
ctx, span := telemetry.Tracer().Start(
53+
ctx, "subnets.Services.Delete",
54+
)
55+
defer span.End()
56+
4657
logger := log.FromContext(ctx)
4758
if s.scope.IsSharedVpc() {
4859
logger.V(2).Info("Shared VPC enabled. Skip deleting subnet resources")
@@ -81,6 +92,11 @@ func (s *Service) Delete(ctx context.Context) error {
8192

8293
// createOrGetSubnets creates the subnetworks if they don't exist otherwise return the existing ones.
8394
func (s *Service) createOrGetSubnets(ctx context.Context) ([]*compute.Subnetwork, error) {
95+
ctx, span := telemetry.Tracer().Start(
96+
ctx, "subnets.Services.createOrGetSubnets",
97+
)
98+
defer span.End()
99+
84100
logger := log.FromContext(ctx)
85101
subnets := []*compute.Subnetwork{}
86102
for _, subnetSpec := range s.scope.SubnetSpecs() {

0 commit comments

Comments
 (0)