Enable discarded event records snapshot FT DST feature by default

This patch changes `config.py` (API) and the v3 YAML parser to make
the discarded event records snapshot field type (data stream type)
feature enabled by default.

This feature is nice to have, only adds an integer field to each packet,
and doesn't require anything from the user.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/barectf/config.py b/barectf/config.py
index fec77f4ca070ee0612a6bc3d8675f6217f9d4dea..3983f90c94ff63f915b5f39a468e3a182f560c10 100644 (file)
--- a/barectf/config.py
+++ b/barectf/config.py
@@ -442,7 +442,7 @@ class DataStreamTypePacketFeatures:
                  content_size_field_type: _DefaultableUIntFt = DEFAULT_FIELD_TYPE,
                  beginning_timestamp_field_type: _OptDefaultableUIntFt = None,
                  end_timestamp_field_type: _OptDefaultableUIntFt = None,
-                 discarded_event_records_snapshot_counter_field_type: _OptDefaultableUIntFt = None):
+                 discarded_event_records_snapshot_counter_field_type: _OptDefaultableUIntFt = DEFAULT_FIELD_TYPE):
         def get_ft(user_ft: _OptDefaultableUIntFt) -> _OptUIntFt:
             if user_ft == DEFAULT_FIELD_TYPE:
                 return UnsignedIntegerFieldType(64)

diff --git a/barectf/config_parse_v3.py b/barectf/config_parse_v3.py
index 6aea8722abec6310c8fc755b1fd0a11df5970083..95de5c1052e443c30fc0d7c90f9fd0ae271745ed 100644 (file)
--- a/barectf/config_parse_v3.py
+++ b/barectf/config_parse_v3.py
@@ -435,7 +435,7 @@ class _Parser(barectf_config_parse_common._Parser):
             pkt_content_size_ft = barectf_config.DEFAULT_FIELD_TYPE
             pkt_beginning_ts_ft = None
             pkt_end_ts_ft = None
-            pkt_discarded_er_counter_snap_ft = None
+            pkt_disc_er_counter_snap_ft = barectf_config.DEFAULT_FIELD_TYPE
             ert_id_ft = barectf_config.DEFAULT_FIELD_TYPE
             ert_ts_ft = None
 
@@ -469,9 +469,9 @@ class _Parser(barectf_config_parse_common._Parser):
                                                            pkt_beginning_ts_ft)
                     pkt_end_ts_ft = self._feature_ft(pkt_node, 'end-timestamp-field-type',
                                                      pkt_end_ts_ft)
-                    pkt_discarded_er_counter_snap_ft = self._feature_ft(pkt_node,
+                    pkt_disc_er_counter_snap_ft = self._feature_ft(pkt_node,
                                                                    'discarded-event-records-counter-snapshot-field-type',
-                                                                   pkt_discarded_er_counter_snap_ft)
+                                                                   pkt_disc_er_counter_snap_ft)
 
                 # create event record feature field types
                 er_node = features_node.get('event-record')
@@ -503,7 +503,7 @@ class _Parser(barectf_config_parse_common._Parser):
                                                                        pkt_content_size_ft,
                                                                        pkt_beginning_ts_ft,
                                                                        pkt_end_ts_ft,
-                                                                       pkt_discarded_er_counter_snap_ft)
+                                                                       pkt_disc_er_counter_snap_ft)
             er_features = barectf_config.DataStreamTypeEventRecordFeatures(ert_id_ft, ert_ts_ft)
             features = barectf_config.DataStreamTypeFeatures(pkt_features, er_features)
 

