Log build information from exparchive

client/cmd/isolate/exp_archive.go

Index: client/cmd/isolate/exp_archive.go
diff --git a/client/cmd/isolate/exp_archive.go b/client/cmd/isolate/exp_archive.go
index 49b0123328b70743f2f02b6d3d53dd94e54f9efd..05ed0aef2418d46a8526da7e91f62bf8f8de24b7 100644
--- a/client/cmd/isolate/exp_archive.go
+++ b/client/cmd/isolate/exp_archive.go
@@ -101,7 +101,7 @@ func (c *expArchiveRun) main() error {
 	}
 	client := isolatedclient.New(nil, authCl, c.isolatedFlags.ServerURL, c.isolatedFlags.Namespace, nil, nil)
 
-	// Set up a checker an uploader. We limit the uploader to one concurrent
+	// Set up a checker and uploader. We limit the uploader to one concurrent
 	// upload, since the uploads are all coming from disk (with the exception of
 	// the isolated JSON itself) and we only want a single goroutine reading from
 	// disk at once.
@@ -291,7 +291,7 @@ func (c *expArchiveRun) main() error {
 			MissBytes:   &checker.Miss.Bytes,
 			IsolateHash: []string{string(isolItem.Digest)},
 		}
-		if err := logStats(ctx, logger, start, end, archiveDetails); err != nil {
+		if err := logStats(ctx, logger, start, end, archiveDetails, getBuildbotInfo()); err != nil {
 			log.Printf("Failed to log to eventlog: %v", err)
 		}
 	}
@@ -342,7 +342,30 @@ func hashFile(path string) (isolated.HexDigest, error) {
 	return isolated.Hash(f)
 }
 
-func logStats(ctx context.Context, logger *eventlog.Client, start, end time.Time, archiveDetails *logpb.IsolateClientEvent_ArchiveDetails) error {
+// buildbotInfo contains information about the build in which this command was run.
+type buildbotInfo struct {

[mithro, 2017/05/31 05:56:28]

I think you want to reuse this function in the other archive commands too so it
probably should be in a different file?

[mcgreevy, 2017/05/31 06:09:23]

Yep, I have a followup CL almost done, where I'm adding logging to the legacy
archive. I've done some refactoring in that CL, which includes moving this into
its own file.  If you're OK with it, I'll leave this CL as-is and continue doing
the move in the other CL.

+	// Variables which are not present in the environment are nil.
+	master, builder, buildID, slave *string
+}
+
+// getBuildbotInfo poulates a buildbotInfo with information from the environment.
+func getBuildbotInfo() *buildbotInfo {
+	getEnvValue := func(key string) *string {
+		if val, ok := os.LookupEnv(key); ok {
+			return &val
+		}
+		return nil
+	}
+
+	return &buildbotInfo{
+		master:  getEnvValue("BUILDBOT_MASTERNAME"),
+		builder: getEnvValue("BUILDBOT_BUILDERNAME"),
+		buildID: getEnvValue("BUILDBOT_BUILDNUMBER"),
+		slave:   getEnvValue("BUILDBOT_SLAVENAME"),
+	}
+}
+
+func logStats(ctx context.Context, logger *eventlog.Client, start, end time.Time, archiveDetails *logpb.IsolateClientEvent_ArchiveDetails, bi *buildbotInfo) error {
 	event := logger.NewLogEvent(ctx, eventlog.Point())
 	event.InfraEvent.IsolateClientEvent = &logpb.IsolateClientEvent{
 		Binary: &logpb.Binary{
@@ -351,9 +374,12 @@ func logStats(ctx context.Context, logger *eventlog.Client, start, end time.Time
 		},
 		Operation:      logpb.IsolateClientEvent_ARCHIVE.Enum(),
 		ArchiveDetails: archiveDetails,
-		// TODO(mcgreevy): fill out Master, Builder, BuildId, Slave.
-		StartTsUsec: proto.Int64(int64(start.UnixNano() / 1e3)),
-		EndTsUsec:   proto.Int64(int64(end.UnixNano() / 1e3)),
+		Master:         bi.master,
+		Builder:        bi.builder,
+		BuildId:        bi.buildID,
+		Slave:          bi.slave,
+		StartTsUsec:    proto.Int64(int64(start.UnixNano() / 1e3)),
+		EndTsUsec:      proto.Int64(int64(end.UnixNano() / 1e3)),
 	}
 	return logger.LogSync(ctx, event)
 }