Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
f0b44ab
chore(remap): improve test harness set-up
JeanMertz Feb 4, 2021
1ec92e1
chore(remap): expand UI test cases
JeanMertz Feb 4, 2021
4240bba
chore(remap): add new remap-parser crate
JeanMertz Feb 4, 2021
9bb1509
chore(remap): add new remap-compiler crate
JeanMertz Feb 4, 2021
86daabf
chore(remap): add new remap-diagnostic crate
JeanMertz Feb 4, 2021
11e86dc
chore(remap): update remap-lang crate to use remap-compiler
JeanMertz Feb 4, 2021
277c412
chore(remap): update remap-cli crate to use remap-compiler
JeanMertz Feb 4, 2021
6fca455
chore(remap): update first batch of function for remap-compiler
JeanMertz Feb 4, 2021
65a03c3
chore(remap): move vrl crates to lib/vrl
JeanMertz Feb 4, 2021
58a6c67
chore(remap): add missing unary-not support
JeanMertz Feb 5, 2021
abdf9c0
chore(remap): remove unused files
JeanMertz Feb 5, 2021
70bc26c
chore(remap): resolve failing equality operations
JeanMertz Feb 5, 2021
3fb39db
fixup! chore(remap): add missing unary-not support
JeanMertz Feb 5, 2021
2a02381
chore(remap): add missing comparison tests
JeanMertz Feb 5, 2021
119f90a
chore(remap): add missing logical operation tests
JeanMertz Feb 5, 2021
6fb2661
chore(remap): add more diagnostic tests
JeanMertz Feb 5, 2021
4691b3c
chore(remap): resolve review feedback
JeanMertz Feb 5, 2021
53c07ef
chore(remap): more bug fixes and function updates
JeanMertz Feb 10, 2021
39785d0
Temporarily break stdlib features into multiple lines to avoid merge …
pablosichert Feb 10, 2021
698e9af
Sort feature list
pablosichert Feb 10, 2021
7d4e6be
chore(remap): fix lexer bug with query detection
JeanMertz Feb 10, 2021
ab124b2
chore(remap): re-enable VRL inside Vector
JeanMertz Feb 10, 2021
04c0c85
Migrate parse_aws_alb_log VRL function
pablosichert Feb 10, 2021
221dd87
Derive `Clone` for structs implementing `Expression`
pablosichert Feb 10, 2021
b47f7ab
Added property tests
StephenWakely Feb 10, 2021
aa7594d
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 10, 2021
2c1d734
chore(remap): upgrade more functions
JeanMertz Feb 10, 2021
ceb5f5d
chore(remap): resolve non-boolean conditions to false
JeanMertz Feb 10, 2021
5e0c9de
chore(remap): allow multi-line logical operations
JeanMertz Feb 10, 2021
1ca8153
chore(remap): add multi-line expressions test
JeanMertz Feb 10, 2021
499fab5
chore(remap): more function updates
JeanMertz Feb 10, 2021
bbe26d5
chore(remap): more function updates
JeanMertz Feb 10, 2021
d4d1a9f
Migrate parse_aws_cloudwatch_log_subscription_message VRL function
pablosichert Feb 10, 2021
fb652f1
chore(remap): more function updates
JeanMertz Feb 10, 2021
cffb4c5
Updated Remap functions a-f
StephenWakely Feb 10, 2021
e602709
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 10, 2021
4e8de7a
Fixed encode_json example
StephenWakely Feb 10, 2021
1fd2909
chore(remap): more function updates
JeanMertz Feb 10, 2021
2710c72
Formatting
StephenWakely Feb 10, 2021
c0117e0
chore(remap): add functions to tests/cli
JeanMertz Feb 11, 2021
efec15c
Accept bytes only in parse_aws_alb_log/parse_aws_cloudwatch_log_subsc…
pablosichert Feb 11, 2021
6739f7e
Update nullable inner types in parse_aws_alb_log
pablosichert Feb 11, 2021
7d9b821
Replace no-op test with actual assertion (fails, needs fix!)
pablosichert Feb 11, 2021
63be13d
Fix parse_aws_cloudwatch_log_subscription_message with encode_json hack
pablosichert Feb 11, 2021
be33293
Migrate parse_aws_vpc_flow_log VRL function
pablosichert Feb 11, 2021
6c70752
Migrate parse_duration VRL function
pablosichert Feb 11, 2021
8378567
Hotfix `unknown_function` test because with function suggestion
pablosichert Feb 11, 2021
e43598c
chore(remap): update "push" function
JeanMertz Feb 11, 2021
9c37cec
chore(remap): more function updates
JeanMertz Feb 11, 2021
614f0e6
chore(remap): more function updates
JeanMertz Feb 11, 2021
bafe045
Updated parse_grok and parse_key_value
StephenWakely Feb 11, 2021
ef7cf56
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 11, 2021
fe6d8bb
Remove merge conflict
pablosichert Feb 11, 2021
387a78d
chore(remap): partially fix nested type def query
JeanMertz Feb 11, 2021
9ee9cc3
chore(remap): partially fix nested type def query
JeanMertz Feb 11, 2021
08810ba
chore(remap): add failing nested query type
JeanMertz Feb 11, 2021
7e570d2
Migrate parse_timestamp VRL function
pablosichert Feb 11, 2021
3db2292
Migrate parse_tokens VRL function
pablosichert Feb 11, 2021
679f585
Apply array type definition to every index
pablosichert Feb 11, 2021
2513b61
Added parse_regex and parse_regex_all
StephenWakely Feb 11, 2021
341a942
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 11, 2021
9139fc5
Merge remote-tracking branch 'origin/master' into jean/vrl-refactor
pablosichert Feb 11, 2021
580a950
chore(remap): fix failing nested query type
JeanMertz Feb 11, 2021
6b0bc17
Updated parse_common_log, join and redact
StephenWakely Feb 11, 2021
f0194c1
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 11, 2021
d88e4c9
Migrate parse_glog VRL function
pablosichert Feb 11, 2021
3dee7b3
formatting
StephenWakely Feb 11, 2021
488316b
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 11, 2021
094a7da
join is fallible
StephenWakely Feb 11, 2021
4018b20
Migrate get_hostname VRL function
pablosichert Feb 11, 2021
c84124a
Sort features list
pablosichert Feb 11, 2021
d487668
Fix parse_key_value type definitions
pablosichert Feb 11, 2021
fc3cd0e
Fix unused variables / mutability
pablosichert Feb 11, 2021
60fd560
chore(remap): fix failing type check tests
JeanMertz Feb 11, 2021
674cefb
Make VRL unit tests compile
pablosichert Feb 11, 2021
535b8a2
chore(remap): clippy fixe
JeanMertz Feb 11, 2021
c6285f7
chore(remap): fix linting issues
JeanMertz Feb 11, 2021
da77186
chore(remap): first update to remap.toml tests
JeanMertz Feb 11, 2021
cfe735d
chore(remap): fix linting issues
JeanMertz Feb 11, 2021
a7b88a1
chore(remap): fix linting issues
JeanMertz Feb 11, 2021
828d4ac
chore(remap): fix linting issues
JeanMertz Feb 11, 2021
83315e6
chore(remap): add error codes
JeanMertz Feb 11, 2021
ae702fa
chore(remap): don't show links for non-existant error pages
JeanMertz Feb 11, 2021
40549ad
chore(remap): fixes
JeanMertz Feb 11, 2021
e21fab6
chore(remap): clippy fixes
JeanMertz Feb 11, 2021
e6cfad9
Added type ensuring functions
StephenWakely Feb 11, 2021
27f3768
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 11, 2021
c888f97
chore(remap): fix issues
JeanMertz Feb 12, 2021
ea227aa
chore(remap): fix issues
JeanMertz Feb 12, 2021
97534fb
chore(remap): fix issues
JeanMertz Feb 12, 2021
d000618
chore(remap): more fixes
JeanMertz Feb 12, 2021
8a13fe6
chore(remap): rename function names
JeanMertz Feb 12, 2021
30e5ddd
chore(remap): clippy fixes
JeanMertz Feb 12, 2021
6d88367
chore(remap): support shallow type def merging
JeanMertz Feb 12, 2021
c343bdb
chore(remap): temporary disable old parser tests
JeanMertz Feb 12, 2021
2911b44
Add vrl to the logging levels
StephenWakely Feb 12, 2021
7b0aa5d
Remove timestamp literal from property tests
StephenWakely Feb 12, 2021
fe4ce8b
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 12, 2021
47f198d
formatting
StephenWakely Feb 12, 2021
fe7d73b
log should take any parameter
StephenWakely Feb 12, 2021
0dd9ada
array and object functions restrict type_def to arrays and objects
StephenWakely Feb 12, 2021
9c70c5f
chore(remap): fix benchmarks
JeanMertz Feb 12, 2021
7fb719d
chore(remap): add type def test
JeanMertz Feb 12, 2021
f80c154
chore(remap): fix benchmarks
JeanMertz Feb 12, 2021
87ea092
chore(remap): fix benchmarks
JeanMertz Feb 12, 2021
3b528e9
chore(remap): fix benchmarks
JeanMertz Feb 12, 2021
76e5c69
array and object functions should set an array type if unknown before.
StephenWakely Feb 12, 2021
93ad40a
Allow tags to be set on metrics
StephenWakely Feb 12, 2021
9ca636b
Merge branch 'jean/vrl-refactor' of github.com:timberio/vector into j…
StephenWakely Feb 12, 2021
9c12840
Updated behavior tests
StephenWakely Feb 12, 2021
b7fd57f
Merge branch 'master' into jean/vrl-refactor
JeanMertz Feb 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
843 changes: 451 additions & 392 deletions Cargo.lock

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,18 @@ members = [
"lib/k8s-test-framework",
"lib/portpicker",
"lib/prometheus-parser",
"lib/remap-cli",
"lib/remap-functions",
"lib/remap-lang",
"lib/remap-tests",
"lib/shared",
"lib/tracing-limit",
"lib/vector-api-client",
"lib/vector-wasm",
"lib/vrl/cli",
"lib/vrl/compiler",
"lib/vrl/core",
"lib/vrl/diagnostic",
"lib/vrl/parser",
"lib/vrl/stdlib",
"lib/vrl/tests",
"lib/vrl/proptests",
]

