test repair

open-telemetry · Aug 31, 2021 · d1f4af3 · d1f4af3
1 parent 0b98a3c
commit d1f4af3
Showing 1 changed file with 38 additions and 38 deletions.
diff --git a/sdk/metric/correct_test.go b/sdk/metric/correct_test.go
@@ -275,13 +275,13 @@ func TestObserverCollection(t *testing.T) {
 	meter, sdk, _, processor := newSDK(t)
 	mult := 1
 
-	_ = Must(meter).NewFloat64GaugeObserver("float.gaugeobserver.lastvalue", func(_ context.Context, result metric.Float64ObserverResult) {
+	_ = Must(meter).NewFloat64GaugeObserver("float.gauge.lastvalue", func(_ context.Context, result metric.Float64ObserverResult) {
 		result.Observe(float64(mult), attribute.String("A", "B"))
 		// last value wins
 		result.Observe(float64(-mult), attribute.String("A", "B"))
 		result.Observe(float64(-mult), attribute.String("C", "D"))
 	})
-	_ = Must(meter).NewInt64GaugeObserver("int.gaugeobserver.lastvalue", func(_ context.Context, result metric.Int64ObserverResult) {
+	_ = Must(meter).NewInt64GaugeObserver("int.gauge.lastvalue", func(_ context.Context, result metric.Int64ObserverResult) {
 		result.Observe(int64(-mult), attribute.String("A", "B"))
 		result.Observe(int64(mult))
 		// last value wins
@@ -315,7 +315,7 @@ func TestObserverCollection(t *testing.T) {
 		result.Observe(int64(-mult))
 	})
 
-	_ = Must(meter).NewInt64GaugeObserver("empty.gaugeobserver.sum", func(_ context.Context, result metric.Int64ObserverResult) {
+	_ = Must(meter).NewInt64GaugeObserver("empty.gauge.sum", func(_ context.Context, result metric.Int64ObserverResult) {
 	})
 
 	for mult = 0; mult < 3; mult++ {
@@ -331,15 +331,15 @@ func TestObserverCollection(t *testing.T) {
 			"int.gauge.lastvalue//":      mult,
 			"int.gauge.lastvalue/A=B/":   mult,
 
-			"float.sumobserver.sum/A=B/": 2 * mult,
-			"float.sumobserver.sum/C=D/": mult,
-			"int.sumobserver.sum//":      mult,
-			"int.sumobserver.sum/A=B/":   mult,
+			"float.counterobserver.sum/A=B/": 2 * mult,
+			"float.counterobserver.sum/C=D/": mult,
+			"int.counterobserver.sum//":      mult,
+			"int.counterobserver.sum/A=B/":   mult,
 
-			"float.updownsumobserver.sum/A=B/": -2 * mult,
-			"float.updownsumobserver.sum/C=D/": mult,
-			"int.updownsumobserver.sum//":      -mult,
-			"int.updownsumobserver.sum/A=B/":   mult,
+			"float.updowncounterobserver.sum/A=B/": -2 * mult,
+			"float.updowncounterobserver.sum/C=D/": mult,
+			"int.updowncounterobserver.sum//":      -mult,
+			"int.updowncounterobserver.sum/A=B/":   mult,
 		}, processor.Values())
 	}
 }
@@ -388,34 +388,34 @@ func TestObserverBatch(t *testing.T) {
 				[]attribute.KeyValue{
 					attribute.String("A", "B"),
 				},
-				floatValueObs.Observation(1),
-				floatValueObs.Observation(-1),
-				intValueObs.Observation(-1),
-				intValueObs.Observation(1),
-				floatSumObs.Observation(1000),
-				intSumObs.Observation(100),
-				floatUpDownSumObs.Observation(-1000),
-				intUpDownSumObs.Observation(-100),
+				floatGaugeObs.Observation(1),
+				floatGaugeObs.Observation(-1),
+				intGaugeObs.Observation(-1),
+				intGaugeObs.Observation(1),
+				floatCounterObs.Observation(1000),
+				intCounterObs.Observation(100),
+				floatUpDownCounterObs.Observation(-1000),
+				intUpDownCounterObs.Observation(-100),
 			)
 			result.Observe(
 				[]attribute.KeyValue{
 					attribute.String("C", "D"),
 				},
-				floatValueObs.Observation(-1),
-				floatSumObs.Observation(-1),
-				floatUpDownSumObs.Observation(-1),
+				floatGaugeObs.Observation(-1),
+				floatCounterObs.Observation(-1),
+				floatUpDownCounterObs.Observation(-1),
 			)
 			result.Observe(
 				nil,
-				intValueObs.Observation(1),
-				intValueObs.Observation(1),
-				intSumObs.Observation(10),
-				floatSumObs.Observation(1.1),
-				intUpDownSumObs.Observation(10),
+				intGaugeObs.Observation(1),
+				intGaugeObs.Observation(1),
+				intCounterObs.Observation(10),
+				floatCounterObs.Observation(1.1),
+				intUpDownCounterObs.Observation(10),
 			)
 		})
-	floatGaugeObs = batch.NewFloat64GaugeObserver("float.gaugeobserver.lastvalue")
-	intGaugeObs = batch.NewInt64GaugeObserver("int.gaugeobserver.lastvalue")
+	floatGaugeObs = batch.NewFloat64GaugeObserver("float.gauge.lastvalue")
+	intGaugeObs = batch.NewInt64GaugeObserver("int.gauge.lastvalue")
 	floatCounterObs = batch.NewFloat64CounterObserver("float.counterobserver.sum")
 	intCounterObs = batch.NewInt64CounterObserver("int.counterobserver.sum")
 	floatUpDownCounterObs = batch.NewFloat64UpDownCounterObserver("float.updowncounterobserver.sum")
@@ -426,15 +426,15 @@ func TestObserverBatch(t *testing.T) {
 	require.Equal(t, collected, len(processor.Values()))
 
 	require.EqualValues(t, map[string]float64{
-		"float.sumobserver.sum//":    1.1,
-		"float.sumobserver.sum/A=B/": 1000,
-		"int.sumobserver.sum//":      10,
-		"int.sumobserver.sum/A=B/":   100,
-
-		"int.updownsumobserver.sum/A=B/":   -100,
-		"float.updownsumobserver.sum/A=B/": -1000,
-		"int.updownsumobserver.sum//":      10,
-		"float.updownsumobserver.sum/C=D/": -1,
+		"float.counterobserver.sum//":    1.1,
+		"float.counterobserver.sum/A=B/": 1000,
+		"int.counterobserver.sum//":      10,
+		"int.counterobserver.sum/A=B/":   100,
+
+		"int.updowncounterobserver.sum/A=B/":   -100,
+		"float.updowncounterobserver.sum/A=B/": -1000,
+		"int.updowncounterobserver.sum//":      10,
+		"float.updowncounterobserver.sum/C=D/": -1,
 
 		"float.gauge.lastvalue/A=B/": -1,
 		"float.gauge.lastvalue/C=D/": -1,