Revert "uint don't need a min=0 validation"

This reverts commit dc27da9.
elastic · Jul 26, 2023 · fd78568 · fd78568
1 parent 6f6bcaa
commit fd78568
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/input/elasticapm/docs/spec/rumv3/transaction.json b/input/elasticapm/docs/spec/rumv3/transaction.json
@@ -379,7 +379,8 @@
           "properties": {
             "count": {
               "description": "Count is the total number of of longtasks.",
-              "type": "integer"
+              "type": "integer",
+              "minimum": 0
             },
             "max": {
               "description": "Max longtask duration",

diff --git a/input/elasticapm/docs/spec/v2/metricset.json b/input/elasticapm/docs/spec/v2/metricset.json
@@ -87,7 +87,8 @@
                 "array"
               ],
               "items": {
-                "type": "integer"
+                "type": "integer",
+                "minimum": 0
               },
               "minItems": 0
             },

diff --git a/input/elasticapm/docs/spec/v2/transaction.json b/input/elasticapm/docs/spec/v2/transaction.json
@@ -759,7 +759,8 @@
                     "type": [
                       "null",
                       "integer"
-                    ]
+                    ],
+                    "minimum": 0
                   }
                 }
               }
@@ -835,7 +836,8 @@
           "properties": {
             "count": {
               "description": "Count is the total number of of longtasks.",
-              "type": "integer"
+              "type": "integer",
+              "minimum": 0
             },
             "max": {
               "description": "Max longtask duration",

diff --git a/input/elasticapm/internal/modeldecoder/rumv3/model.go b/input/elasticapm/internal/modeldecoder/rumv3/model.go
@@ -622,7 +622,7 @@ type transactionUserExperience struct {
 
 type longtaskMetrics struct {
 	// Count is the total number of of longtasks.
-	Count nullable.Int `json:"count" validate:"required"`
+	Count nullable.Int `json:"count" validate:"required,min=0"`
 	// Max longtask duration
 	Max nullable.Float64 `json:"max" validate:"required,min=0"`
 	// Sum of longtask durations

diff --git a/input/elasticapm/internal/modeldecoder/rumv3/model_generated.go b/input/elasticapm/internal/modeldecoder/rumv3/model_generated.go
diff --git a/input/elasticapm/internal/modeldecoder/v2/model.go b/input/elasticapm/internal/modeldecoder/v2/model.go
@@ -680,7 +680,7 @@ type metricsetSampleValue struct {
 	// If Counts is specified, then Values is expected to be
 	// specified with the same number of elements, and with the
 	// same order.
-	Counts []uint64 `json:"counts" validate:"requiredIfAny=values"`
+	Counts []uint64 `json:"counts" validate:"requiredIfAny=values,minVals=0"`
 	// Value holds the value of a single metric sample.
 	Value nullable.Float64 `json:"value"`
 }
@@ -1117,7 +1117,7 @@ type transactionUserExperience struct {
 
 type longtaskMetrics struct {
 	// Count is the total number of of longtasks.
-	Count nullable.Int `json:"count" validate:"required"`
+	Count nullable.Int `json:"count" validate:"required,min=0"`
 	// Max longtask duration
 	Max nullable.Float64 `json:"max" validate:"required,min=0"`
 	// Sum of longtask durations
@@ -1161,7 +1161,7 @@ type transactionDroppedSpansDuration struct {
 
 type transactionDroppedSpansDurationSum struct {
 	// Us represents the summation of the span duration.
-	Us nullable.Int `json:"us"`
+	Us nullable.Int `json:"us" validate:"min=0"`
 }
 
 type spanLink struct {

diff --git a/input/elasticapm/internal/modeldecoder/v2/model_generated.go b/input/elasticapm/internal/modeldecoder/v2/model_generated.go