Skip to content

[pull] master from vectordotdev:master #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 12 commits into from
Jun 11, 2024
Merged

[pull] master from vectordotdev:master #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
86f0a88
feat(new encoding): add pretty json encoding (#20384)
lsampras Jun 10, 2024
60673c7
chore(deps): Bump regex from 1.10.4 to 1.10.5 (#20629)
dependabot[bot] Jun 10, 2024
a01c198
chore(deps): Bump enumflags2 from 0.7.9 to 0.7.10 (#20628)
dependabot[bot] Jun 10, 2024
843f186
chore(ci): Bump bufbuild/buf-setup-action from 1.32.1 to 1.32.2 (#20578)
dependabot[bot] Jun 10, 2024
5b59039
chore(deps): Bump serde from 1.0.202 to 1.0.203 (#20563)
dependabot[bot] Jun 10, 2024
ceca9a1
chore(deps): Bump encoding_rs from 0.8.33 to 0.8.34 (#20283)
dependabot[bot] Jun 10, 2024
b266a95
chore(deps): Bump the clap group across 1 directory with 2 updates (#…
dependabot[bot] Jun 10, 2024
48a29b3
enhancement(remap transform): add caching to remap vrl compilation (#…
Zettroke Jun 10, 2024
c2fc5ef
enhancement(kafka sink): Make healthcheck topic configurable (#20373)
yalinglee Jun 10, 2024
9bbb991
chore(ci): Bump docker/build-push-action from 5.3.0 to 5.4.0 (#20632)
dependabot[bot] Jun 10, 2024
58114f1
chore: bump rust version to 1.78 (#20624)
pront Jun 10, 2024
4f5c99d
chore(enterprise)!: Remove `enterprise` feature (#20468)
bruceg Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/semantic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ scopes:
- durability # Anything related to the durability of Vector events
- enriching # Anything related to enriching Vector's events with context data
- enrichment_tables # Anything related to the Vector's enrichment tables
- enterprise # Anything related to Vector's enterprise features (Observability Pipelines)
- exceptions # Anything related to Vector's exception events.
- external docs # Anything related to Vector's external, public documentation
- filtering # Anything related to filtering within Vector
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
org.opencontainers.image.title=Vector development environment
org.opencontainers.image.url=https://github.com/vectordotdev/vector
- name: Build and push
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
with:
context: .
file: ./scripts/environment/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/protobuf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# Run `git checkout`
- uses: actions/checkout@v3
# Install the `buf` CLI
- uses: bufbuild/buf-setup-action@v1.32.1
- uses: bufbuild/buf-setup-action@v1.32.2
# Perform breaking change detection against the `master` branch
- uses: bufbuild/buf-breaking-action@v1.1.4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ jobs:
uses: docker/setup-buildx-action@v3.3.0

- name: Build 'vector' target image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
with:
context: baseline-vector/
cache-from: type=gha
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
uses: docker/setup-buildx-action@v3.3.0

- name: Build 'vector' target image
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@v5.4.0
with:
context: comparison-vector/
cache-from: type=gha
Expand Down
70 changes: 40 additions & 30 deletions Cargo.lock
View file
Open in desktop

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

69 changes: 24 additions & 45 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default-run = "vector"
autobenches = false # our benchmarks are not runnable on their own either way
# Minimum supported rust version
# See docs/DEVELOPING.md for policy
rust-version = "1.77"
rust-version = "1.78"

[[bin]]
name = "vector"
Expand Down Expand Up @@ -130,13 +130,13 @@ members = [

[workspace.dependencies]
chrono = { version = "0.4.37", default-features = false, features = ["clock", "serde"] }
clap = { version = "4.5.4", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
clap = { version = "4.5.6", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] }
indexmap = { version = "2.2.6", default-features = false, features = ["serde", "std"] }
pin-project = { version = "1.1.5", default-features = false }
proptest = { version = "1.4" }
proptest-derive = { version = "0.4.0" }
serde_json = { version = "1.0.117", default-features = false, features = ["raw_value", "std"] }
serde = { version = "1.0.202", default-features = false, features = ["alloc", "derive", "rc"] }
serde = { version = "1.0.203", default-features = false, features = ["alloc", "derive", "rc"] }
toml = { version = "0.8.14", default-features = false, features = ["display", "parse"] }
vrl = { version = "0.15.0", features = ["arbitrary", "cli", "test", "test_framework"] }

Expand Down Expand Up @@ -247,10 +247,9 @@ num-format = { version = "0.4.4", default-features = false, features = ["with-nu
number_prefix = { version = "0.4.0", default-features = false, features = ["std"], optional = true }
ratatui = { version = "0.26.3", optional = true, default-features = false, features = ["crossterm"] }

# Datadog Pipelines
# Opentelemetry

hex = { version = "0.4.3", default-features = false, optional = true }
sha2 = { version = "0.10.8", default-features = false, optional = true }

# GreptimeDB
greptimedb-client = { git = "https://github.com/GreptimeTeam/greptimedb-ingester-rust.git", rev = "d21dbcff680139ed2065b62100bac3123da7c789", optional = true }
Expand All @@ -274,7 +273,7 @@ databend-client ={ version = "0.18.3", default-features = false, features = ["ru
derivative = { version = "2.2.0", default-features = false }
dirs-next = { version = "2.0.0", default-features = false, optional = true }
dyn-clone = { version = "1.0.17", default-features = false }
encoding_rs = { version = "0.8.33", default-features = false, features = ["serde"] }
encoding_rs = { version = "0.8.34", default-features = false, features = ["serde"] }
enum_dispatch = { version = "0.3.13", default-features = false }
exitcode = { version = "1.1.2", default-features = false }
flate2 = { version = "1.0.30", default-features = false, features = ["default"] }
Expand Down Expand Up @@ -323,7 +322,7 @@ rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
rand_distr = { version = "0.4.3", default-features = false }
rdkafka = { version = "0.35.0", default-features = false, features = ["tokio", "libz", "ssl", "zstd"], optional = true }
redis = { version = "0.24.0", default-features = false, features = ["connection-manager", "tokio-comp", "tokio-native-tls-comp"], optional = true }
regex = { version = "1.10.4", default-features = false, features = ["std", "perf"] }
regex = { version = "1.10.5", default-features = false, features = ["std", "perf"] }
roaring = { version = "0.10.4", default-features = false, features = ["std"], optional = true }
rumqttc = { version = "0.24.0", default-features = false, features = ["use-rustls"], optional = true }
seahash = { version = "4.1.0", default-features = false }
Expand Down Expand Up @@ -405,40 +404,40 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e3

[features]
# Default features for *-unknown-linux-gnu and *-apple-darwin
default = ["api", "api-client", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
default = ["api", "api-client", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
# Default features for `cargo docs`. The same as `default` but without `rdkafka?/gssapi-vendored` which would require installing libsasl in our doc build environment.
docs = ["api", "api-client", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
docs = ["api", "api-client", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
# Default features for *-unknown-linux-* which make use of `cmake` for dependencies
default-cmake = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
default-cmake = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
# Default features for *-pc-windows-msvc
# TODO: Enable SASL https://github.com/vectordotdev/vector/pull/3081#issuecomment-659298042
default-msvc = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "transforms", "enterprise", "secrets"]
default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
default-no-api-client = ["api", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
default-no-vrl-cli = ["api", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
default-msvc = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "transforms", "secrets"]
default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
default-no-api-client = ["api", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
default-no-vrl-cli = ["api", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
tokio-console = ["dep:console-subscriber", "tokio/tracing"]

# Enables the binary secret-backend-example
secret-backend-example = ["transforms"]

all-logs = ["sinks-logs", "sources-logs", "sources-dnstap", "transforms-logs"]
all-metrics = ["sinks-metrics", "sources-metrics", "transforms-metrics", "enterprise"]
all-metrics = ["sinks-metrics", "sources-metrics", "transforms-metrics"]

# Target specific release features.
# The `make` tasks will select this according to the appropriate triple.
# Use this section to turn off or on specific features for specific triples.
target-aarch64-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-aarch64-unknown-linux-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-armv7-unknown-linux-gnueabihf = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-armv7-unknown-linux-musleabihf = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "enterprise", "secrets"]
target-arm-unknown-linux-gnueabi = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-arm-unknown-linux-musleabi = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "enterprise", "secrets"]
target-x86_64-unknown-linux-gnu = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise", "secrets"]
target-x86_64-unknown-linux-musl = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-aarch64-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
target-aarch64-unknown-linux-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
target-armv7-unknown-linux-gnueabihf = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
target-armv7-unknown-linux-musleabihf = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "secrets"]
target-arm-unknown-linux-gnueabi = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
target-arm-unknown-linux-musleabi = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "secrets"]
target-x86_64-unknown-linux-gnu = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
target-x86_64-unknown-linux-musl = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
# Does not currently build
target-powerpc64le-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-powerpc64le-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]
# Currently doesn't build due to lack of support for 64-bit atomics
target-powerpc-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "enterprise", "secrets"]
target-powerpc-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"]

# Enables features that work only on systems providing `cfg(unix)`
unix = ["tikv-jemallocator", "allocation-tracing"]
Expand Down Expand Up @@ -763,19 +762,6 @@ sinks-vector = ["sinks-utils-udp", "dep:tonic", "protobuf-build"]
sinks-websocket = ["dep:tokio-tungstenite"]
sinks-webhdfs = ["dep:opendal"]

# Datadog integration
enterprise = [
"dep:hex",
"dep:sha2",
"sinks-datadog_logs",
"sinks-datadog_metrics",
"sources-host_metrics",
"sources-internal_logs",
"sources-internal_metrics",
"transforms-remap",
"transforms-filter",
]

# Identifies that the build is a nightly build
nightly = []

Expand Down Expand Up @@ -913,13 +899,6 @@ vector-unit-test-tests = [
"transforms-reduce",
"sinks-console"
]
enterprise-tests = [
"enterprise",
"sources-demo_logs",
"sinks-blackhole",
"sinks-loki",
"api",
]

component-validation-runner = ["dep:tonic", "sources-internal_logs", "sources-internal_metrics", "sources-vector", "sinks-vector"]
# For now, only include components that implement ValidatableComponent.
Expand Down
Loading