Skip to content

Commit

Permalink
Feature flag fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bruceg committed Oct 25, 2023
1 parent f44c852 commit f09c016
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ vector-buffers = { path = "lib/vector-buffers", default-features = false }
vector-config = { path = "lib/vector-config" }
vector-config-common = { path = "lib/vector-config-common" }
vector-config-macros = { path = "lib/vector-config-macros" }
vector-lib = { path = "lib/vector-lib", default-features = false }
vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
vector-stream = { path = "lib/vector-stream" }
vector-vrl-functions = { path = "lib/vector-vrl/functions" }
loki-logproto = { path = "lib/loki-logproto", optional = true }
Expand Down Expand Up @@ -376,7 +376,7 @@ test-generator = "0.3.1"
tokio = { version = "1.33.0", features = ["test-util"] }
tokio-test = "0.4.3"
tower-test = "0.4.0"
vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] }
vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl", "test"] }
vrl = { version = "0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }

wiremock = "0.5.19"
Expand Down Expand Up @@ -437,7 +437,7 @@ api = [
"dep:async-graphql",
"dep:async-graphql-warp",
"dep:base64",
"vector-core/api",
"vector-lib/api",
]

# API client
Expand All @@ -446,7 +446,7 @@ api-client = [
"dep:num-format",
"dep:number_prefix",
"dep:ratatui",
"vector-core/api",
"vector-lib/api",
"dep:vector-api-client",
]

Expand Down Expand Up @@ -607,7 +607,7 @@ transforms-aws_ec2_metadata = ["dep:arc-swap"]
transforms-dedupe = ["dep:lru"]
transforms-filter = []
transforms-log_to_metric = []
transforms-lua = ["dep:mlua", "vector-core/lua"]
transforms-lua = ["dep:mlua", "vector-lib/lua"]
transforms-metric_to_log = []
transforms-pipelines = ["transforms-filter", "transforms-route"]
transforms-reduce = []
Expand Down
6 changes: 6 additions & 0 deletions lib/vector-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ publish = false
[dependencies]
vector-common = { path = "../vector-common", default-features = false }
vector-core = { path = "../vector-core", default-features = false }

[features]
api = ["vector-core/api"]
lua = ["vector-core/lua"]
test = ["vector-core/test"]
vrl = ["vector-core/vrl"]
10 changes: 7 additions & 3 deletions lib/vector-lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ pub use vector_common::{
registered_event, request_metadata, sensitive_string, shutdown, trigger, Error, Result,
TimeZone,
};
#[cfg(feature = "vrl")]
pub use vector_core::compile_vrl;
#[cfg(feature = "test")]
pub use vector_core::event_test_util;
pub use vector_core::{
buckets, buffers, compile_vrl, default_data_dir, event, event_test_util, fanout, metric_tags,
metrics, partition, quantiles, samples, schema, serde, sink, source, tcp, tls, transform,
update_counter, EstimatedJsonEncodedSizeOf,
buckets, buffers, default_data_dir, event, fanout, metric_tags, metrics, partition, quantiles,
samples, schema, serde, sink, source, tcp, tls, transform, update_counter,
EstimatedJsonEncodedSizeOf,
};

pub mod config {
Expand Down
2 changes: 1 addition & 1 deletion src/sinks/prometheus/remote_write/sink.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::fmt;

use vector_lib::event::Metric;
use vector_lib::byte_size_of::ByteSizeOf;
use vector_lib::event::Metric;
use vector_stream::batcher::{data::BatchData, limiter::ByteSizeOfItemSize};

use crate::sinks::{prelude::*, util::buffer::metrics::MetricSet};
Expand Down

0 comments on commit f09c016

Please sign in to comment.