cmd/coordinator, internal/coordinator/log: create coordinator log pkg

This change moves the coordinator event logging into a package.

Updates golang/go#38337
Updates golang/go#48742

Change-Id: If3714ca741f48ba703e4585e3cbe3755e66b8613
Reviewed-on: https://go-review.googlesource.com/c/build/+/368675
Trust: Carlos Amedee <[email protected]>
Run-TryBot: Carlos Amedee <[email protected]>
Reviewed-by: Heschi Kreinick <[email protected]>
Reviewed-by: Alex Rakoczy <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>

Author: cagedmantis

cmd/coordinator/buildstatus.go

@@ -32,6 +32,7 @@ import (
 	"golang.org/x/build/dashboard"
 	"golang.org/x/build/internal/buildgo"
 	"golang.org/x/build/internal/buildstats"
+	clog "golang.org/x/build/internal/coordinator/log"
 	"golang.org/x/build/internal/coordinator/pool"
 	"golang.org/x/build/internal/singleflight"
 	"golang.org/x/build/internal/sourcecache"
@@ -206,7 +207,7 @@ func (st *buildStatus) start() {
 				log.Println(st.BuilderRev, "failed:", err)
 			}
 			st.setDone(err == nil)
-			putBuildRecord(st.buildRecord())
+			clog.CoordinatorProcess().PutBuildRecord(st.buildRecord())
 		}
 		markDone(st.BuilderRev)
 	}()
@@ -424,7 +425,7 @@ func (st *buildStatus) build() error {
 		cancel()
 	}
 
-	putBuildRecord(st.buildRecord())
+	clog.CoordinatorProcess().PutBuildRecord(st.buildRecord())
 
 	sp := st.CreateSpan("checking_for_snapshot")
 	if pool.NewGCEConfiguration().InStaging() {

cmd/coordinator/coordinator.go

@@ -57,6 +57,7 @@ import (
 	"golang.org/x/build/internal/buildgo"
 	"golang.org/x/build/internal/buildstats"
 	"golang.org/x/build/internal/cloud"
+	clog "golang.org/x/build/internal/coordinator/log"
 	"golang.org/x/build/internal/coordinator/pool"
 	"golang.org/x/build/internal/coordinator/remote"
 	"golang.org/x/build/internal/https"
@@ -244,6 +245,8 @@ func main() {
 	https.RegisterFlags(flag.CommandLine)
 	flag.Parse()
 
+	clog.SetProcessMetadata(processID, processStartTime)
+
 	if Version == "" && *mode == "dev" {
 		Version = "dev"
 	}
@@ -299,7 +302,7 @@ func main() {
 		}
 	}
 
-	go updateInstanceRecord()
+	go clog.CoordinatorProcess().UpdateInstanceRecord()
 
 	switch *mode {
 	case "dev", "prod":
@@ -2021,7 +2024,7 @@ func (s *span) Done(err error) error {
 		fmt.Fprintf(&text, "; %v", s.optText)
 	}
 	if st, ok := s.el.(*buildStatus); ok {
-		putSpanRecord(st.spanRecord(s, err))
+		clog.CoordinatorProcess().PutSpanRecord(st.spanRecord(s, err))
 	}
 	s.el.LogEventTime("finish_"+s.event, text.String())
 	return err

cmd/coordinator/log.go renamed to internal/coordinator/log/log.go

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.16 && (linux || darwin)
-// +build go1.16
+//go:build linux || darwin
 // +build linux darwin
 
-package main
+package log
 
 import (
 	"context"
 	"fmt"
 	"log"
+	"sync"
 	"time"
 
 	"cloud.google.com/go/datastore"
@@ -20,6 +20,33 @@ import (
 	"golang.org/x/build/types"
 )
 
+type Process struct {
+	processID        string
+	processStartTime time.Time
+}
+
+var (
+	process *Process
+	once    sync.Once
+)
+
+// SetProcessMetadata sets metadata about the process. This should be called before any
+// event logging operations.
+func SetProcessMetadata(id string, startTime time.Time) *Process {
+	once.Do(func() {
+		process = &Process{
+			processID:        id,
+			processStartTime: startTime,
+		}
+	})
+	return process
+}
+
+// CoordinatorProcess returns the package level process logger.
+func CoordinatorProcess() *Process {
+	return process
+}
+
 // Process is a datastore record about the lifetime of a coordinator process.
 //
 // Example GQL query:
@@ -33,17 +60,17 @@ type ProcessRecord struct {
 	// GCE instance type?
 }
 
-func updateInstanceRecord() {
+func (p *Process) UpdateInstanceRecord() {
 	dsClient := pool.NewGCEConfiguration().DSClient()
 	if dsClient == nil {
 		return
 	}
 	ctx := context.Background()
 	for {
-		key := datastore.NameKey("Process", processID, nil)
+		key := datastore.NameKey("Process", p.processID, nil)
 		_, err := dsClient.Put(ctx, key, &ProcessRecord{
-			ID:            processID,
-			Start:         processStartTime,
+			ID:            p.processID,
+			Start:         p.processStartTime,
 			LastHeartbeat: time.Now(),
 		})
 		if err != nil {
@@ -53,7 +80,7 @@ func updateInstanceRecord() {
 	}
 }
 
-func putBuildRecord(br *types.BuildRecord) {
+func (p *Process) PutBuildRecord(br *types.BuildRecord) {
 	dsClient := pool.NewGCEConfiguration().DSClient()
 	if dsClient == nil {
 		return
@@ -65,7 +92,7 @@ func putBuildRecord(br *types.BuildRecord) {
 	}
 }
 
-func putSpanRecord(sr *types.SpanRecord) {
+func (p *Process) PutSpanRecord(sr *types.SpanRecord) {
 	dsClient := pool.NewGCEConfiguration().DSClient()
 	if dsClient == nil {
 		return