test that navigationTiming marks are the only ones impacted

elastic · Jun 15, 2018 · c5c2bf8 · c5c2bf8
1 parent a4a1ebe
commit c5c2bf8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1 deletion.
diff --git a/docs/data/elasticsearch/transaction.json b/docs/data/elasticsearch/transaction.json
@@ -116,6 +116,10 @@
         },
         "id": "945254c5-67a5-417e-8a4e-aa29efcbfb79",
         "marks": {
+            "another_mark": {
+                "some_float": 10,
+                "some_long": 10
+            },
             "navigationTiming": {
                 "appBeforeBootstrap": 608.930000,
                 "navigationStart": -21

diff --git a/docs/data/intake-api/generated/transaction/payload.json b/docs/data/intake-api/generated/transaction/payload.json
@@ -201,6 +201,10 @@
                     "navigationStart": -21
 
                 },
+                "another_mark": {
+                    "some_long": 10,
+                    "some_float": 10.0
+                },
                 "performance": {}
             }
         },

diff --git a/include/fields.go b/include/fields.go
diff --git a/processor/transaction/package_tests/TestProcessTransactionFull.approved.json b/processor/transaction/package_tests/TestProcessTransactionFull.approved.json
@@ -119,6 +119,10 @@
                 },
                 "id": "945254c5-67a5-417e-8a4e-aa29efcbfb79",
                 "marks": {
+                    "another_mark": {
+                        "some_float": 10,
+                        "some_long": 10
+                    },
                     "navigationTiming": {
                         "appBeforeBootstrap": 608.93,
                         "navigationStart": -21

diff --git a/tests/data/valid/transaction/payload.json b/tests/data/valid/transaction/payload.json
@@ -201,6 +201,10 @@
                     "navigationStart": -21
 
                 },
+                "another_mark": {
+                    "some_long": 10,
+                    "some_float": 10.0
+                },
                 "performance": {}
             }
         },

diff --git a/tests/system/test_integration.py b/tests/system/test_integration.py
@@ -54,6 +54,23 @@ def test_load_docs_with_template_and_add_transaction(self):
 
         self.check_backend_transaction_sourcemap(count=5)
 
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    def test_mark_navigation_timing(self):
+        self.load_docs_with_template(self.get_transaction_payload_path(), self.transactions_url, 'transaction', 9)
+        self.assert_no_logged_warnings()
+        mappings = self.es.indices.get_field_mapping(index=self.index_name, fields="transaction.marks.*")
+        found_other = False
+        for name, metric in mappings[self.index_name]["mappings"]["doc"].items():
+            for mapping in metric["mapping"].values():
+                mtype = mapping["type"]
+                if name.startswith("transaction.marks.navigationTiming."):
+                    assert mtype == "scaled_float", name + " mapped as " + mtype + ", not scaled_float"
+                else:
+                    # only navigation timing marks are scaled floats for now
+                    assert mtype != "scaled_float", name + " mapped as scaled_float"
+                    found_other = True
+        assert found_other, "no non-scaled_float marks found"
+
     @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
     def test_load_docs_with_template_and_add_error(self):
         """