Split metrics on last client write

staging/kos/cmd/attachment-tput-driver/main.go

@@ -560,7 +560,7 @@ func (slot *Slot) close(VNI uint32, nsName string) *netv1a1.NetworkAttachment {
 		}
 		c2t.ObserveAt(slot.testedTime.Sub(slot.preCreateTime).Seconds(), nsName, slot.natt.Name)
 		r2t.ObserveAt(slot.testedTime.Sub(slot.readyTime).Seconds(), nsName, slot.natt.Name)
-		testCounts.With(prometheus.Labels{esLabel: strconv.FormatInt(int64(slot.testES), 10), lgComplaintsLabel: strconv.FormatInt(int64(slot.testLgComplaints), 10), fullLabel: strconv.FormatBool(slot.fullTest)}).Inc()
+		testCounts.WithLabelValues(strconv.FormatInt(int64(slot.testES), 10), strconv.FormatInt(int64(slot.testLgComplaints), 10), strconv.FormatBool(slot.fullTest)).Inc()
 	}
 	if slot.addressedTime == (time.Time{}) {
 		glog.Infof("Attachment got no address: attachment=%s/%s, VNI=%06x, node=%s\n", nsName, slot.currentAttachmentName, VNI, slot.currentNodeName)

staging/kos/pkg/apis/network/types.go

@@ -221,6 +221,11 @@ type NetworkAttachmentStatus struct {
 	// +optional
 	Errors NetworkAttachmentErrors
 
+	// SubnetCreationTime is the API server write time of the SubnetSectionSpec
+	// of the subnet identified by NetworkAttachmentSpec.Subnet.
+	// +optional
+	SubnetCreationTime metav1.MicroTime
+
 	// AddressContention indicates whether the address assignment was
 	// delayed due to not enough addresses being available at first.
 	AddressContention bool

staging/kos/pkg/apis/network/v1alpha1/types.go

@@ -221,39 +221,44 @@ type NetworkAttachmentStatus struct {
 	// +optional
 	Errors NetworkAttachmentErrors `json:"errors,omitempty" protobuf:"bytes,1,opt,name=errors"`
 
+	// SubnetCreationTime is the API server write time of the SubnetSectionSpec
+	// of the subnet identified by NetworkAttachmentSpec.Subnet.
+	// +optional
+	SubnetCreationTime metav1.MicroTime `json:"subnetCreationTime,omitempty" protobuf:"bytes,2,opt,name=subnetCreationTime"`
+
 	// AddressContention indicates whether the address assignment was
 	// delayed due to not enough addresses being available at first.
-	AddressContention bool `json:"addressDelayed,omitempty" protbuf:"bytes,9,opt,name=addressDelayed"`
+	AddressContention bool `json:"addressContention,omitempty" protobuf:"bytes,3,opt,name=addressContention"`
 
 	// LockUID is the UID of the IPLock object holding this attachment's
 	// IP address, or the empty string when there is no address.
 	// This field is a private detail of the implementation, not really
 	// part of the public API.
 	// +optional
-	LockUID string `json:"lockUID,omitempty" protobuf:"bytes,2,opt,name=lockUID"`
+	LockUID string `json:"lockUID,omitempty" protobuf:"bytes,4,opt,name=lockUID"`
 
 	// AddressVNI is the VNI associated with this attachment's
 	// IP address assignment, or the empty string when there is no address.
 	// +optional
-	AddressVNI uint32 `json:"addressVNI,omitempty" protobuf:"bytes,3,opt,name=addressVNI"`
+	AddressVNI uint32 `json:"addressVNI,omitempty" protobuf:"bytes,5,opt,name=addressVNI"`
 
 	// IPv4 is non-empty when an address has been assigned.
 	// +optional
-	IPv4 string `json:"ipv4,omitempty" protobuf:"bytes,4,opt,name=ipv4"`
+	IPv4 string `json:"ipv4,omitempty" protobuf:"bytes,6,opt,name=ipv4"`
 
 	// MACAddress is non-empty while there is a corresponding Linux
 	// network interface on the host.
 	// +optional
-	MACAddress string `json:"macAddress,omitempty" protobuf:"bytes,5,opt,name=macAddress"`
+	MACAddress string `json:"macAddress,omitempty" protobuf:"bytes,7,opt,name=macAddress"`
 
 	// IfcName is the name of the network interface that implements this
 	// attachment on its node, or the empty string to indicate no
 	// implementation.
 	// +optional
-	IfcName string `json:"ifcName,omitempty" protobuf:"bytes,6,opt,name=ifcname"`
+	IfcName string `json:"ifcName,omitempty" protobuf:"bytes,8,opt,name=ifcname"`
 	// HostIP is the IP address of the node the attachment is bound to.
 	// +optional
-	HostIP string `json:"hostIP,omitempty" protobuf:"bytes,7,opt,name=hostIP"`
+	HostIP string `json:"hostIP,omitempty" protobuf:"bytes,9,opt,name=hostIP"`
 
 	// PostCreateExecReport, if non-nil, reports on the run of the
 	// PostCreateExec that was launched when the Linux network
@@ -266,7 +271,7 @@ type NetworkAttachmentStatus struct {
 	// PostCreateExec of the attachment for whom the Linux network
 	// interface was first created.
 	// +optional
-	PostCreateExecReport *ExecReport `json:"postCreateExecReport,omitempty" protobuf:"bytes,8,opt,name=postCreateExecReport"`
+	PostCreateExecReport *ExecReport `json:"postCreateExecReport,omitempty" protobuf:"bytes,10,opt,name=postCreateExecReport"`
 }
 
 type NetworkAttachmentErrors struct {

staging/kos/pkg/controllers/connectionagent/attachment_execs.go

@@ -25,8 +25,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
-
 	k8smetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
@@ -108,8 +106,12 @@ func (c *ConnectionAgent) runCommand(attNSN k8stypes.NamespacedName, ifc netfabr
 	}
 	exitStatusStr := strconv.FormatInt(int64(cr.ExitStatus), 10)
 	lgComplaintsStr := strconv.FormatInt(int64(bits.Len(complaints)-1), 10)
-	c.attachmentExecDurationHistograms.With(prometheus.Labels{"what": what, "exitStatus": exitStatusStr, "lgComplaints": lgComplaintsStr}).Observe(stopTime.Sub(startTime).Seconds())
-	c.attachmentExecStatusCounts.With(prometheus.Labels{"what": what, "exitStatus": exitStatusStr, "lgComplaints": lgComplaintsStr}).Inc()
+	c.attachmentExecDurationHistograms.
+		WithLabelValues(what, exitStatusStr, lgComplaintsStr).
+		Observe(stopTime.Sub(startTime).Seconds())
+	c.attachmentExecStatusCounts.
+		WithLabelValues(what, exitStatusStr, lgComplaintsStr).
+		Inc()
 	klog.V(4).Infof("Exec report: att=%s, vni=%06x, ipv4=%s, ifcName=%s, mac=%s, what=%s, report=%#+v", attNSN, ifc.VNI, ifc.GuestIP, ifc.Name, ifc.GuestMAC, what, cr)
 	if setExecReport != nil {
 		setExecReport(cr)