[dependencies]
Expand All @@ -64,10 +68,10 @@ derive_is_enum_variant = { path = "lib/derive_is_enum_variant" }
file-source = { path = "lib/file-source", optional = true }
portpicker = { path = "lib/portpicker" }
prometheus-parser = { path = "lib/prometheus-parser", optional = true }
remap-cli = { path = "lib/remap-cli", optional = true }
shared = { path = "lib/shared" }
tracing-limit = { path = "lib/tracing-limit" }
vector-api-client = { path = "lib/vector-api-client", optional = true }
vrl-cli = { path = "lib/vrl/cli", optional = true }

# Tokio / Futures
async-trait = "0.1"
Expand Down Expand Up @@ -133,9 +137,9 @@ num-format = { version = "0.4.0", optional = true }
number_prefix = { version = "0.4", optional = true }
tui = { version = "0.14.0", optional = true, default-features = false, features = ["crossterm"] }

# Remap Lang
remap = { package = "remap-lang", path = "lib/remap-lang" }
remap-functions = { path = "lib/remap-functions" }
# VRL Lang
vrl = { path = "lib/vrl/core" }
vrl-stdlib = { path = "lib/vrl/stdlib" }

# External libs
anyhow = "1.0.37"
Expand Down Expand Up @@ -308,9 +312,6 @@ wasm = ["lucet-runtime", "lucet-wasi", "lucetc", "vector-wasm"]
# transforms and sinks should depend on this feature.
kubernetes = ["evmap", "k8s-openapi"]

