Skip to content

Commit 1b98f8e

Browse files
meobilivangmeobilivang
committed
instrument cloud/services/compute
1 parent eb25369 commit 1b98f8e

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
@@ -21,11 +21,17 @@ import (
2121

2222
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
2323
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
24+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2425
"sigs.k8s.io/controller-runtime/pkg/log"
2526
)
2627

2728
// Reconcile reconcile cluster firewall compoenents.
2829
func (s *Service) Reconcile(ctx context.Context) error {
30+
ctx, span := telemetry.Tracer().Start(
31+
ctx, "firewalls.Services.Reconcile",
32+
)
33+
defer span.End()
34+
2935
log := log.FromContext(ctx)
3036
log.Info("Reconciling firewall resources")
3137
for _, spec := range s.scope.FirewallRulesSpec() {
@@ -48,6 +54,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
4854

4955
// Delete delete cluster firewall compoenents.
5056
func (s *Service) Delete(ctx context.Context) error {
57+
ctx, span := telemetry.Tracer().Start(
58+
ctx, "firewalls.Services.Delete",
59+
)
60+
defer span.End()
61+
5162
log := log.FromContext(ctx)
5263
log.Info("Deleting firewall resources")
5364
for _, spec := range s.scope.FirewallRulesSpec() {

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ import (
2929
"k8s.io/utils/pointer"
3030
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
3131
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
32+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
3233
"sigs.k8s.io/controller-runtime/pkg/log"
3334
)
3435

3536
// Reconcile reconcile machine instance.
3637
func (s *Service) Reconcile(ctx context.Context) error {
38+
ctx, span := telemetry.Tracer().Start(
39+
ctx, "instances.Services.Reconcile",
40+
)
41+
defer span.End()
42+
3743
log := log.FromContext(ctx)
3844
log.Info("Reconciling instance resources")
3945
instance, err := s.createOrGetInstance(ctx)
@@ -96,6 +102,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
96102

97103
// Delete delete machine instance.
98104
func (s *Service) Delete(ctx context.Context) error {
105+
ctx, span := telemetry.Tracer().Start(
106+
ctx, "instances.Services.Reconcile",
107+
)
108+
defer span.End()
109+
99110
log := log.FromContext(ctx)
100111
log.Info("Deleting instance resources")
101112
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
@@ -23,11 +23,17 @@ import (
2323
"google.golang.org/api/compute/v1"
2424
"k8s.io/utils/pointer"
2525
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
26+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2627
"sigs.k8s.io/controller-runtime/pkg/log"
2728
)
2829

2930
// Reconcile reconcile cluster control-plane loadbalancer compoenents.
3031
func (s *Service) Reconcile(ctx context.Context) error {
32+
ctx, span := telemetry.Tracer().Start(
33+
ctx, "loadbalancers.Services.Reconcile",
34+
)
35+
defer span.End()
36+
3137
log := log.FromContext(ctx)
3238
log.Info("Reconciling loadbalancer resources")
3339
instancegroups, err := s.createOrGetInstanceGroups(ctx)
@@ -60,6 +66,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
6066

6167
// Delete delete cluster control-plane loadbalancer compoenents.
6268
func (s *Service) Delete(ctx context.Context) error {
69+
ctx, span := telemetry.Tracer().Start(
70+
ctx, "loadbalancers.Services.Delete",
71+
)
72+
defer span.End()
73+
6374
log := log.FromContext(ctx)
6475
log.Info("Deleting loadbalancer resources")
6576
if err := s.deleteForwardingRule(ctx); err != nil {
@@ -86,6 +97,11 @@ func (s *Service) Delete(ctx context.Context) error {
8697
}
8798

8899
func (s *Service) createOrGetInstanceGroups(ctx context.Context) ([]*compute.InstanceGroup, error) {
100+
ctx, span := telemetry.Tracer().Start(
101+
ctx, "loadbalancers.Services.createOrGetInstanceGroups",
102+
)
103+
defer span.End()
104+
89105
log := log.FromContext(ctx)
90106
fd := s.scope.FailureDomains()
91107
zones := make([]string, 0, len(fd))
@@ -130,6 +146,11 @@ func (s *Service) createOrGetInstanceGroups(ctx context.Context) ([]*compute.Ins
130146
}
131147

132148
func (s *Service) createOrGetHealthCheck(ctx context.Context) (*compute.HealthCheck, error) {
149+
ctx, span := telemetry.Tracer().Start(
150+
ctx, "loadbalancers.Services.createOrGetHealthCheck",
151+
)
152+
defer span.End()
153+
133154
log := log.FromContext(ctx)
134155
healthcheckSpec := s.scope.HealthCheckSpec()
135156
log.V(2).Info("Looking for healthcheck", "name", healthcheckSpec.Name)
@@ -157,6 +178,11 @@ func (s *Service) createOrGetHealthCheck(ctx context.Context) (*compute.HealthCh
157178
}
158179

159180
func (s *Service) createOrGetBackendService(ctx context.Context, instancegroups []*compute.InstanceGroup, healthcheck *compute.HealthCheck) (*compute.BackendService, error) {
181+
ctx, span := telemetry.Tracer().Start(
182+
ctx, "loadbalancers.Services.createOrGetBackendService",
183+
)
184+
defer span.End()
185+
160186
log := log.FromContext(ctx)
161187
backends := make([]*compute.Backend, 0, len(instancegroups))
162188
for _, group := range instancegroups {
@@ -202,6 +228,11 @@ func (s *Service) createOrGetBackendService(ctx context.Context, instancegroups
202228
}
203229

204230
func (s *Service) createOrGetTargetTCPProxy(ctx context.Context, service *compute.BackendService) (*compute.TargetTcpProxy, error) {
231+
ctx, span := telemetry.Tracer().Start(
232+
ctx, "loadbalancers.Services.createOrGetTargetTCPProxy",
233+
)
234+
defer span.End()
235+
205236
log := log.FromContext(ctx)
206237
targetSpec := s.scope.TargetTCPProxySpec()
207238
targetSpec.Service = service.SelfLink
@@ -229,6 +260,11 @@ func (s *Service) createOrGetTargetTCPProxy(ctx context.Context, service *comput
229260
}
230261

231262
func (s *Service) createOrGetAddress(ctx context.Context) (*compute.Address, error) {
263+
ctx, span := telemetry.Tracer().Start(
264+
ctx, "loadbalancers.Services.createOrGetAddress",
265+
)
266+
defer span.End()
267+
232268
log := log.FromContext(ctx)
233269
addrSpec := s.scope.AddressSpec()
234270
log.V(2).Info("Looking for address", "name", addrSpec.Name)
@@ -259,6 +295,11 @@ func (s *Service) createOrGetAddress(ctx context.Context) (*compute.Address, err
259295
}
260296

261297
func (s *Service) createForwardingRule(ctx context.Context, target *compute.TargetTcpProxy, addr *compute.Address) error {
298+
ctx, span := telemetry.Tracer().Start(
299+
ctx, "loadbalancers.Services.createForwardingRule",
300+
)
301+
defer span.End()
302+
262303
log := log.FromContext(ctx)
263304
spec := s.scope.ForwardingRuleSpec()
264305
key := meta.GlobalKey(spec.Name)
@@ -289,6 +330,11 @@ func (s *Service) createForwardingRule(ctx context.Context, target *compute.Targ
289330
}
290331

291332
func (s *Service) deleteForwardingRule(ctx context.Context) error {
333+
ctx, span := telemetry.Tracer().Start(
334+
ctx, "loadbalancers.Services.deleteForwardingRule",
335+
)
336+
defer span.End()
337+
292338
log := log.FromContext(ctx)
293339
spec := s.scope.ForwardingRuleSpec()
294340
key := meta.GlobalKey(spec.Name)
@@ -303,6 +349,11 @@ func (s *Service) deleteForwardingRule(ctx context.Context) error {
303349
}
304350

305351
func (s *Service) deleteAddress(ctx context.Context) error {
352+
ctx, span := telemetry.Tracer().Start(
353+
ctx, "loadbalancers.Services.deleteAddress",
354+
)
355+
defer span.End()
356+
306357
log := log.FromContext(ctx)
307358
spec := s.scope.AddressSpec()
308359
key := meta.GlobalKey(spec.Name)
@@ -316,6 +367,11 @@ func (s *Service) deleteAddress(ctx context.Context) error {
316367
}
317368

318369
func (s *Service) deleteTargetTCPProxy(ctx context.Context) error {
370+
ctx, span := telemetry.Tracer().Start(
371+
ctx, "loadbalancers.Services.deleteTargetTCPProxy",
372+
)
373+
defer span.End()
374+
319375
log := log.FromContext(ctx)
320376
spec := s.scope.TargetTCPProxySpec()
321377
key := meta.GlobalKey(spec.Name)
@@ -330,6 +386,11 @@ func (s *Service) deleteTargetTCPProxy(ctx context.Context) error {
330386
}
331387

332388
func (s *Service) deleteBackendService(ctx context.Context) error {
389+
ctx, span := telemetry.Tracer().Start(
390+
ctx, "loadbalancers.Services.deleteBackendService",
391+
)
392+
defer span.End()
393+
333394
log := log.FromContext(ctx)
334395
spec := s.scope.BackendServiceSpec()
335396
key := meta.GlobalKey(spec.Name)
@@ -344,6 +405,11 @@ func (s *Service) deleteBackendService(ctx context.Context) error {
344405
}
345406

346407
func (s *Service) deleteHealthCheck(ctx context.Context) error {
408+
ctx, span := telemetry.Tracer().Start(
409+
ctx, "loadbalancers.Services.deleteHealthCheck",
410+
)
411+
defer span.End()
412+
347413
log := log.FromContext(ctx)
348414
spec := s.scope.HealthCheckSpec()
349415
key := meta.GlobalKey(spec.Name)
@@ -358,6 +424,11 @@ func (s *Service) deleteHealthCheck(ctx context.Context) error {
358424
}
359425

360426
func (s *Service) deleteInstanceGroups(ctx context.Context) error {
427+
ctx, span := telemetry.Tracer().Start(
428+
ctx, "loadbalancers.Services.deleteInstanceGroups",
429+
)
430+
defer span.End()
431+
361432
log := log.FromContext(ctx)
362433
for zone := range s.scope.Network().APIServerInstanceGroups {
363434
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
@@ -24,11 +24,17 @@ import (
2424
"k8s.io/utils/pointer"
2525
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
2626
"sigs.k8s.io/cluster-api-provider-gcp/cloud/gcperrors"
27+
"sigs.k8s.io/cluster-api-provider-gcp/util/telemetry"
2728
"sigs.k8s.io/controller-runtime/pkg/log"
2829
)
2930

3031
// Reconcile reconcile cluster network components.
3132
func (s *Service) Reconcile(ctx context.Context) error {
33+
ctx, span := telemetry.Tracer().Start(
34+
ctx, "networks.Services.Reconcile",
35+
)
36+
defer span.End()
37+
3238
log := log.FromContext(ctx)
3339
log.Info("Reconciling network resources")
3440
network, err := s.createOrGetNetwork(ctx)
@@ -51,6 +57,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
5157

5258
// Delete delete cluster network components.
5359
func (s *Service) Delete(ctx context.Context) error {
60+
ctx, span := telemetry.Tracer().Start(
61+
ctx, "networks.Services.Delete",
62+
)
63+
defer span.End()
64+
5465
log := log.FromContext(ctx)
5566
log.Info("Deleting network resources")
5667
networkKey := meta.GlobalKey(s.scope.NetworkName())
@@ -92,6 +103,11 @@ func (s *Service) Delete(ctx context.Context) error {
92103

93104
// createOrGetNetwork creates a network if not exist otherwise return existing network.
94105
func (s *Service) createOrGetNetwork(ctx context.Context) (*compute.Network, error) {
106+
ctx, span := telemetry.Tracer().Start(
107+
ctx, "networks.Services.createOrGetNetwork",
108+
)
109+
defer span.End()
110+
95111
log := log.FromContext(ctx)
96112
log.V(2).Info("Looking for network", "name", s.scope.NetworkName())
97113
networkKey := meta.GlobalKey(s.scope.NetworkName())
@@ -119,6 +135,11 @@ func (s *Service) createOrGetNetwork(ctx context.Context) (*compute.Network, err
119135

120136
// createOrGetRouter creates a cloudnat router if not exist otherwise return the existing.
121137
func (s *Service) createOrGetRouter(ctx context.Context, network *compute.Network) (*compute.Router, error) {
138+
ctx, span := telemetry.Tracer().Start(
139+
ctx, "networks.Services.createOrGetRouter",
140+
)
141+
defer span.End()
142+
122143
log := log.FromContext(ctx)
123144
spec := s.scope.NatRouterSpec()
124145
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
@@ -22,11 +22,17 @@ import (
2222
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
2323
"google.golang.org/api/compute/v1"
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 network components.
2930
func (s *Service) Reconcile(ctx context.Context) error {
31+
ctx, span := telemetry.Tracer().Start(
32+
ctx, "subnets.Services.Reconcile",
33+
)
34+
defer span.End()
35+
3036
logger := log.FromContext(ctx)
3137
logger.Info("Reconciling subnetwork resources")
3238

@@ -40,6 +46,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
4046

4147
// Delete deletes cluster subnetwork components.
4248
func (s *Service) Delete(ctx context.Context) error {
49+
ctx, span := telemetry.Tracer().Start(
50+
ctx, "subnets.Services.Delete",
51+
)
52+
defer span.End()
53+
4354
logger := log.FromContext(ctx)
4455
for _, subnetSpec := range s.scope.SubnetSpecs() {
4556
logger.V(2).Info("Deleting a subnet", "name", subnetSpec.Name)
@@ -56,6 +67,11 @@ func (s *Service) Delete(ctx context.Context) error {
5667

5768
// createOrGetSubnets creates the subnetworks if they don't exist otherwise return the existing ones.
5869
func (s *Service) createOrGetSubnets(ctx context.Context) ([]*compute.Subnetwork, error) {
70+
ctx, span := telemetry.Tracer().Start(
71+
ctx, "subnets.Services.createOrGetSubnets",
72+
)
73+
defer span.End()
74+
5975
logger := log.FromContext(ctx)
6076
subnets := []*compute.Subnetwork{}
6177
for _, subnetSpec := range s.scope.SubnetSpecs() {

0 commit comments

Comments
 (0)