telemetry: start trace on last commit timestamp; cleanups

Author: kimtore

pkg/deployclient/deployer.go

@@ -44,9 +44,6 @@ func Prepare(ctx context.Context, cfg *Config) (*pb.DeploymentRequest, error) {
 	var err error
 	templateVariables := make(TemplateVariables)
 
-	ctx, span := telemetry.Tracer().Start(ctx, "Templating and validation")
-	defer span.End()
-
 	err = cfg.Validate()
 	if err != nil {
 		if !errors.Is(err, ErrInvalidTelemetryFormat) {
@@ -164,12 +161,11 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 
 	// Root span for tracing.
 	// All sub-spans must be created from this context.
-	ctx, rootSpan := cfg.Telemetry.StartTracing(ctx, "Continuous integration pipeline")
+	ctx, rootSpan := cfg.Telemetry.StartTracing(ctx)
 	defer rootSpan.End()
 	deployRequest.TraceParent = telemetry.TraceParentHeader(ctx)
 
 	log.Infof("Sending deployment request to NAIS deploy at %s...", cfg.DeployServerURL)
-	log.Infof("Trace parent for this request: %s", deployRequest.TraceParent)
 
 	sendDeploymentRequest := func() error {
 		ctx, span := telemetry.Tracer().Start(ctx, "Send to deploy server")

pkg/grpc/dispatchserver/broker.go

@@ -27,7 +27,7 @@ func (s *dispatchServer) SendDeploymentRequest(ctx context.Context, request *pb.
 
 	ctx = telemetry.WithTraceParent(ctx, request.TraceParent)
 	s.traceSpansLock.Lock()
-	ctx, span := telemetry.Tracer().Start(ctx, "Dispatch to cluster", otrace.WithSpanKind(otrace.SpanKindServer))
+	ctx, span := telemetry.Tracer().Start(ctx, "Deploy", otrace.WithSpanKind(otrace.SpanKindServer))
 	s.traceSpans[request.ID] = span
 	request.TraceParent = telemetry.TraceParentHeader(ctx)
 	s.traceSpansLock.Unlock()

pkg/telemetry/telemetry.go

@@ -146,12 +146,13 @@ func (pt *PipelineTimings) Validate() error {
 	return nil
 }
 
-func (pt *PipelineTimings) StartTracing(ctx context.Context, name string) (context.Context, otrace.Span) {
+func (pt *PipelineTimings) StartTracing(ctx context.Context) (context.Context, otrace.Span) {
 	if pt == nil {
-		return Tracer().Start(ctx, name, otrace.WithSpanKind(otrace.SpanKindServer))
+		return Tracer().Start(ctx, "Continuous integration pipeline", otrace.WithSpanKind(otrace.SpanKindServer))
 	}
 
-	rootCtx, rootSpan := Tracer().Start(ctx, name, otrace.WithTimestamp(pt.Start), otrace.WithSpanKind(otrace.SpanKindServer))
+	rootCtx, rootSpan := Tracer().Start(ctx, "Continuous integration pipeline", otrace.WithTimestamp(pt.LatestCommit), otrace.WithSpanKind(otrace.SpanKindServer))
+	rootSpan.AddEvent("Latest commit to repository", otrace.WithTimestamp(pt.LatestCommit))
 	{
 		ciCtx, ciSpan := Tracer().Start(rootCtx, "Github Action: docker-build-push", otrace.WithTimestamp(pt.Start), otrace.WithAttributes())
 		{