Skip to content

Commit f682889

Browse files
committed
Merge remote-tracking branch 'origin/master' into bruceg/dynamic-transforms
2 parents ba9d3bd + 63e5068 commit f682889

File tree

16 files changed

+185
-74
lines changed

16 files changed

+185
-74
lines changed

.github/SUPPORT.md

+101-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,104 @@
11
# Support
22

3-
Vector is a growing open source project with a variety of people willing to help you through various mediums.
3+
Vector is a growing open source project with a variety of people willing to help
4+
you through various mediums.
45

5-
Take a look at those mediums listed at https://vector.dev/community
6+
Take a look at those mediums listed at <https://vector.dev/community>
7+
8+
## How to ask a question about Vector
9+
10+
Whether in our community [Discord][discord] server or [GitHub Discussions][discussions], framing
11+
your question well and providing the right level of details will improve your chances of getting
12+
your question answered. Here are some tips:
13+
14+
### Before asking
15+
16+
Check the [Vector documentation](https://vector.dev/docs/) first to see if it answers your question.
17+
If your question is about [VRL](https://vector.dev/docs/reference/vrl/#learn), you can also try out
18+
the [VRL playground](vrl_playground).
19+
20+
If the docs do not answer your question, try using the search feature on [Discord][discord] or
21+
[GitHub][vector], to search for keywords related to your issue. It is quite possible someone has
22+
already asked your question before. This is especially useful if you have a specific error message
23+
you are observing.
24+
25+
### Provide details
26+
27+
Essential details to include:
28+
29+
- What is the version of Vector (and the Helm chart if deploying via Helm) and
30+
the versions of any other systems in use (like Elasticsearch, NATS, etc.).
31+
- What is your Vector configuration. See the below section on [how to format
32+
your config](#formatting).
33+
- How are you [deploying](https://vector.dev/docs/setup/deployment/) Vector?
34+
- What is your complete deployment architecture? For example: I have Logstash
35+
agents sending to Vector over syslog that is being forwarded to Loki.
36+
37+
Situation specific (not exhaustive):
38+
39+
- Did it occur after upgrading to a new version of Vector?
40+
- Are you trying out Vector for the first time, or did you have a previous
41+
working configuration?
42+
43+
These are just some examples of questions that may or may not apply to your
44+
situation.
45+
46+
### Formatting
47+
48+
When providing snippets of configuration files, or log messages, format these with backticks to
49+
improve the legibility for readers.
50+
51+
#### Blocks
52+
53+
Blocks should be formatted with three backticks (\`\`\`)
54+
55+
This should be used for any configuration snippets of Vector, Helm values, etc.
56+
and for Vector console log messages.
57+
58+
See the [markdown documentation](https://www.markdownguide.org/basic-syntax/#fenced-code-blocks)
59+
for an explanation.
60+
61+
For example:
62+
63+
[sinks.sink0]
64+
65+
inputs = ["source0"]
66+
67+
target = "stdout"
68+
69+
type = "console"
70+
71+
should be written as
72+
73+
```toml
74+
[sinks.sink0]
75+
inputs = ["source0"]
76+
target = "stdout"
77+
type = "console"
78+
```
79+
80+
#### Single word or phrase
81+
82+
Formatting things like component names, versions etc. is done with single
83+
backticks (\`) around the word or phrase.
84+
85+
This is less critical but also helps readability a lot and is greatly
86+
appreciated.
87+
88+
See the [markdown documentation](https://www.markdownguide.org/basic-syntax/#code)
89+
for an explanation.
90+
91+
For example:
92+
93+
> We upgraded from v24 to 25.1 and are seeing the following error output from
94+
kafka.
95+
96+
should be written as
97+
98+
> We upgraded from `v0.24.0` to `v0.25.1` and are seeing the following error
99+
output from the `kafka` sink.
100+
101+
[discord]: https://chat.vector.dev
102+
[discussions]: https://github.com/vectordotdev/vector/discussions
103+
[vector]: https://github.com/vectordotdev/vector
104+
[vrl_playground]: https://playground.vrl.dev

.github/workflows/regression_trusted.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: experimental-meta
3939
run: |
4040
export WARMUP_SECONDS="45"
41-
export REPLICAS="10"
41+
export REPLICAS="20"
4242
export TOTAL_SAMPLES="600"
4343
export P_VALUE="0.1"
4444
export SMP_CRATE_VERSION="0.7.1"
@@ -417,7 +417,7 @@ jobs:
417417
- uses: actions/checkout@v3
418418

419419
- name: Configure AWS Credentials
420-
uses: aws-actions/configure-aws-credentials@v1-node16
420+
uses: aws-actions/configure-aws-credentials@v1.7.0
421421
with:
422422
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
423423
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}

Cargo.lock

+14-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ rmp-serde = { version = "1.1.1", default-features = false, optional = true }
207207
rmpv = { version = "1.0.0", default-features = false, features = ["with-serde"], optional = true }
208208

209209
# Prost
210-
prost = { version = "0.11.6", default-features = false, features = ["std"] }
210+
prost = { version = "0.11.7", default-features = false, features = ["std"] }
211211
prost-types = { version = "0.11.6", default-features = false, optional = true }
212212

213213
# GCP
@@ -376,6 +376,7 @@ zstd = { version = "0.12.3", default-features = false }
376376
chrono = { git = "https://github.com/vectordotdev/chrono.git", branch = "no-default-time-v0.4.22-1" }
377377
# The upgrade for `tokio-util` >= 0.6.9 is blocked on https://github.com/vectordotdev/vector/issues/11257.
378378
tokio-util = { git = "https://github.com/vectordotdev/tokio", branch = "tokio-util-0.7.4-framed-read-continue-on-error" }
379+
nix = { git = "https://github.com/vectordotdev/nix.git", branch = "memfd/gnu/musl" }
379380

380381
[features]
381382
# Default features for *-unknown-linux-gnu and *-apple-darwin

lib/codecs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lookup = { path = "../lookup", default-features = false }
1515
memchr = { version = "2", default-features = false }
1616
once_cell = { version = "1.17", default-features = false }
1717
ordered-float = { version = "3.4.0", default-features = false }
18-
prost = { version = "0.11.6", default-features = false, features = ["std"] }
18+
prost = { version = "0.11.7", default-features = false, features = ["std"] }
1919
regex = { version = "1.7.1", default-features = false, features = ["std", "perf"] }
2020
serde = { version = "1", default-features = false, features = ["derive"] }
2121
serde_json = { version = "1", default-features = false }

lib/opentelemetry-proto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
1515
hex = { version = "0.4.3", default-features = false, features = ["std"] }
1616
lookup = { path = "../lookup", default-features = false }
1717
ordered-float = { version = "3.4.0", default-features = false }
18-
prost = { version = "0.11.6", default-features = false, features = ["std"] }
18+
prost = { version = "0.11.7", default-features = false, features = ["std"] }
1919
tonic = { version = "0.8", default-features = false, features = ["codegen", "gzip", "prost", "tls", "tls-roots", "transport"] }
2020
value = { path = "../value"}
2121
vector-core = { path = "../vector-core", default-features = false }

lib/prometheus-parser/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ license = "MPL-2.0"
1111
[dependencies]
1212
indexmap = "~1.9.2"
1313
nom = "7.1.3"
14-
num_enum = "0.5.10"
15-
prost = "0.11.6"
14+
num_enum = "0.5.11"
15+
prost = "0.11.7"
1616
prost-types = "0.11.6"
1717
snafu = { version = "0.7" }
1818
vector-common = { path = "../vector-common", features = ["btreemap"] }

lib/vector-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ parking_lot = { version = "0.12.1", default-features = false }
3636
pin-project = { version = "1.0.12", default-features = false }
3737
proptest = { version = "1.1", optional = true }
3838
prost-types = { version = "0.11.6", default-features = false }
39-
prost = { version = "0.11.6", default-features = false, features = ["std"] }
39+
prost = { version = "0.11.7", default-features = false, features = ["std"] }
4040
quanta = { version = "0.10.1", default-features = false }
4141
regex = { version = "1.7.1", default-features = false, features = ["std", "perf"] }
4242
ryu = { version = "1", default-features = false }

lib/vrl/cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ indoc = "2.0.0"
1717
once_cell = { version = "1.17", optional = true }
1818
prettytable-rs = { version = "0.10", default-features = false, optional = true }
1919
regex = { version = "1", default-features = false, optional = true, features = ["perf"] }
20-
rustyline = { version = "10", default-features = false, optional = true }
20+
rustyline = { version = "11", default-features = false, optional = true }
2121
serde_json = "1"
2222
thiserror = "1"
2323
vector-common = { path = "../../vector-common", default-features = false }

lib/vrl/cli/src/repl.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use rustyline::{
1212
error::ReadlineError,
1313
highlight::{Highlighter, MatchingBracketHighlighter},
1414
hint::{Hinter, HistoryHinter},
15+
history::MemHistory,
1516
validate::{self, ValidationResult, Validator},
1617
Context, Editor, Helper,
1718
};
@@ -61,7 +62,7 @@ pub(crate) fn run(
6162
let mut state = TypeState::default();
6263

6364
let mut rt = Runtime::new(state::Runtime::default());
64-
let mut rl = Editor::<Repl>::new()?;
65+
let mut rl = Editor::<Repl, MemHistory>::new()?;
6566
rl.set_helper(Some(Repl::new()));
6667

6768
#[allow(clippy::print_stdout)]
@@ -83,7 +84,7 @@ pub(crate) fn run(
8384
// Capture "help docs <func_name>"
8485
Ok(line) if func_docs_regex.is_match(line) => show_func_docs(line, &func_docs_regex),
8586
Ok(line) => {
86-
rl.add_history_entry(line);
87+
rl.add_history_entry(line)?;
8788

8889
let command = match line {
8990
"next" => {

src/sinks/pulsar.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ pub struct PulsarSinkConfig {
9292
#[configurable_component]
9393
#[derive(Clone, Copy, Debug, Default)]
9494
pub struct BatchConfig {
95-
/// The maximum size of a batch, in events, before it is flushed.
95+
/// The maximum size of a batch before it is flushed.
9696
#[configurable(metadata(docs::type_unit = "events"))]
9797
#[configurable(metadata(docs::examples = 1000))]
98-
pub batch_size: Option<u32>,
98+
pub max_events: Option<u32>,
9999
}
100100

101101
/// Authentication configuration.
@@ -333,7 +333,7 @@ impl PulsarSinkConfig {
333333
};
334334

335335
if !is_healthcheck {
336-
producer_options.batch_size = self.batch.batch_size;
336+
producer_options.batch_size = self.batch.max_events;
337337
}
338338

339339
if let SerializerConfig::Avro { avro } = self.encoding.config() {

src/sources/kafka.rs

-8
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ pub struct KafkaSourceConfig {
9494
#[configurable(metadata(docs::examples = "consumer-group-name"))]
9595
group_id: String,
9696

97-
/// Override dynamic membership and broker assignment behavior with static membership, using a group instance (member) id.
98-
#[configurable(metadata(docs::examples = "kafka-streams-instance-1"))]
99-
group_instance_id: Option<String>,
100-
10197
/// If offsets for consumer group do not exist, set them using this strategy.
10298
///
10399
/// See the [librdkafka documentation](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md) for the `auto.offset.reset` option for further clarification.
@@ -704,10 +700,6 @@ fn create_consumer(config: &KafkaSourceConfig) -> crate::Result<StreamConsumer<C
704700
}
705701
}
706702

707-
if let Some(group_instance_id) = &config.group_instance_id {
708-
client_config.set("group.instance.id", group_instance_id);
709-
}
710-
711703
let consumer = client_config
712704
.create_with_context::<_, StreamConsumer<_>>(CustomContext::new(
713705
config.metrics.topic_lag_metric,

0 commit comments

Comments
 (0)