Skip to content
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

feat(http_server source): add all headers to the namespace metadata #18922

Merged
merged 10 commits into from
Dec 5, 2023
Merged

feat(http_server source): add all headers to the namespace metadata #18922

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4d120d
feat(http_server source): add all headers to the namespace metadata
sonnens Oct 24, 2023
ce53704
feat(http_server source): allow wildcard matching in headers
sonnens Nov 8, 2023
ca724c3
Merge branch 'vectordotdev:master' into httpserver_meta
sonnens Nov 8, 2023
a6e7346
style: whitespace typo
sonnens Nov 8, 2023
9dda931
rework header glob matching, add docs and tests
sonnens Nov 25, 2023
d43b293
examples, docs, tests, error on misconfiguration
sonnens Nov 30, 2023
a01858b
fmt & clippy cleanup
sonnens Nov 30, 2023
001e17b
Generate docs
jszwedko Dec 1, 2023
4c319da
docs grammar adjustment
neuronull Dec 1, 2023
4cbc8c5
add some code docs
neuronull Dec 1, 2023
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
34 changes: 23 additions & 11 deletions src/sources/http_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ use http::{StatusCode, Uri};
use http_serde;
use tokio_util::codec::Decoder as _;
use vrl::value::{kind::Collection, Kind};
use warp::http::{HeaderMap, HeaderValue};
use warp::http::HeaderMap;

use codecs::{
decoding::{DeserializerConfig, FramingConfig},
BytesDecoderConfig, BytesDeserializerConfig, JsonDeserializerConfig,
NewlineDelimitedDecoderConfig,
};
use lookup::{lookup_v2::OptionalValuePath, owned_value_path, path};
use lookup::{lookup_v2::OptionalValuePath, OwnedValuePath, owned_value_path, path};
use vector_config::configurable_component;
use vector_core::{
config::{DataType, LegacyKey, LogNamespace},
Expand Down Expand Up @@ -408,16 +408,28 @@ impl HttpSource for SimpleHttpSource {
);

// add each header to each event
let mut received_headers = headers_config.clone();
for header_name in &self.headers {
let value = headers_config.get(header_name).map(HeaderValue::as_bytes);

self.log_namespace.insert_source_metadata(
SimpleHttpConfig::NAME,
log,
Some(LegacyKey::InsertIfEmpty(path!(header_name))),
path!("headers", header_name),
Value::from(value.map(Bytes::copy_from_slice)),
);
if let Some(header_value) = received_headers.remove(header_name) {
self.log_namespace.insert_source_metadata(
SimpleHttpConfig::NAME,
log,
Some(LegacyKey::InsertIfEmpty(path!(header_name))),
path!("headers", header_name),
Value::from(header_value.as_bytes()),
);
}
}
if self.log_namespace == LogNamespace::Vector {
for (header_name, value) in received_headers.iter() {
self.log_namespace.insert_source_metadata(
SimpleHttpConfig::NAME,
log,
None::<LegacyKey<&OwnedValuePath>>,
path!("headers", header_name.as_str()),
Value::from(value.as_bytes()),
);
}
}

self.log_namespace.insert_standard_vector_source_metadata(
Expand Down