feat(bigquery): Add some missing fields to BQ stats (#12212)

Co-authored-by: Alvaro Viebrantz <[email protected]>

Author: ash-ddog

bigquery/integration_test.go

@@ -1458,6 +1458,10 @@ func TestIntegration_QueryStatistics(t *testing.T) {
 		t.Fatal("expected job statistics, none found")
 	}
 
+	if status.Statistics.TotalSlotDuration <= 0 {
+		t.Errorf("expected positive total slot duration, %s reported", status.Statistics.TotalSlotDuration.String())
+	}
+
 	if status.Statistics.NumChildJobs != 0 {
 		t.Errorf("expected no children, %d reported", status.Statistics.NumChildJobs)
 	}
@@ -1466,6 +1470,16 @@ func TestIntegration_QueryStatistics(t *testing.T) {
 		t.Errorf("expected no parent, but parent present: %s", status.Statistics.ParentJobID)
 	}
 
+	if status.Statistics.FinalExecutionDuration <= 0 {
+		t.Errorf("expected positive final execution duration, %s reported", status.Statistics.FinalExecutionDuration.String())
+	}
+
+	switch status.Statistics.Edition {
+	case ReservationEditionUnspecified, ReservationEditionStandard, ReservationEditionEnterprise, ReservationEditionEnterprisePlus:
+	default:
+		t.Errorf("expected known reservation edition, %s reported", status.Statistics.Edition)
+	}
+
 	if status.Statistics.Details == nil {
 		t.Fatal("expected job details, none present")
 	}

bigquery/job.go

@@ -381,13 +381,36 @@ func (j *Job) waitForQuery(ctx context.Context, projectID string) (Schema, uint6
 
 // JobStatistics contains statistics about a job.
 type JobStatistics struct {
-	CreationTime        time.Time
-	StartTime           time.Time
-	EndTime             time.Time
+	// CreationTime is the creation time of this job.
+	// This field will be present on all jobs.
+	CreationTime time.Time
+
+	// StartTime is the start time of this job.
+	// This field will be present when the job transitions from the PENDING state to either RUNNING or DONE.
+	StartTime time.Time
+
+	// EndTime is the end time of this job.
+	// This field will be present whenever a job is in the DONE state.
+	EndTime time.Time
+
+	// TotalBytesProcessed is the total bytes processed for the job.
 	TotalBytesProcessed int64
 
+	// Details is the jobType-specific statistics for the job
 	Details Statistics
 
+	// TotalSlotDuration is the slot duration for the job.
+	TotalSlotDuration time.Duration
+
+	// ReservationUsage attributes slot consumption to reservations.
+	// This field reported misleading information and will no longer be populated.
+	ReservationUsage []*ReservationUsage
+
+	// ReservationID is the name of the primary reservation assigned to this job.
+	// Note that this could be different than reservations reported in the reservation
+	// usage field if parent reservations were used to execute this job.
+	ReservationID string
+
 	// NumChildJobs indicates the number of child jobs run as part of a script.
 	NumChildJobs int64
 
@@ -398,14 +421,19 @@ type JobStatistics struct {
 	// a script.
 	ScriptStatistics *ScriptStatistics
 
-	// ReservationUsage attributes slot consumption to reservations.
-	ReservationUsage []*ReservationUsage
-
 	// TransactionInfo indicates the transaction ID associated with the job, if any.
 	TransactionInfo *TransactionInfo
 
 	// SessionInfo contains information about the session if this job is part of one.
 	SessionInfo *SessionInfo
+
+	// FinalExecutionDuration is the duration of the execution of the final
+	// attempt of this job, as BigQuery may internally re-attempt to execute the job.
+	FinalExecutionDuration time.Duration
+
+	// Edition is the name of edition corresponding to the reservation for this job
+	// at the time of this update.
+	Edition ReservationEdition
 }
 
 // Statistics is one of ExtractStatistics, LoadStatistics or QueryStatistics.
@@ -697,6 +725,23 @@ type QueryTimelineSample struct {
 	SlotMillis int64
 }
 
+// ReservationEdition is used to specify the name of edition corresponding to the reservation.
+type ReservationEdition string
+
+var (
+	// ReservationEditionUnspecified is the default value, which will be treated as ReservationEditionEnterprise
+	ReservationEditionUnspecified ReservationEdition = "RESERVATION_EDITION_UNSPECIFIED"
+
+	// ReservationEditionStandard represents the Standard edition.
+	ReservationEditionStandard ReservationEdition = "STANDARD"
+
+	// ReservationEditionEnterprise represents the Enterprise edition.
+	ReservationEditionEnterprise ReservationEdition = "ENTERPRISE"
+
+	// ReservationEditionEnterprisePlus represents the Enterprise Plus edition.
+	ReservationEditionEnterprisePlus ReservationEdition = "ENTERPRISE_PLUS"
+)
+
 // ReservationUsage contains information about a job's usage of a single reservation.
 type ReservationUsage struct {
 	// SlotMillis reports the slot milliseconds utilized within in the given reservation.
@@ -1014,16 +1059,20 @@ func (j *Job) setStatistics(s *bq.JobStatistics, c *Client) {
 		return
 	}
 	js := &JobStatistics{
-		CreationTime:        unixMillisToTime(s.CreationTime),
-		StartTime:           unixMillisToTime(s.StartTime),
-		EndTime:             unixMillisToTime(s.EndTime),
-		TotalBytesProcessed: s.TotalBytesProcessed,
-		NumChildJobs:        s.NumChildJobs,
-		ParentJobID:         s.ParentJobId,
-		ScriptStatistics:    bqToScriptStatistics(s.ScriptStatistics),
-		ReservationUsage:    bqToReservationUsage(s.ReservationUsage),
-		TransactionInfo:     bqToTransactionInfo(s.TransactionInfo),
-		SessionInfo:         bqToSessionInfo(s.SessionInfo),
+		CreationTime:           unixMillisToTime(s.CreationTime),
+		StartTime:              unixMillisToTime(s.StartTime),
+		EndTime:                unixMillisToTime(s.EndTime),
+		TotalBytesProcessed:    s.TotalBytesProcessed,
+		TotalSlotDuration:      time.Duration(s.TotalSlotMs) * time.Millisecond,
+		ReservationUsage:       bqToReservationUsage(s.ReservationUsage),
+		ReservationID:          s.ReservationId,
+		NumChildJobs:           s.NumChildJobs,
+		ParentJobID:            s.ParentJobId,
+		ScriptStatistics:       bqToScriptStatistics(s.ScriptStatistics),
+		TransactionInfo:        bqToTransactionInfo(s.TransactionInfo),
+		SessionInfo:            bqToSessionInfo(s.SessionInfo),
+		FinalExecutionDuration: time.Duration(s.FinalExecutionDurationMs) * time.Millisecond,
+		Edition:                ReservationEdition(s.Edition),
 	}
 	switch {
 	case s.Extract != nil: