Implemented offline discussion

Author: zasweq

experimental/stats/metricregistry.go

@@ -55,8 +55,8 @@ type Int64CountHandle struct {
 
 // RecordInt64Count records the int64 count value on the metrics recorder
 // provided.
-func (h *Int64CountHandle) RecordInt64Count(recorder MetricsRecorder, labels []Label, optionalLabels []Label, incr int64) {
-	recorder.RecordIntCount(*h, labels, optionalLabels, incr)
+func (h Int64CountHandle) RecordInt64Count(recorder MetricsRecorder, incr int64, labels ...string) {
+	recorder.RecordIntCount(h, incr, labels...)
 }
 
 // Float64CountHandle is a typed handle for a float count instrument. This handle
@@ -68,8 +68,8 @@ type Float64CountHandle struct {
 
 // RecordFloat64Count records the float64 count value on the metrics recorder
 // provided.
-func (h *Float64CountHandle) RecordFloat64Count(recorder MetricsRecorder, labels []Label, optionalLabels []Label, incr float64) {
-	recorder.RecordFloatCount(*h, labels, optionalLabels, incr)
+func (h Float64CountHandle) RecordFloat64Count(recorder MetricsRecorder, incr float64, labels ...string) {
+	recorder.RecordFloatCount(h, incr, labels...)
 }
 
 // Int64HistoHandle is a typed handle for an int histogram instrument. This
@@ -81,8 +81,8 @@ type Int64HistoHandle struct {
 
 // RecordInt64Histo records the int64 histo value on the metrics recorder
 // provided.
-func (h *Int64HistoHandle) RecordInt64Histo(recorder MetricsRecorder, labels []Label, optionalLabels []Label, incr int64) {
-	recorder.RecordIntHisto(*h, labels, optionalLabels, incr)
+func (h Int64HistoHandle) RecordInt64Histo(recorder MetricsRecorder, incr int64, labels ...string) {
+	recorder.RecordIntHisto(h, incr, labels...)
 }
 
 // Float64HistoHandle is a typed handle for a float histogram instrument. This
@@ -94,8 +94,8 @@ type Float64HistoHandle struct {
 
 // RecordFloat64Histo records the float64 histo value on the metrics recorder
 // provided.
-func (h *Float64HistoHandle) RecordFloat64Histo(recorder MetricsRecorder, labels []Label, optionalLabels []Label, incr float64) {
-	recorder.RecordFloatHisto(*h, labels, optionalLabels, incr)
+func (h Float64HistoHandle) RecordFloat64Histo(recorder MetricsRecorder, incr float64, labels ...string) {
+	recorder.RecordFloatHisto(h, incr, labels...)
 }
 
 // Int64GaugeHandle is a typed handle for an int gauge instrument. This handle
@@ -107,8 +107,8 @@ type Int64GaugeHandle struct {
 
 // RecordInt64Histo records the int64 histo value on the metrics recorder
 // provided.
-func (h *Int64GaugeHandle) RecordInt64Gauge(recorder MetricsRecorder, labels []Label, optionalLabels []Label, incr int64) {
-	recorder.RecordIntGauge(*h, labels, optionalLabels, incr)
+func (h Int64GaugeHandle) RecordInt64Gauge(recorder MetricsRecorder, incr int64, labels ...string) {
+	recorder.RecordIntGauge(h, incr, labels...)
 }
 
 // registeredInsts are the registered instrument descriptor names.

experimental/stats/metricregistry/metric_registry.go

@@ -74,6 +74,9 @@ func verifyLabels(t *testing.T, labelsWant []string, optionalLabelsWant []string
 	if len(optionalLabelsWant) != len(optionalLabelsGot) {
 		t.Fatalf("length of optional labels expected did not match got %v, want %v", len(optionalLabelsGot), len(optionalLabelsWant))
 	}
+
+	// This is essentially now a check of len(labels + optional labels) vs labels provided...
+
 }
 
 // Test 2 for each? 5 different maps...?
@@ -133,3 +136,15 @@ func (r *fakeMetricsRecorder) RecordIntGauge(handle Int64GaugeHandle, labels []L
 
 // If run out of time just push implementation...otel and metrics recorder list still come after I guess...
 // just push the extra file....
+
+
+// Tests sound good to Doug get this plumbing working...
+
+// switch the labels to be variadic args based on position, length check on labels + optional labels
+
+// optional labels are always plumbed up through otel, otel decides whether it
+// wants the optional labels or not...
+
+// on handle and metrics recorder
+
+

experimental/stats/metricregistry_test.go

@@ -24,25 +24,17 @@ package stats
 type MetricsRecorder interface {
 	// RecordIntCount records the measurement alongside labels on the int count
 	// associated with the provided handle.
-	RecordIntCount(Int64CountHandle, []Label, []Label, int64)
+	RecordIntCount(Int64CountHandle, int64, ...string)
 	// RecordFloatCount records the measurement alongside labels on the float count
 	// associated with the provided handle.
-	RecordFloatCount(Float64CountHandle, []Label, []Label, float64)
+	RecordFloatCount(Float64CountHandle, float64, ...string)
 	// RecordIntHisto records the measurement alongside labels on the int histo
 	// associated with the provided handle.
-	RecordIntHisto(Int64HistoHandle, []Label, []Label, int64)
+	RecordIntHisto(Int64HistoHandle, int64, ...string)
 	// RecordFloatHisto records the measurement alongside labels on the float
 	// histo associated with the provided handle.
-	RecordFloatHisto(Float64HistoHandle, []Label, []Label, float64)
+	RecordFloatHisto(Float64HistoHandle, float64, ...string)
 	// RecordIntGauge records the measurement alongside labels on the int gauge
 	// associated with the provided handle.
-	RecordIntGauge(Int64GaugeHandle, []Label, []Label, int64)
-}
-
-// Label represents a string attribute/label to attach to metrics.
-type Label struct {
-	// Key is the key of the label.
-	Key string
-	// Value is the value of the label.
-	Value string
+	RecordIntGauge(Int64GaugeHandle, int64, ...string)
 }