chore(deps): Bump bitmask-enum from 2.2.3 to 2.2.4 (#20528)

* chore(deps): Bump bitmask-enum from 2.2.3 to 2.2.4 Bumps [bitmask-enum](https://github.com/Lukas3674/rust-bitmask-enum) from 2.2.3 to 2.2.4. - [Commits](https://github.com/Lukas3674/rust-bitmask-enum/commits) --- updated-dependencies: - dependency-name: bitmask-enum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * deprecated function Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * remove call to deprecated function Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * rustfmt Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
vectordotdev · May 23, 2024 · 72d1373 · 72d1373
1 parent b5ec6ae
commit 72d1373
Show file tree

Hide file tree

Showing 22 changed files with 92 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/codecs/src/decoding/format/native.rs b/lib/codecs/src/decoding/format/native.rs
@@ -24,7 +24,7 @@ impl NativeDeserializerConfig {
 
     /// Return the type of event build by this deserializer.
     pub fn output_type(&self) -> DataType {
-        DataType::all()
+        DataType::all_bits()
     }
 
     /// The schema produced by the deserializer.

diff --git a/lib/codecs/src/decoding/format/native_json.rs b/lib/codecs/src/decoding/format/native_json.rs
@@ -35,7 +35,7 @@ impl NativeJsonDeserializerConfig {
 
     /// Return the type of event build by this deserializer.
     pub fn output_type(&self) -> DataType {
-        DataType::all()
+        DataType::all_bits()
     }
 
     /// The schema produced by the deserializer.

diff --git a/lib/codecs/src/encoding/format/json.rs b/lib/codecs/src/encoding/format/json.rs
@@ -29,7 +29,7 @@ impl JsonSerializerConfig {
 
     /// The data type of events that are accepted by `JsonSerializer`.
     pub fn input_type(&self) -> DataType {
-        DataType::all()
+        DataType::all_bits()
     }
 
     /// The schema required by the serializer.

diff --git a/lib/codecs/src/encoding/format/native.rs b/lib/codecs/src/encoding/format/native.rs
@@ -20,7 +20,7 @@ impl NativeSerializerConfig {
 
     /// The data type of events that are accepted by `NativeSerializer`.
     pub fn input_type(&self) -> DataType {
-        DataType::all()
+        DataType::all_bits()
     }
 
     /// The schema required by the serializer.

diff --git a/lib/codecs/src/encoding/format/native_json.rs b/lib/codecs/src/encoding/format/native_json.rs
@@ -15,7 +15,7 @@ impl NativeJsonSerializerConfig {
 
     /// The data type of events that are accepted by `NativeJsonSerializer`.
     pub fn input_type(&self) -> DataType {
-        DataType::all()
+        DataType::all_bits()
     }
 
     /// The schema required by the serializer.

diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 async-graphql = { version = "7.0.5", default-features = false, features = ["playground" ], optional = true }
 async-trait = { version = "0.1", default-features = false }
-bitmask-enum = { version = "2.2.3", default-features = false }
+bitmask-enum = { version = "2.2.4", default-features = false }
 bytes = { version = "1.6.0", default-features = false, features = ["serde"] }
 chrono.workspace = true
 crossbeam-utils = { version = "0.8.20", default-features = false }

diff --git a/lib/vector-core/src/config/mod.rs b/lib/vector-core/src/config/mod.rs
@@ -91,7 +91,7 @@ impl Input {
 
     pub fn all() -> Self {
         Self {
-            ty: DataType::all(),
+            ty: DataType::all_bits(),
             log_schema_requirement: schema::Requirement::empty(),
         }
     }

diff --git a/src/config/graph.rs b/src/config/graph.rs
@@ -523,7 +523,7 @@ mod test {
         graph.add_source("metric_source", DataType::Metric);
         graph.add_sink(
             "any_sink",
-            DataType::all(),
+            DataType::all_bits(),
             vec!["log_source", "metric_source"],
         );
 
@@ -533,16 +533,16 @@ mod test {
     #[test]
     fn allows_any_into_log_or_metric() {
         let mut graph = Graph::default();
-        graph.add_source("any_source", DataType::all());
+        graph.add_source("any_source", DataType::all_bits());
         graph.add_transform(
             "log_to_any",
             DataType::Log,
-            DataType::all(),
+            DataType::all_bits(),
             vec!["any_source"],
         );
         graph.add_transform(
             "any_to_log",
-            DataType::all(),
+            DataType::all_bits(),
             DataType::Log,
             vec!["any_source"],
         );
@@ -579,19 +579,19 @@ mod test {
         );
         graph.add_transform(
             "any_to_any",
-            DataType::all(),
-            DataType::all(),
+            DataType::all_bits(),
+            DataType::all_bits(),
             vec!["log_to_log", "metric_to_metric"],
         );
         graph.add_transform(
             "any_to_log",
-            DataType::all(),
+            DataType::all_bits(),
             DataType::Log,
             vec!["any_to_any"],
         );
         graph.add_transform(
             "any_to_metric",
-            DataType::all(),
+            DataType::all_bits(),
             DataType::Metric,
             vec!["any_to_any"],
         );
@@ -639,26 +639,32 @@ mod test {
         graph.nodes.insert(
             ComponentKey::from("foo.bar"),
             Node::Source {
-                outputs: vec![SourceOutput::new_logs(DataType::all(), Definition::any())],
+                outputs: vec![SourceOutput::new_logs(
+                    DataType::all_bits(),
+                    Definition::any(),
+                )],
             },
         );
         graph.nodes.insert(
             ComponentKey::from("foo.bar"),
             Node::Source {
-                outputs: vec![SourceOutput::new_logs(DataType::all(), Definition::any())],
+                outputs: vec![SourceOutput::new_logs(
+                    DataType::all_bits(),
+                    Definition::any(),
+                )],
             },
         );
         graph.nodes.insert(
             ComponentKey::from("foo"),
             Node::Transform {
-                in_ty: DataType::all(),
+                in_ty: DataType::all_bits(),
                 outputs: vec![
                     TransformOutput::new(
-                        DataType::all(),
+                        DataType::all_bits(),
                         [("test".into(), Definition::default_legacy_namespace())].into(),
                     ),
                     TransformOutput::new(
-                        DataType::all(),
+                        DataType::all_bits(),
                         [("test".into(), Definition::default_legacy_namespace())].into(),
                     )
                     .with_port("bar"),
@@ -670,20 +676,23 @@ mod test {
         graph.nodes.insert(
             ComponentKey::from("baz.errors"),
             Node::Source {
-                outputs: vec![SourceOutput::new_logs(DataType::all(), Definition::any())],
+                outputs: vec![SourceOutput::new_logs(
+                    DataType::all_bits(),
+                    Definition::any(),
+                )],
             },
         );
         graph.nodes.insert(
             ComponentKey::from("baz"),
             Node::Transform {
-                in_ty: DataType::all(),
+                in_ty: DataType::all_bits(),
                 outputs: vec![
                     TransformOutput::new(
-                        DataType::all(),
+                        DataType::all_bits(),
                         [("test".into(), Definition::default_legacy_namespace())].into(),
                     ),
                     TransformOutput::new(
-                        DataType::all(),
+                        DataType::all_bits(),
                         [("test".into(), Definition::default_legacy_namespace())].into(),
                     )
                     .with_port("errors"),

diff --git a/src/config/unit_test/unit_test_components.rs b/src/config/unit_test/unit_test_components.rs
@@ -47,7 +47,7 @@ impl SourceConfig for UnitTestSourceConfig {
 
     fn outputs(&self, _global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
         vec![SourceOutput::new_logs(
-            DataType::all(),
+            DataType::all_bits(),
             schema::Definition::default_legacy_namespace(),
         )]
     }
@@ -104,7 +104,7 @@ impl SourceConfig for UnitTestStreamSourceConfig {
 
     fn outputs(&self, _global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
         vec![SourceOutput::new_logs(
-            DataType::all(),
+            DataType::all_bits(),
             schema::Definition::default_legacy_namespace(),
         )]
     }

diff --git a/src/sources/datadog_agent/mod.rs b/src/sources/datadog_agent/mod.rs
@@ -303,7 +303,7 @@ impl SourceConfig for DatadogAgentConfig {
                 output.push(SourceOutput::new_traces().with_port(TRACES))
             }
         } else {
-            output.push(SourceOutput::new_logs(DataType::all(), definition))
+            output.push(SourceOutput::new_logs(DataType::all_bits(), definition))
         }
         output
     }

diff --git a/src/sources/datadog_agent/tests.rs b/src/sources/datadog_agent/tests.rs
@@ -1590,7 +1590,7 @@ fn test_config_outputs_with_disabled_data_types() {
             assert_eq!(outputs.contains(&DataType::Trace), !disable_traces);
             assert_eq!(outputs.contains(&DataType::Metric), !disable_metrics);
         } else {
-            assert!(outputs.contains(&DataType::all()));
+            assert!(outputs.contains(&DataType::all_bits()));
             assert!(outputs.len() == 1);
         }
     }

diff --git a/src/sources/vector/mod.rs b/src/sources/vector/mod.rs
@@ -200,7 +200,10 @@ impl SourceConfig for VectorConfig {
             .schema_definition(log_namespace)
             .with_standard_vector_source_metadata();
 
-        vec![SourceOutput::new_logs(DataType::all(), schema_definition)]
+        vec![SourceOutput::new_logs(
+            DataType::all_bits(),
+            schema_definition,
+        )]
     }
 
     fn resources(&self) -> Vec<Resource> {

diff --git a/src/test_util/mock/sources/backpressure.rs b/src/test_util/mock/sources/backpressure.rs
@@ -65,7 +65,7 @@ impl SourceConfig for BackpressureSourceConfig {
 
     fn outputs(&self, _global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
         vec![SourceOutput::new_logs(
-            DataType::all(),
+            DataType::all_bits(),
             Definition::default_legacy_namespace(),
         )]
     }

diff --git a/src/test_util/mock/sources/basic.rs b/src/test_util/mock/sources/basic.rs
@@ -45,7 +45,7 @@ impl Default for BasicSourceConfig {
         Self {
             receiver: Arc::new(Mutex::new(Some(receiver))),
             event_counter: None,
-            data_type: Some(DataType::all()),
+            data_type: Some(DataType::all_bits()),
             force_shutdown: false,
             data: None,
         }
@@ -59,7 +59,7 @@ impl BasicSourceConfig {
         Self {
             receiver: Arc::new(Mutex::new(Some(receiver))),
             event_counter: None,
-            data_type: Some(DataType::all()),
+            data_type: Some(DataType::all_bits()),
             force_shutdown: false,
             data: None,
         }
@@ -69,7 +69,7 @@ impl BasicSourceConfig {
         Self {
             receiver: Arc::new(Mutex::new(Some(receiver))),
             event_counter: None,
-            data_type: Some(DataType::all()),
+            data_type: Some(DataType::all_bits()),
             force_shutdown: false,
             data: Some(data.into()),
         }
@@ -82,7 +82,7 @@ impl BasicSourceConfig {
         Self {
             receiver: Arc::new(Mutex::new(Some(receiver))),
             event_counter: Some(event_counter),
-            data_type: Some(DataType::all()),
+            data_type: Some(DataType::all_bits()),
             force_shutdown: false,
             data: None,
         }

diff --git a/src/test_util/mock/transforms/basic.rs b/src/test_util/mock/transforms/basic.rs
@@ -56,7 +56,7 @@ impl TransformConfig for BasicTransformConfig {
         _: LogNamespace,
     ) -> Vec<TransformOutput> {
         vec![TransformOutput::new(
-            DataType::all(),
+            DataType::all_bits(),
             definitions
                 .iter()
                 .map(|(output, definition)| (output.clone(), definition.clone()))

diff --git a/src/test_util/mock/transforms/error_definitions.rs b/src/test_util/mock/transforms/error_definitions.rs
@@ -37,7 +37,7 @@ impl TransformConfig for ErrorDefinitionTransformConfig {
         _: LogNamespace,
     ) -> Vec<TransformOutput> {
         vec![TransformOutput::new(
-            DataType::all(),
+            DataType::all_bits(),
             definitions
                 .iter()
                 .map(|(output, definition)| {

diff --git a/src/test_util/mock/transforms/noop.rs b/src/test_util/mock/transforms/noop.rs
@@ -46,7 +46,7 @@ impl TransformConfig for NoopTransformConfig {
         _: LogNamespace,
     ) -> Vec<TransformOutput> {
         vec![TransformOutput::new(
-            DataType::all(),
+            DataType::all_bits(),
             definitions
                 .iter()
                 .map(|(output, definition)| (output.clone(), definition.clone()))