Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pablosichert/source…
Browse files Browse the repository at this point in the history
…s-exec-codec-integration

Signed-off-by: Pablo Sichert <mail@pablosichert.com>
  • Loading branch information
pablosichert committed Oct 1, 2021
2 parents 7cb078b + 6e0f642 commit d4ef439
Show file tree
Hide file tree
Showing 287 changed files with 4,427 additions and 1,309 deletions.
1 change: 1 addition & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ scopes:
- datadog_agent source # Anything `datadog_agent` source related
- dnstap source # Anything `dnstap` source related
- docker_logs source # Anything `docker_logs` source related
- exec source # Anything `exec` source related
- file source # Anything `file` source related
- fluent source # Anything `fluent` source related
- generator source # Anything `generator` source related
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/k8s_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
|| contains(github.event.pull_request.labels.*.name, 'ci-condition: k8s e2e tests enable')
|| contains(github.event.pull_request.labels.*.name, 'ci-condition: k8s e2e all targets')
steps:
- uses: actions/github-script@v4.1
- uses: actions/github-script@v5
id: set-matrix
with:
script: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-harness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Indicate that we picked up the command with a comment reaction
uses: actions/github-script@v4.1
uses: actions/github-script@v5
with:
github-token: '${{secrets.GITHUB_TOKEN}}'
script: |
Expand All @@ -38,7 +38,7 @@ jobs:

- name: Get Pull Request info
id: pr-info
uses: actions/github-script@v4.1
uses: actions/github-script@v5
with:
script: |
const pr_info_response = await github.pulls.get({
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
AWS_DEFAULT_REGION: '${{ secrets.TEST_HARNESS_AWS_DEFAULT_REGION }}'

- name: Post a comment with the results
uses: actions/github-script@v4.1
uses: actions/github-script@v5
with:
github-token: '${{secrets.GITHUB_TOKEN}}'
script: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
dependencies: ${{ steps.filter.outputs.dependencies }}
internal_events: ${{ steps.filter.outputs.internal_events }}
helm: ${{ steps.filter.outputs.helm }}
cue: ${{ steps.filter.outputs.cue }}
markdown: ${{ steps.filter.outputs.cue }}
steps:
- uses: actions/checkout@v2.3.4
- uses: dorny/paths-filter@v2
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
88 changes: 51 additions & 37 deletions 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 @@ -240,7 +240,7 @@ lru = { version = "0.6.6", default-features = false, optional = true }
maxminddb = { version = "0.21.0", default-features = false, optional = true }
md-5 = { version = "0.9", optional = true }
# make sure to update the external docs when the Lua version changes
mlua = { version = "0.6.3", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
mlua = { version = "0.6.4", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
mongodb = { version = "2.0.0", default-features = false, features = ["tokio-runtime"], optional = true }
async-nats = { version = "0.10.1", default-features = false, optional = true }
no-proxy = { version = "0.3.1", default-features = false, features = ["serialize"] }
Expand Down Expand Up @@ -272,7 +272,7 @@ strip-ansi-escapes = { version = "0.1.1", default-features = false }
structopt = { version = "0.3.23", default-features = false }
syslog = { version = "5.0.0", default-features = false, optional = true }
syslog_loose = { version = "0.15.0", default-features = false, optional = true }
tokio-postgres = { version = "0.7.2", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
tokio-postgres = { version = "0.7.3", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
toml = { version = "0.5.8", default-features = false }
typetag = { version = "0.1.7", default-features = false }
twox-hash = { version = "1.6.1", default-features = false }
Expand All @@ -294,7 +294,7 @@ security-framework = "2.3.1"

[target.'cfg(unix)'.dependencies]
atty = "0.2.14"
nix = "0.22.1"
nix = "0.22.2"

[build-dependencies]
prost-build = { version = "0.8", optional = true }
Expand All @@ -305,10 +305,10 @@ approx = "0.5.0"
assert_cmd = "2.0.1"
base64 = "0.13.0"
criterion = { version = "0.3.5", features = ["html_reports", "async_tokio"] }
libc = "0.2.102"
libc = "0.2.103"
libz-sys = "1.1.3"
matches = "0.1.9"
pretty_assertions = "0.7.2"
pretty_assertions = "1.0.0"
reqwest = { version = "0.11.4", features = ["json"] }
tempfile = "3.2.0"
tokio = { version = "1.12.0", features = ["test-util"] }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ check-kubernetes-yaml: ## Check that the generated Kubernetes YAML configs are u
${MAYBE_ENVIRONMENT_EXEC} ./scripts/kubernetes-yaml.sh check

check-events: ## Check that events satisfy patterns set in https://github.com/timberio/vector/blob/master/rfcs/2020-03-17-2064-event-driven-observability.md
${MAYBE_ENVIRONMENT_EXEC} ./scripts/check-events.sh
${MAYBE_ENVIRONMENT_EXEC} ./scripts/check-events

##@ Rustdoc
build-rustdoc: ## Build Vector's Rustdocs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pipeline that puts you in control of your observability data.
[Collect][docs.sources], [transform][docs.transforms], and [route][docs.sinks]
all your logs, metrics, and traces to any vendors you want today and any other
vendors you may want tomorrow. Vector enables dramatic cost reduction, novel
data enrichment, and data security where you need it, not where is most
data enrichment, and data security where you need it, not where it is most
convenient for your vendors. Additionally, it is open source and up to 10x
faster than every alternative in the space.

Expand Down
4 changes: 2 additions & 2 deletions benches/metrics_bench_util/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn disable_metrics_tracing_integration() {
#[inline]
fn boot() {
vector::trace::init(false, false, "warn");
vector::metrics::init().expect("metrics initialization failed");
vector::metrics::init_test().expect("metrics initialization failed");
}

#[allow(dead_code)] // condition compilation
Expand Down Expand Up @@ -74,7 +74,7 @@ pub fn benchmark(c: &mut Criterion, mode: Mode) {
boot();
let metrics_core_enabled = mode != Mode::MetricsOff;
assert_eq!(
vector::metrics::get_controller().is_ok(),
vector::metrics::Controller::get().is_ok(),
metrics_core_enabled,
"the presence of a controller must correspond to whether metrics core is on or off"
);
Expand Down
Loading

0 comments on commit d4ef439

Please sign in to comment.