Merge branch 'master' into neuronull/audit1_sink_http

vectordotdev · Sep 9, 2022 · afceb08 · afceb08
2 parents 3d3124d + f705842
commit afceb08
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -199,7 +199,7 @@ goauth = { version = "0.13.1", optional = true }
 smpl_jwt = { version = "0.7.1", default-features = false, optional = true }
 
 # API
-async-graphql = { version = "4.0.12", default-features = false, optional = true, features = ["chrono"] }
+async-graphql = { version = "4.0.13", default-features = false, optional = true, features = ["chrono"] }
 async-graphql-warp = { version = "4.0.12", default-features = false, optional = true }
 itertools = { version = "0.10.3", default-features = false, optional = true }
 

diff --git a/lib/value/Cargo.toml b/lib/value/Cargo.toml
@@ -17,7 +17,7 @@ snafu = { version = "0.7.1", default-features = false }
 tracing = { version = "0.1.34", default-features = false, features = ["attributes"] }
 
 # Optional
-async-graphql = { version = "4.0.12", default-features = false, optional = true }
+async-graphql = { version = "4.0.13", default-features = false, optional = true }
 mlua = { version = "0.8.3", default-features = false, features = ["lua54", "send", "vendored"], optional = true}
 serde = { version = "1.0.144", default-features = false, features = ["derive", "rc"], optional = true }
 serde_json = { version = "1.0.85", optional = true }
@@ -32,7 +32,7 @@ test = []
 arbitrary = ["dep:quickcheck"]
 
 [dev-dependencies]
-async-graphql = { version = "4.0.12", default-features = false }
+async-graphql = { version = "4.0.13", default-features = false }
 indoc = { version = "1.0.7", default-features = false }
 quickcheck = "1.0.3"
 lookup = { path = "../lookup", default-features = false, features = ["arbitrary"] }

diff --git a/lib/vector-common/src/internal_event/service.rs b/lib/vector-common/src/internal_event/service.rs
@@ -26,30 +26,3 @@ impl<E: std::fmt::Debug> InternalEvent for PollReadyError<E> {
         Some("ServicePollReadyError")
     }
 }
-
-#[derive(Debug)]
-pub struct CallError<E> {
-    pub error: E,
-    pub request_id: usize,
-}
-
-impl<E: std::fmt::Debug> InternalEvent for CallError<E> {
-    fn emit(self) {
-        error!(
-            message = "Service call failed.",
-            request_id = self.request_id,
-            error = ?self.error,
-            error_type = error_type::REQUEST_FAILED,
-            stage = error_stage::SENDING,
-        );
-        counter!(
-            "component_errors_total", 1,
-            "error_type" => error_type::REQUEST_FAILED,
-            "stage" => error_stage::SENDING,
-        );
-    }
-
-    fn name(&self) -> Option<&'static str> {
-        Some("ServiceCallError")
-    }
-}
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-async-graphql = { version = "4.0.12", default-features = false, optional = true }
+async-graphql = { version = "4.0.13", default-features = false, optional = true }
 async-trait = { version = "0.1", default-features = false }
 bitmask-enum = { version = "2.0.0", default-features = false }
 bytes = { version = "1.2.1", default-features = false, features = ["serde"] }

diff --git a/lib/vector-core/src/stream/driver.rs b/lib/vector-core/src/stream/driver.rs
@@ -168,7 +168,8 @@ where
     ) {
         match result {
             Err(error) => {
-                emit(service::CallError { error, request_id });
+                // `Error` and `EventsDropped` internal events are emitted in the sink retry logic.
+                error!(message = "Service call failed.", ?error, request_id);
                 finalizers.update_status(EventStatus::Rejected);
             }
             Ok(response) => {