# VRL
vrl-cli = ["remap-cli"]

# API
api = [
"async-graphql",
Expand Down
14 changes: 7 additions & 7 deletions benches/remap.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use chrono::{DateTime, Utc};
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
use indexmap::IndexMap;
use remap::prelude::*;
use vector::transforms::{
add_fields::AddFields,
coercer::CoercerConfig,
Expand All @@ -14,6 +13,7 @@ use vector::{
event::{Event, Value},
test_util::runtime,
};
use vrl::prelude::*;

criterion_group!(
name = benches;
Expand All @@ -25,7 +25,7 @@ criterion_group!(
criterion_main!(benches);

bench_function! {
upcase => remap_functions::Upcase;
upcase => vrl_stdlib::Upcase;

literal_value {
args: func_args![value: "foo"],
Expand All @@ -34,7 +34,7 @@ bench_function! {
}

bench_function! {
downcase => remap_functions::Downcase;
downcase => vrl_stdlib::Downcase;

literal_value {
args: func_args![value: "FOO"],
Expand All @@ -43,7 +43,7 @@ bench_function! {
}

bench_function! {
parse_json => remap_functions::ParseJson;
parse_json => vrl_stdlib::ParseJson;

literal_value {
args: func_args![value: r#"{"key": "value"}"#],
Expand All @@ -70,7 +70,7 @@ fn benchmark_remap(c: &mut Criterion) {
Remap::new(RemapConfig {
source: r#".foo = "bar"
.bar = "baz"
.copy = .copy_from"#
.copy = string!(.copy_from)"#
.to_string(),
drop_on_err: true,
})
Expand Down Expand Up @@ -131,7 +131,7 @@ fn benchmark_remap(c: &mut Criterion) {
c.bench_function("remap: parse JSON with remap", |b| {
let mut tform: Box<dyn FunctionTransform> = Box::new(
Remap::new(RemapConfig {
source: ".bar = parse_json!(.foo)".to_owned(),
source: ".bar = parse_json!(string!(.foo))".to_owned(),
drop_on_err: false,
})
.unwrap(),
Expand Down Expand Up @@ -198,7 +198,7 @@ fn benchmark_remap(c: &mut Criterion) {
source: r#"
.number = to_int!(.number)
.bool = to_bool!(.bool)
.timestamp = parse_timestamp!(.timestamp, format: "%d/%m/%Y:%H:%M:%S %z")
.timestamp = parse_timestamp!(string!(.timestamp), format: "%d/%m/%Y:%H:%M:%S %z")
"#
.to_owned(),
drop_on_err: true,
Expand Down
28 changes: 0 additions & 28 deletions lib/remap-cli/Cargo.toml

This file was deleted.

134 changes: 0 additions & 134 deletions lib/remap-functions/src/append.rs

This file was deleted.

Loading