From e528ed7308d411a7af6cb28e92e228429c8a3677 Mon Sep 17 00:00:00 2001 From: Bruce Guenter Date: Tue, 24 Oct 2023 20:17:28 -0600 Subject: [PATCH 1/4] chore(dev): Add wrapper for `opentelemetry_proto` in `vector-lib` --- Cargo.lock | 2 +- Cargo.toml | 3 +-- lib/vector-lib/Cargo.toml | 2 ++ lib/vector-lib/src/lib.rs | 5 +++++ src/sources/opentelemetry/grpc.rs | 6 +++--- src/sources/opentelemetry/http.rs | 6 +++--- src/sources/opentelemetry/mod.rs | 4 ++-- src/sources/opentelemetry/tests.rs | 12 ++++++------ 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88c583d9a0549..df4fda1fd854b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9729,7 +9729,6 @@ dependencies = [ "openssl", "openssl-probe", "openssl-src", - "opentelemetry-proto", "ordered-float 4.1.1", "paste", "percent-encoding", @@ -10049,6 +10048,7 @@ dependencies = [ "codecs", "enrichment", "file-source", + "opentelemetry-proto", "vector-buffers", "vector-common", "vector-config", diff --git a/Cargo.toml b/Cargo.toml index f2b036ca141a5..98e4533a944d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -134,7 +134,6 @@ fakedata = { path = "lib/fakedata", optional = true } lookup = { package = "vector-lookup", path = "lib/vector-lookup" } portpicker = { path = "lib/portpicker" } prometheus-parser = { path = "lib/prometheus-parser", optional = true } -opentelemetry-proto = { path = "lib/opentelemetry-proto", optional = true } tracing-limit = { path = "lib/tracing-limit" } vector-api-client = { path = "lib/vector-api-client", optional = true } vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] } @@ -541,7 +540,7 @@ sources-logstash = ["sources-utils-net-tcp", "tokio-util/net"] sources-mongodb_metrics = ["dep:mongodb"] sources-nats = ["dep:async-nats", "dep:nkeys"] sources-nginx_metrics = ["dep:nom"] -sources-opentelemetry = ["dep:hex", "dep:opentelemetry-proto", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"] +sources-opentelemetry = ["dep:hex", "vector-lib/opentelemetry", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"] sources-postgresql_metrics = ["dep:postgres-openssl", "dep:tokio-postgres"] sources-prometheus = ["sources-prometheus-scrape", "sources-prometheus-remote-write"] sources-prometheus-scrape = ["dep:prometheus-parser", "sinks-prometheus", "sources-utils-http-client"] diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml index 865e17f2a0c97..488b918b09d7c 100644 --- a/lib/vector-lib/Cargo.toml +++ b/lib/vector-lib/Cargo.toml @@ -9,6 +9,7 @@ publish = false codecs = { path = "../codecs", default-features = false } enrichment = { path = "../enrichment" } file-source = { path = "../file-source", optional = true } +opentelemetry-proto = { path = "../opentelemetry-proto", optional = true } vector-buffers = { path = "../vector-buffers", default-features = false } vector-common = { path = "../vector-common" } vector-config = { path = "../vector-config" } @@ -19,6 +20,7 @@ vector-stream = { path = "../vector-stream" } api = ["vector-core/api"] lua = ["vector-core/lua"] file-source = ["dep:file-source"] +opentelemetry = ["dep:opentelemetry-proto"] syslog = ["codecs/syslog"] test = ["vector-core/test"] vrl = ["vector-core/vrl"] diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs index 100e618616711..0224712a848ab 100644 --- a/lib/vector-lib/src/lib.rs +++ b/lib/vector-lib/src/lib.rs @@ -29,3 +29,8 @@ pub mod config { MEMORY_BUFFER_DEFAULT_MAX_EVENTS, }; } + +#[cfg(feature = "opentelemetry")] +pub mod opentelemetry { + pub use opentelemetry_proto::{convert, proto}; +} diff --git a/src/sources/opentelemetry/grpc.rs b/src/sources/opentelemetry/grpc.rs index 1fb04ca7d4748..e0e6e5ee031e6 100644 --- a/src/sources/opentelemetry/grpc.rs +++ b/src/sources/opentelemetry/grpc.rs @@ -1,9 +1,9 @@ use futures::TryFutureExt; -use opentelemetry_proto::proto::collector::logs::v1::{ - logs_service_server::LogsService, ExportLogsServiceRequest, ExportLogsServiceResponse, -}; use tonic::{Request, Response, Status}; use vector_lib::internal_event::{CountByteSize, InternalEventHandle as _, Registered}; +use vector_lib::opentelemetry::proto::collector::logs::v1::{ + logs_service_server::LogsService, ExportLogsServiceRequest, ExportLogsServiceResponse, +}; use vector_lib::{ config::LogNamespace, event::{BatchNotifier, BatchStatus, BatchStatusReceiver, Event}, diff --git a/src/sources/opentelemetry/http.rs b/src/sources/opentelemetry/http.rs index 8a2eb0313ca7a..1d5e91b839b74 100644 --- a/src/sources/opentelemetry/http.rs +++ b/src/sources/opentelemetry/http.rs @@ -4,9 +4,6 @@ use bytes::Bytes; use futures_util::FutureExt; use http::StatusCode; use hyper::{service::make_service_fn, Server}; -use opentelemetry_proto::proto::collector::logs::v1::{ - ExportLogsServiceRequest, ExportLogsServiceResponse, -}; use prost::Message; use snafu::Snafu; use tower::ServiceBuilder; @@ -14,6 +11,9 @@ use tracing::Span; use vector_lib::internal_event::{ ByteSize, BytesReceived, CountByteSize, InternalEventHandle as _, Registered, }; +use vector_lib::opentelemetry::proto::collector::logs::v1::{ + ExportLogsServiceRequest, ExportLogsServiceResponse, +}; use vector_lib::{ config::LogNamespace, event::{BatchNotifier, BatchStatus}, diff --git a/src/sources/opentelemetry/mod.rs b/src/sources/opentelemetry/mod.rs index a4358a80d2adf..9ed04c4294b35 100644 --- a/src/sources/opentelemetry/mod.rs +++ b/src/sources/opentelemetry/mod.rs @@ -12,14 +12,14 @@ use std::net::SocketAddr; use futures::{future::join, FutureExt, TryFutureExt}; use lookup::{owned_value_path, OwnedTargetPath}; -use opentelemetry_proto::convert::{ +use vector_lib::opentelemetry::convert::{ ATTRIBUTES_KEY, DROPPED_ATTRIBUTES_COUNT_KEY, FLAGS_KEY, OBSERVED_TIMESTAMP_KEY, RESOURCE_KEY, SEVERITY_NUMBER_KEY, SEVERITY_TEXT_KEY, SPAN_ID_KEY, TRACE_ID_KEY, }; -use opentelemetry_proto::proto::collector::logs::v1::logs_service_server::LogsServiceServer; use vector_lib::configurable::configurable_component; use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol}; +use vector_lib::opentelemetry::proto::collector::logs::v1::logs_service_server::LogsServiceServer; use vector_lib::{ config::{log_schema, LegacyKey, LogNamespace}, schema::Definition, diff --git a/src/sources/opentelemetry/tests.rs b/src/sources/opentelemetry/tests.rs index 30db2bbcfd264..ca88202bf13e9 100644 --- a/src/sources/opentelemetry/tests.rs +++ b/src/sources/opentelemetry/tests.rs @@ -2,17 +2,17 @@ use chrono::{TimeZone, Utc}; use futures::Stream; use futures_util::StreamExt; use lookup::path; -use opentelemetry_proto::proto::{ - collector::logs::v1::{logs_service_client::LogsServiceClient, ExportLogsServiceRequest}, - common::v1::{any_value, AnyValue, KeyValue}, - logs::v1::{LogRecord, ResourceLogs, ScopeLogs}, - resource::v1::Resource as OtelResource, -}; use similar_asserts::assert_eq; use std::collections::BTreeMap; use std::sync::Arc; use tonic::Request; use vector_lib::config::LogNamespace; +use vector_lib::opentelemetry::proto::{ + collector::logs::v1::{logs_service_client::LogsServiceClient, ExportLogsServiceRequest}, + common::v1::{any_value, AnyValue, KeyValue}, + logs::v1::{LogRecord, ResourceLogs, ScopeLogs}, + resource::v1::Resource as OtelResource, +}; use vrl::value; use crate::config::OutputId; From 89149fb7d933ba7e995b4f215bfae2241adbac70 Mon Sep 17 00:00:00 2001 From: Bruce Guenter Date: Fri, 27 Oct 2023 09:29:05 -0600 Subject: [PATCH 2/4] chore(dev): Add wrapper for `prometheus-parser` in `vector-lib` --- Cargo.lock | 2 +- Cargo.toml | 7 +++---- lib/vector-lib/Cargo.toml | 2 ++ lib/vector-lib/src/lib.rs | 5 +++++ src/internal_events/prometheus.rs | 2 +- src/sinks/prometheus/collector.rs | 2 +- src/sinks/prometheus/remote_write/tests.rs | 2 +- src/sources/prometheus/parser.rs | 8 ++++---- src/sources/prometheus/remote_write.rs | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df4fda1fd854b..199b35b825e3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9735,7 +9735,6 @@ dependencies = [ "pin-project", "portpicker", "postgres-openssl", - "prometheus-parser", "proptest", "prost 0.12.1", "prost-build 0.12.1", @@ -10049,6 +10048,7 @@ dependencies = [ "enrichment", "file-source", "opentelemetry-proto", + "prometheus-parser", "vector-buffers", "vector-common", "vector-config", diff --git a/Cargo.toml b/Cargo.toml index 98e4533a944d6..80ff0b4d1da67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,7 +133,6 @@ dnsmsg-parser = { path = "lib/dnsmsg-parser", optional = true } fakedata = { path = "lib/fakedata", optional = true } lookup = { package = "vector-lookup", path = "lib/vector-lookup" } portpicker = { path = "lib/portpicker" } -prometheus-parser = { path = "lib/prometheus-parser", optional = true } tracing-limit = { path = "lib/tracing-limit" } vector-api-client = { path = "lib/vector-api-client", optional = true } vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] } @@ -543,8 +542,8 @@ sources-nginx_metrics = ["dep:nom"] sources-opentelemetry = ["dep:hex", "vector-lib/opentelemetry", "dep:prost-types", "sources-http_server", "sources-utils-http", "sources-vector"] sources-postgresql_metrics = ["dep:postgres-openssl", "dep:tokio-postgres"] sources-prometheus = ["sources-prometheus-scrape", "sources-prometheus-remote-write"] -sources-prometheus-scrape = ["dep:prometheus-parser", "sinks-prometheus", "sources-utils-http-client"] -sources-prometheus-remote-write = ["dep:prometheus-parser", "sinks-prometheus", "sources-utils-http"] +sources-prometheus-scrape = ["sinks-prometheus", "sources-utils-http-client", "vector-lib/prometheus"] +sources-prometheus-remote-write = ["sinks-prometheus", "sources-utils-http", "vector-lib/prometheus"] sources-redis= ["dep:redis"] sources-socket = ["sources-utils-net", "tokio-util/net"] sources-splunk_hec = ["dep:roaring"] @@ -706,7 +705,7 @@ sinks-nats = ["dep:async-nats", "dep:nkeys"] sinks-new_relic_logs = ["sinks-http"] sinks-new_relic = [] sinks-papertrail = ["dep:syslog"] -sinks-prometheus = ["dep:base64", "dep:prometheus-parser"] +sinks-prometheus = ["dep:base64", "vector-lib/prometheus"] sinks-pulsar = ["dep:apache-avro", "dep:pulsar", "dep:lru"] sinks-redis = ["dep:redis"] sinks-sematext = ["sinks-elasticsearch", "sinks-influxdb"] diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml index 488b918b09d7c..107b6b7925405 100644 --- a/lib/vector-lib/Cargo.toml +++ b/lib/vector-lib/Cargo.toml @@ -10,6 +10,7 @@ codecs = { path = "../codecs", default-features = false } enrichment = { path = "../enrichment" } file-source = { path = "../file-source", optional = true } opentelemetry-proto = { path = "../opentelemetry-proto", optional = true } +prometheus-parser = { path = "../prometheus-parser", optional = true } vector-buffers = { path = "../vector-buffers", default-features = false } vector-common = { path = "../vector-common" } vector-config = { path = "../vector-config" } @@ -21,6 +22,7 @@ api = ["vector-core/api"] lua = ["vector-core/lua"] file-source = ["dep:file-source"] opentelemetry = ["dep:opentelemetry-proto"] +prometheus = ["dep:prometheus-parser"] syslog = ["codecs/syslog"] test = ["vector-core/test"] vrl = ["vector-core/vrl"] diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs index 0224712a848ab..38ea148f30409 100644 --- a/lib/vector-lib/src/lib.rs +++ b/lib/vector-lib/src/lib.rs @@ -34,3 +34,8 @@ pub mod config { pub mod opentelemetry { pub use opentelemetry_proto::{convert, proto}; } + +#[cfg(feature = "prometheus")] +pub mod prometheus { + pub use prometheus_parser as parser; +} diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs index c09487bb93098..db5488cf1715a 100644 --- a/src/internal_events/prometheus.rs +++ b/src/internal_events/prometheus.rs @@ -4,7 +4,7 @@ use std::borrow::Cow; use hyper::StatusCode; use metrics::counter; #[cfg(feature = "sources-prometheus-scrape")] -use prometheus_parser::ParserError; +use vector_lib::prometheus::parser::ParserError; use vector_lib::internal_event::InternalEvent; use crate::emit; diff --git a/src/sinks/prometheus/collector.rs b/src/sinks/prometheus/collector.rs index 7d26b21d58429..c4ba80806d8a7 100644 --- a/src/sinks/prometheus/collector.rs +++ b/src/sinks/prometheus/collector.rs @@ -2,7 +2,7 @@ use std::{collections::BTreeMap, fmt::Write as _}; use chrono::Utc; use indexmap::map::IndexMap; -use prometheus_parser::{proto, METRIC_NAME_LABEL}; +use vector_lib::prometheus::parser::{proto, METRIC_NAME_LABEL}; use vector_lib::event::metric::{samples_to_buckets, MetricSketch, MetricTags, Quantile}; use crate::{ diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs index a9d00cd10a0fa..074c5fea7c6d1 100644 --- a/src/sinks/prometheus/remote_write/tests.rs +++ b/src/sinks/prometheus/remote_write/tests.rs @@ -2,7 +2,7 @@ use bytes::Bytes; use futures::StreamExt; use http::HeaderMap; use indoc::indoc; -use prometheus_parser::proto; +use vector_lib::prometheus::parser::proto; use prost::Message; use vector_lib::metric_tags; diff --git a/src/sources/prometheus/parser.rs b/src/sources/prometheus/parser.rs index 9f7b4a64904f0..41ac8d43af41f 100644 --- a/src/sources/prometheus/parser.rs +++ b/src/sources/prometheus/parser.rs @@ -2,8 +2,8 @@ use std::cmp::Ordering; use chrono::{DateTime, TimeZone, Utc}; #[cfg(feature = "sources-prometheus-remote-write")] -use prometheus_parser::proto; -use prometheus_parser::{GroupKind, MetricGroup, ParserError}; +use vector_lib::prometheus::parser::proto; +use vector_lib::prometheus::parser::{GroupKind, MetricGroup, ParserError}; use crate::event::{ metric::{Bucket, Metric, MetricKind, MetricTags, MetricValue, Quantile}, @@ -21,12 +21,12 @@ fn utc_timestamp(timestamp: Option, default: DateTime) -> DateTime Result, ParserError> { - prometheus_parser::parse_text(packet).map(reparse_groups) + vector_lib::prometheus::parser::parse_text(packet).map(reparse_groups) } #[cfg(feature = "sources-prometheus-remote-write")] pub(super) fn parse_request(request: proto::WriteRequest) -> Result, ParserError> { - prometheus_parser::parse_request(request).map(reparse_groups) + vector_lib::prometheus::parser::parse_request(request).map(reparse_groups) } fn reparse_groups(groups: Vec) -> Vec { diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs index 84fa60de444ce..d682b51a5ba9d 100644 --- a/src/sources/prometheus/remote_write.rs +++ b/src/sources/prometheus/remote_write.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, net::SocketAddr}; use bytes::Bytes; -use prometheus_parser::proto; +use vector_lib::prometheus::parser::proto; use prost::Message; use vector_lib::config::LogNamespace; use vector_lib::configurable::configurable_component; From 459d2594c34eccfaf1d3590d5e834e60769a98e1 Mon Sep 17 00:00:00 2001 From: Bruce Guenter Date: Fri, 27 Oct 2023 09:38:02 -0600 Subject: [PATCH 3/4] chore(dev): Add wrapper for `vector-api-client` in `vector-lib` --- Cargo.lock | 2 +- Cargo.toml | 3 +-- lib/vector-lib/Cargo.toml | 2 ++ lib/vector-lib/src/lib.rs | 2 ++ src/tap/cmd.rs | 2 +- src/tap/mod.rs | 2 +- src/top/cmd.rs | 2 +- src/top/metrics.rs | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 199b35b825e3d..7108a3b7923db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9797,7 +9797,6 @@ dependencies = [ "typetag", "url", "uuid", - "vector-api-client", "vector-lib", "vector-lookup", "vector-vrl-functions", @@ -10049,6 +10048,7 @@ dependencies = [ "file-source", "opentelemetry-proto", "prometheus-parser", + "vector-api-client", "vector-buffers", "vector-common", "vector-config", diff --git a/Cargo.toml b/Cargo.toml index 80ff0b4d1da67..53ae620ca846a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -134,7 +134,6 @@ fakedata = { path = "lib/fakedata", optional = true } lookup = { package = "vector-lookup", path = "lib/vector-lookup" } portpicker = { path = "lib/portpicker" } tracing-limit = { path = "lib/tracing-limit" } -vector-api-client = { path = "lib/vector-api-client", optional = true } vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] } vector-vrl-functions = { path = "lib/vector-vrl/functions" } loki-logproto = { path = "lib/loki-logproto", optional = true } @@ -437,7 +436,7 @@ api-client = [ "dep:number_prefix", "dep:ratatui", "vector-lib/api", - "dep:vector-api-client", + "vector-lib/api-client", ] aws-core = [ diff --git a/lib/vector-lib/Cargo.toml b/lib/vector-lib/Cargo.toml index 107b6b7925405..9c63ef1c3cc43 100644 --- a/lib/vector-lib/Cargo.toml +++ b/lib/vector-lib/Cargo.toml @@ -11,6 +11,7 @@ enrichment = { path = "../enrichment" } file-source = { path = "../file-source", optional = true } opentelemetry-proto = { path = "../opentelemetry-proto", optional = true } prometheus-parser = { path = "../prometheus-parser", optional = true } +vector-api-client = { path = "../vector-api-client", optional = true } vector-buffers = { path = "../vector-buffers", default-features = false } vector-common = { path = "../vector-common" } vector-config = { path = "../vector-config" } @@ -19,6 +20,7 @@ vector-stream = { path = "../vector-stream" } [features] api = ["vector-core/api"] +api-client = ["dep:vector-api-client"] lua = ["vector-core/lua"] file-source = ["dep:file-source"] opentelemetry = ["dep:opentelemetry-proto"] diff --git a/lib/vector-lib/src/lib.rs b/lib/vector-lib/src/lib.rs index 38ea148f30409..61bbe53de1d0c 100644 --- a/lib/vector-lib/src/lib.rs +++ b/lib/vector-lib/src/lib.rs @@ -2,6 +2,8 @@ pub use codecs; pub use enrichment; #[cfg(feature = "file-source")] pub use file_source; +#[cfg(feature = "api-client")] +pub use vector_api_client as api_client; pub use vector_buffers as buffers; pub use vector_common::{ assert_event_data_eq, btreemap, byte_size_of, byte_size_of::ByteSizeOf, conversion, diff --git a/src/tap/cmd.rs b/src/tap/cmd.rs index a5c4f20eede12..d402641f0840a 100644 --- a/src/tap/cmd.rs +++ b/src/tap/cmd.rs @@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::BTreeMap, time::Duration}; use colored::{ColoredString, Colorize}; use tokio_stream::StreamExt; use url::Url; -use vector_api_client::{ +use vector_lib::api_client::{ connect_subscription_client, gql::{ output_events_by_component_id_patterns_subscription::OutputEventsByComponentIdPatternsSubscriptionOutputEventsByComponentIdPatterns, diff --git a/src/tap/mod.rs b/src/tap/mod.rs index 81b4d5a8d5733..0b93f5a8704c3 100644 --- a/src/tap/mod.rs +++ b/src/tap/mod.rs @@ -5,7 +5,7 @@ use clap::Parser; pub(crate) use cmd::cmd; pub use cmd::tap; use url::Url; -use vector_api_client::gql::TapEncodingFormat; +use vector_lib::api_client::gql::TapEncodingFormat; use crate::config::api::default_graphql_url; diff --git a/src/top/cmd.rs b/src/top/cmd.rs index 2617ed0721259..148c46957855c 100644 --- a/src/top/cmd.rs +++ b/src/top/cmd.rs @@ -3,7 +3,7 @@ use std::time::Duration; use chrono::Local; use futures_util::future::join_all; use tokio::sync::{mpsc, oneshot}; -use vector_api_client::{connect_subscription_client, Client}; +use vector_lib::api_client::{connect_subscription_client, Client}; use super::{ dashboard::{init_dashboard, is_tty}, diff --git a/src/top/metrics.rs b/src/top/metrics.rs index cbacc5ab9c904..036ff51927344 100644 --- a/src/top/metrics.rs +++ b/src/top/metrics.rs @@ -5,7 +5,7 @@ use std::{ use tokio::task::JoinHandle; use tokio_stream::StreamExt; -use vector_api_client::{ +use vector_lib::api_client::{ gql::{ComponentsQueryExt, ComponentsSubscriptionExt, MetricsSubscriptionExt}, Client, SubscriptionClient, }; From d94e3792a4c4160460522a5e0a3a8294cd1cdaa2 Mon Sep 17 00:00:00 2001 From: Bruce Guenter Date: Tue, 31 Oct 2023 08:01:10 -0600 Subject: [PATCH 4/4] Reformat --- src/internal_events/prometheus.rs | 2 +- src/sinks/prometheus/collector.rs | 2 +- src/sinks/prometheus/remote_write/tests.rs | 2 +- src/sources/prometheus/remote_write.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal_events/prometheus.rs b/src/internal_events/prometheus.rs index db5488cf1715a..ef8ffceae6fda 100644 --- a/src/internal_events/prometheus.rs +++ b/src/internal_events/prometheus.rs @@ -3,9 +3,9 @@ use std::borrow::Cow; use hyper::StatusCode; use metrics::counter; +use vector_lib::internal_event::InternalEvent; #[cfg(feature = "sources-prometheus-scrape")] use vector_lib::prometheus::parser::ParserError; -use vector_lib::internal_event::InternalEvent; use crate::emit; use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL}; diff --git a/src/sinks/prometheus/collector.rs b/src/sinks/prometheus/collector.rs index c4ba80806d8a7..99a428e8f6124 100644 --- a/src/sinks/prometheus/collector.rs +++ b/src/sinks/prometheus/collector.rs @@ -2,8 +2,8 @@ use std::{collections::BTreeMap, fmt::Write as _}; use chrono::Utc; use indexmap::map::IndexMap; -use vector_lib::prometheus::parser::{proto, METRIC_NAME_LABEL}; use vector_lib::event::metric::{samples_to_buckets, MetricSketch, MetricTags, Quantile}; +use vector_lib::prometheus::parser::{proto, METRIC_NAME_LABEL}; use crate::{ event::metric::{Metric, MetricKind, MetricValue, StatisticKind}, diff --git a/src/sinks/prometheus/remote_write/tests.rs b/src/sinks/prometheus/remote_write/tests.rs index 074c5fea7c6d1..35657fb5a164c 100644 --- a/src/sinks/prometheus/remote_write/tests.rs +++ b/src/sinks/prometheus/remote_write/tests.rs @@ -2,9 +2,9 @@ use bytes::Bytes; use futures::StreamExt; use http::HeaderMap; use indoc::indoc; -use vector_lib::prometheus::parser::proto; use prost::Message; use vector_lib::metric_tags; +use vector_lib::prometheus::parser::proto; use super::*; use crate::{ diff --git a/src/sources/prometheus/remote_write.rs b/src/sources/prometheus/remote_write.rs index d682b51a5ba9d..523df670ec5b8 100644 --- a/src/sources/prometheus/remote_write.rs +++ b/src/sources/prometheus/remote_write.rs @@ -1,10 +1,10 @@ use std::{collections::HashMap, net::SocketAddr}; use bytes::Bytes; -use vector_lib::prometheus::parser::proto; use prost::Message; use vector_lib::config::LogNamespace; use vector_lib::configurable::configurable_component; +use vector_lib::prometheus::parser::proto; use warp::http::{HeaderMap, StatusCode}; use super::parser;