update testdata with new expected results

axoflow · Jul 10, 2024 · 6ba58ec · 6ba58ec
1 parent 8b40322
commit 6ba58ec
Show file tree

Hide file tree

Showing 26 changed files with 1,301 additions and 798 deletions.
diff --git a/connector/countconnector/testdata/logs/condition_and_attribute.yaml b/connector/countconnector/testdata/logs/condition_and_attribute.yaml
@@ -1,61 +1,65 @@
 resourceMetrics:
   - resource:
       attributes:
-        - key: resource.required
-          value:
-            stringValue: foo
         - key: resource.optional
           value:
             stringValue: bar
+        - key: resource.required
+          value:
+            stringValue: foo
     scopeMetrics:
       - metrics:
           - description: Log count by attribute if ...
             name: log.count.if.by_attr
             sum:
               aggregationTemporality: 1
               dataPoints:
+                - asInt: "1"
+                  timeUnixNano: "1000000"
                 - asInt: "2"
                   attributes:
                     - key: log.required
                       value:
                         stringValue: foo
-                  timeUnixNano: "1678390948399018000"
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
                     - key: log.required
                       value:
                         stringValue: notfoo
-                  timeUnixNano: "1678390948399018000"
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector
   - resource:
       attributes:
-        - key: resource.required
-          value:
-            stringValue: foo
         - key: resource.optional
           value:
             stringValue: notbar
+        - key: resource.required
+          value:
+            stringValue: foo
     scopeMetrics:
       - metrics:
           - description: Log count by attribute if ...
             name: log.count.if.by_attr
             sum:
               aggregationTemporality: 1
               dataPoints:
+                - asInt: "1"
+                  timeUnixNano: "1000000"
                 - asInt: "2"
                   attributes:
                     - key: log.required
                       value:
                         stringValue: foo
-                  timeUnixNano: "1678390948399021000"
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
                     - key: log.required
                       value:
                         stringValue: notfoo
-                  timeUnixNano: "1678390948399021000"
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector
diff --git a/connector/countconnector/testdata/logs/default_attribute_value.yaml b/connector/countconnector/testdata/logs/default_attribute_value.yaml
@@ -1,12 +1,5 @@
 resourceMetrics:
-  - resource:
-      attributes:
-        - key: resource.required
-          value:
-            stringValue: foo
-        - key: resource.optional
-          value:
-            stringValue: bar
+  - resource: {}
     scopeMetrics:
       - metrics:
           - description: Log count by attribute with default
@@ -16,42 +9,45 @@ resourceMetrics:
               dataPoints:
                 - asInt: "1"
                   attributes:
-                    - key: log.required
-                      value:
-                        stringValue: foo
                     - key: log.optional
                       value:
-                        stringValue: bar
-                  timeUnixNano: "1678390948398365000"
+                        stringValue: other
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
+                    - key: log.optional
+                      value:
+                        stringValue: bar
                     - key: log.required
                       value:
                         stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: notbar
-                  timeUnixNano: "1678390948398365000"
-                - asInt: "1"
-                  attributes:
                     - key: log.required
                       value:
-                        stringValue: notfoo
+                        stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: other
-                  timeUnixNano: "1678390948398365000"
+                    - key: log.required
+                      value:
+                        stringValue: notfoo
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector
   - resource:
       attributes:
         - key: resource.required
           value:
-            stringValue: foo
-        - key: resource.optional
-          value:
-            stringValue: notbar
+            stringValue: notfoo
     scopeMetrics:
       - metrics:
           - description: Log count by attribute with default
@@ -61,39 +57,48 @@ resourceMetrics:
               dataPoints:
                 - asInt: "1"
                   attributes:
-                    - key: log.required
-                      value:
-                        stringValue: foo
                     - key: log.optional
                       value:
-                        stringValue: bar
-                  timeUnixNano: "1678390948398368000"
+                        stringValue: other
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
+                    - key: log.optional
+                      value:
+                        stringValue: bar
                     - key: log.required
                       value:
                         stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: notbar
-                  timeUnixNano: "1678390948398368000"
-                - asInt: "1"
-                  attributes:
                     - key: log.required
                       value:
-                        stringValue: notfoo
+                        stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: other
-                  timeUnixNano: "1678390948398368000"
+                    - key: log.required
+                      value:
+                        stringValue: notfoo
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector
   - resource:
       attributes:
+        - key: resource.optional
+          value:
+            stringValue: bar
         - key: resource.required
           value:
-            stringValue: notfoo
+            stringValue: foo
     scopeMetrics:
       - metrics:
           - description: Log count by attribute with default
@@ -103,35 +108,48 @@ resourceMetrics:
               dataPoints:
                 - asInt: "1"
                   attributes:
-                    - key: log.required
-                      value:
-                        stringValue: foo
                     - key: log.optional
                       value:
-                        stringValue: bar
-                  timeUnixNano: "1678390948398371000"
+                        stringValue: other
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
+                    - key: log.optional
+                      value:
+                        stringValue: bar
                     - key: log.required
                       value:
                         stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: notbar
-                  timeUnixNano: "1678390948398371000"
-                - asInt: "1"
-                  attributes:
                     - key: log.required
                       value:
-                        stringValue: notfoo
+                        stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: other
-                  timeUnixNano: "1678390948398371000"
+                    - key: log.required
+                      value:
+                        stringValue: notfoo
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector
-  - resource: {}
+  - resource:
+      attributes:
+        - key: resource.optional
+          value:
+            stringValue: notbar
+        - key: resource.required
+          value:
+            stringValue: foo
     scopeMetrics:
       - metrics:
           - description: Log count by attribute with default
@@ -141,31 +159,37 @@ resourceMetrics:
               dataPoints:
                 - asInt: "1"
                   attributes:
-                    - key: log.required
-                      value:
-                        stringValue: foo
                     - key: log.optional
                       value:
-                        stringValue: bar
-                  timeUnixNano: "1678390948398373000"
+                        stringValue: other
+                  timeUnixNano: "1000000"
                 - asInt: "1"
                   attributes:
+                    - key: log.optional
+                      value:
+                        stringValue: bar
                     - key: log.required
                       value:
                         stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: notbar
-                  timeUnixNano: "1678390948398373000"
-                - asInt: "1"
-                  attributes:
                     - key: log.required
                       value:
-                        stringValue: notfoo
+                        stringValue: foo
+                  timeUnixNano: "1000000"
+                - asInt: "1"
+                  attributes:
                     - key: log.optional
                       value:
                         stringValue: other
-                  timeUnixNano: "1678390948398373000"
+                    - key: log.required
+                      value:
+                        stringValue: notfoo
+                  timeUnixNano: "1000000"
               isMonotonic: true
         scope:
           name: otelcol/countconnector