Skip to content

Commit a250f65

Browse files
Add test for observe options proto-messages
1 parent e0c13b2 commit a250f65

File tree

11 files changed

+388
-87
lines changed

11 files changed

+388
-87
lines changed

application/apps/indexer/Cargo.lock

+121-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

application/apps/indexer/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ members = [
1818
log = "0.4"
1919
serde = { version = "1.0", features = ["derive"] }
2020
serde_json = "1.0"
21-
thiserror = "1.0"
21+
thiserror = "2.0"
2222
lazy_static = "1.4"
2323
tokio = { version = "1", features = ["full"] }
2424
tokio-stream = "0.1"
@@ -34,7 +34,8 @@ dirs = "5.0"
3434
uuid = "1.3"
3535
grep-searcher = "0.1"
3636
tempfile = "3.10.0"
37-
env_logger = "0.10"
37+
env_logger = "0.11"
38+
enum_ids = "0.5"
3839

3940
## Development Dependencies ##
4041
# Support for `html_reports` needs running the benchmarks via `cargo-criterion` tool.

application/apps/indexer/session/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ tokio-stream.workspace = true
3030
tokio-util.workspace = true
3131
uuid = { workspace = true , features = ["serde", "v4"] }
3232
walkdir = "2.3"
33-
enum_ids = "0.5"
33+
enum_ids.workspace = true
3434

3535
[dev-dependencies]
3636
lazy_static.workspace = true

application/apps/indexer/sources/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ uuid = { workspace = true , features = ["serde", "v4"] }
2424
regex.workspace = true
2525
lazy_static.workspace = true
2626
shellexpand = "3.0.0"
27+
enum_ids.workspace = true
2728

2829
[dev-dependencies]
2930
env_logger.workspace = true

application/apps/indexer/sources/src/factory.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
pub use dlt::DltFilterConfig;
2+
use enum_ids::enum_ids;
13
pub use indexer_base::config::MulticastInfo;
24
use parsers::dlt;
35
use serde::{Deserialize, Serialize};
46
use std::{collections::HashMap, path::PathBuf};
57
use uuid::Uuid;
68

7-
pub use dlt::DltFilterConfig;
8-
99
#[allow(clippy::large_enum_variant)]
10+
#[enum_ids(derive = "Debug")]
1011
#[derive(Debug, Serialize, Deserialize, Clone)]
1112
pub enum ParserType {
1213
Dlt(DltParserSettings),
@@ -69,6 +70,7 @@ pub struct SomeIpParserSettings {
6970
pub fibex_file_paths: Option<Vec<String>>,
7071
}
7172

73+
#[enum_ids(derive = "Debug")]
7274
#[derive(Debug, Serialize, Deserialize, Clone)]
7375
pub enum Transport {
7476
Process(ProcessTransportConfig),
@@ -107,6 +109,7 @@ pub struct UDPTransportConfig {
107109
pub multicast: Vec<MulticastInfo>,
108110
}
109111

112+
#[enum_ids(derive = "Debug")]
110113
#[derive(Debug, Serialize, Deserialize, Clone)]
111114
pub enum FileFormat {
112115
PcapNG,
@@ -115,6 +118,7 @@ pub enum FileFormat {
115118
Binary,
116119
}
117120

121+
#[enum_ids(derive = "Debug")]
118122
#[derive(Debug, Serialize, Deserialize, Clone)]
119123
pub enum ObserveOrigin {
120124
File(String, FileFormat, PathBuf),

0 commit comments

Comments
 (0)