diff --git a/tests/tracing/configs/succeed/dynamic-array/nested-5-uint8.yaml b/tests/tracing/configs/succeed/dynamic-array/nested-5-uint8.yaml
index 84fb5d7da745f90c4a255132080db8af8236c47d..f0a003704845b9bb9c407bdb6c1ba84cdac8c69a 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/nested-5-uint8.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/nested-5-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-double.yaml b/tests/tracing/configs/succeed/dynamic-array/of-double.yaml
index c25961d8f4a408b92e84276587484a450212e043..a448732bf8651e93d1735f185f5c49f3d2ad1e3a 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-double.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-double.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-double.yaml b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-double.yaml
index e7f0821e67066540899b89275782c54f71a47463..fb4ecc0cec5622f1a9ea13870fa52a51a305f168 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-double.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-double.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-str.yaml b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-str.yaml
index 71752ebd8f2afdb43141f4097130957adbbed666..1fb0ce43945548549c10b03b153eff4873b4f700 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-str.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-str.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-uint8.yaml b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-uint8.yaml
index 35fc76197afa778de0b5669ed6cfab43d60e6d0c..81307325a7f1d6955e5ee0ec763f930f2ea23ad5 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-uint8.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-static-array-of-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-str.yaml b/tests/tracing/configs/succeed/dynamic-array/of-str.yaml
index 8a74377a4ada8638cd419819f4b47de0112b74ca..d354bd31742972999d78896dac7aed43bd7c3e8e 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-str.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-str.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-uint3-middle.yaml b/tests/tracing/configs/succeed/dynamic-array/of-uint3-middle.yaml
index 632de03a596cba3a639d14edc0121c46ad680c59..7aee8abdc283fcdb56366d2a5e9e09263373aa51 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-uint3-middle.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-uint3-middle.yaml
@@ -32,6 +32,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-uint3.yaml b/tests/tracing/configs/succeed/dynamic-array/of-uint3.yaml
index f8d797140db76c737f51ee293982e2d3310cdfb1..5693c4bef9e5e58ef727a02d48fb87f7e763db5f 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-uint3.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-uint3.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/of-uint8.yaml b/tests/tracing/configs/succeed/dynamic-array/of-uint8.yaml
index 619189baa8f31bd493462f60c9978b02704077b2..a0716ec9bccc7a570b91505cae4e15f381db8018 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/of-uint8.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/of-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/dynamic-array/zero-len.yaml b/tests/tracing/configs/succeed/dynamic-array/zero-len.yaml
index d75fb0c459af12c19a9cb1881a97134456db94a8..211f587af881421e625fee344d6d91907f2e84b2 100644 (file)
--- a/tests/tracing/configs/succeed/dynamic-array/zero-len.yaml
+++ b/tests/tracing/configs/succeed/dynamic-array/zero-len.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/nested-5-uint8.yaml b/tests/tracing/configs/succeed/static-array/nested-5-uint8.yaml
index ee662db5b567a3d192ff8067dc95803693a519fc..b364f570d48e05c8c96ebfbe576f4cc2c7aed2ee 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/nested-5-uint8.yaml
+++ b/tests/tracing/configs/succeed/static-array/nested-5-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-double.yaml b/tests/tracing/configs/succeed/static-array/of-double.yaml
index 14387e753f0b166af56c02cc771de505deb050ac..a05bf482ca944f3e675d5c0fd3004c20da1735f2 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-double.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-double.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-static-array-of-double.yaml b/tests/tracing/configs/succeed/static-array/of-static-array-of-double.yaml
index b3f5f384bdc69723ef1c96008d2acfdb906351ac..ba8dec2ff73c23c4919052510c36d88bd9f7828b 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-static-array-of-double.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-static-array-of-double.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-static-array-of-str.yaml b/tests/tracing/configs/succeed/static-array/of-static-array-of-str.yaml
index e6f06ea2f40f42aedcb4e302293e9bd5133afb9c..3310c49b3a6ba40c8150a1328089ad0f0ff254eb 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-static-array-of-str.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-static-array-of-str.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-static-array-of-uint8.yaml b/tests/tracing/configs/succeed/static-array/of-static-array-of-uint8.yaml
index 917445a115ebd24ab25a2f749ccdc885bc097f87..0371d335a08672642e9d399abf09648bdf3c07a6 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-static-array-of-uint8.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-static-array-of-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-str.yaml b/tests/tracing/configs/succeed/static-array/of-str.yaml
index 6a9ccc0a5dcf9dd64ac24eee2099043b8252f9bd..937e51d308a5c31282413d9c2ae351445d64f4b5 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-str.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-str.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-uint3-middle.yaml b/tests/tracing/configs/succeed/static-array/of-uint3-middle.yaml
index 164f5ab9dcc9ada74ecff7822cd36bcfd03ccf90..1061d2afa924325cdead18cf27ca3b780785f3aa 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-uint3-middle.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-uint3-middle.yaml
@@ -32,6 +32,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-uint3.yaml b/tests/tracing/configs/succeed/static-array/of-uint3.yaml
index 745c16d4914d2e647a80375d04c2eed8bf4814f5..23e177b3e6f884d4545a97cf1cde6594d84e2b03 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-uint3.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-uint3.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/of-uint8.yaml b/tests/tracing/configs/succeed/static-array/of-uint8.yaml
index a07870fd29c3b4375812967822ef8c3042152d93..3a85a5bca58bb9f969b6e67de7481d4c47cba01f 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/of-uint8.yaml
+++ b/tests/tracing/configs/succeed/static-array/of-uint8.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type:

diff --git a/tests/tracing/configs/succeed/static-array/zero-len.yaml b/tests/tracing/configs/succeed/static-array/zero-len.yaml
index 0525f1cb1eba28766e5c89f56c8cfaca0244eb25..127a97e6c14e6e0ddc7dbb29c8d31f5d336970bb 100644 (file)
--- a/tests/tracing/configs/succeed/static-array/zero-len.yaml
+++ b/tests/tracing/configs/succeed/static-array/zero-len.yaml
@@ -31,6 +31,9 @@ trace:
     data-stream-types:
       default:
         $is-default: true
+        $features:
+          packet:
+            discarded-event-records-counter-snapshot-field-type: false
         event-record-types:
           ev:
             payload-field-type: