Skip to content

Commit 8b4eddc

Browse files
committed
Merge branch 'master' into upgrade-rust-1.61.0
2 parents 12b82c0 + 4a82f5f commit 8b4eddc

File tree

45 files changed

+506
-582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+506
-582
lines changed

.cargo/config.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ rustflags = [
55
"-Dclippy::dbg_macro",
66
]
77

8-
[target.x86_64-unknown-linux-gnu]
9-
rustflags = ["-C", "link-args=-rdynamic"]
10-
11-
[target.aarch64-unknown-linux-gnu]
12-
rustflags = ["-C", "link-args=-rdynamic"]
13-
148
# We need to bring in `libstdc++` for things that build against C++ (LevelDB, librdkafka, etc) which comes along in the
159
# `cross` base image but _isn't_ in a path searched by the linker normally. Additionally, our custom Docker image that
1610
# we base on the `cross` image moves `libstdc++` into this custom-looking directory to avoid some _other_ libraries

.github/workflows/nightly.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
VERBOSE: true
1212
CI: true
1313
DEBIAN_FRONTEND: noninteractive
14-
RUSTFLAGS: "-D warnings"
1514

1615
jobs:
1716
build-x86_64-unknown-linux-musl-packages:

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ env:
1313
CI: true
1414
DEBIAN_FRONTEND: noninteractive
1515
CONTAINER_TOOL: docker
16-
RUSTFLAGS: "-D warnings"
1716

1817
jobs:
1918
build-x86_64-unknown-linux-musl-packages:

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ env:
2727
VERBOSE: true
2828
CI: true
2929
PROFILE: debug
30-
RUSTFLAGS: "-D warnings"
3130

3231
jobs:
3332
changes:

Cargo.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ hyper = { version = "0.14.19", default-features = false, features = ["client", "
252252
hyper-openssl = { version = "0.9.2", default-features = false }
253253
hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
254254
indexmap = { version = "~1.8.2", default-features = false, features = ["serde"] }
255-
infer = { version = "0.8.0", default-features = false, optional = true}
255+
infer = { version = "0.8.1", default-features = false, optional = true}
256256
indoc = { version = "1.0.6", default-features = false }
257257
inventory = { version = "0.1.10", default-features = false }
258258
k8s-openapi = { version = "0.14.0", default-features = false, features = ["api", "v1_16"], optional = true }
@@ -283,7 +283,7 @@ redis = { version = "0.21.5", default-features = false, features = ["connection-
283283
regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] }
284284
roaring = { version = "0.9.0", default-features = false, optional = true }
285285
seahash = { version = "4.1.0", default-features = false, optional = true }
286-
semver = { version = "1.0.9", default-features = false, features = ["serde", "std"], optional = true }
286+
semver = { version = "1.0.10", default-features = false, features = ["serde", "std"], optional = true }
287287
smallvec = { version = "1", default-features = false, features = ["union"] }
288288
snafu = { version = "0.7.1", default-features = false, features = ["futures"] }
289289
snap = { version = "1.0.5", default-features = false, optional = true }

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ When possible, we'll create automated checks to enforce security policies.
198198
[on every incoming PR][urls.cargo_deny_schedule] to the Vector project.
199199
- Vector implements [Dependabot][urls.dependabot] which performs automated
200200
upgrades on dependencies and [alerts][urls.dependabot_alerts] about any
201-
dependency-related security vulernerabilities.
201+
dependency-related security vulnerabilities.
202202
- We verify the security of our Docker images using [Synk's][urls.snyk] vulnerability
203203
scanning.
204204

lib/codecs/src/decoding/format/bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl BytesDeserializerConfig {
3232

3333
/// The schema produced by the deserializer.
3434
pub fn schema_definition(&self) -> schema::Definition {
35-
schema::Definition::empty().required_field(
35+
schema::Definition::empty().with_field(
3636
log_schema().message_key(),
3737
Kind::bytes(),
3838
Some("message"),

lib/codecs/src/decoding/format/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl JsonDeserializerConfig {
3131
/// The schema produced by the deserializer.
3232
pub fn schema_definition(&self) -> schema::Definition {
3333
schema::Definition::empty()
34-
.required_field(
34+
.with_field(
3535
log_schema().timestamp_key(),
3636
// The JSON decoder will try to insert a new `timestamp`-type value into the
3737
// "timestamp_key" field, but only if that field doesn't already exist.

lib/codecs/src/decoding/format/syslog.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl SyslogDeserializerConfig {
3232
schema::Definition::empty()
3333
// The `message` field is always defined. If parsing fails, the entire body becomes the
3434
// message.
35-
.required_field(log_schema().message_key(), Kind::bytes(), Some("message"))
35+
.with_field(log_schema().message_key(), Kind::bytes(), Some("message"))
3636
// All other fields are optional.
3737
.optional_field(
3838
log_schema().timestamp_key(),

0 commit comments

Comments
 (0)