Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(querier): enable object store metrics

pull/24376/head
Dom Dwyer 2022-03-15 16:23:56 +00:00
parent f4d836eed7
commit 6fb1a9b592
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
influxdb_iox/src/commands/run/querier.rs
View File

@ -1,6 +1,6 @@
//! Implementation of command line option for running the querier
use object_store::ObjectStoreImpl;
use object_store::{instrumentation::ObjectStoreMetrics, DynObjectStore, ObjectStoreImpl};
use observability_deps::tracing::*;
use query::exec::Executor;
use std::sync::Arc;
@ -73,10 +73,11 @@ pub async fn command(config: Config) -> Result<(), Error> {
.get_catalog("querier", Arc::clone(&metric_registry))
.await?;
let object_store = Arc::new(
ObjectStoreImpl::try_from(config.run_config.object_store_config())
.map_err(Error::ObjectStoreParsing)?,
);
let object_store = ObjectStoreImpl::try_from(config.run_config.object_store_config())
.map_err(Error::ObjectStoreParsing)?;
// Decorate the object store with a metric recorder.
let object_store: Arc<DynObjectStore> =
Arc::new(ObjectStoreMetrics::new(object_store, &*metric_registry));
let time_provider = Arc::new(SystemProvider::new());

4
influxdb_ioxd/src/server_type/querier/mod.rs
View File

@ -7,7 +7,7 @@ use async_trait::async_trait;
use hyper::{Body, Request, Response};
use iox_catalog::interface::Catalog;
use metric::Registry;
use object_store::ObjectStoreImpl;
use object_store::DynObjectStore;
use querier::{
database::QuerierDatabase,
handler::{QuerierHandler, QuerierHandlerImpl},
@ -127,7 +127,7 @@ pub async fn create_querier_server_type(
common_state: &CommonServerState,
metric_registry: Arc<metric::Registry>,
catalog: Arc<dyn Catalog>,
object_store: Arc<ObjectStoreImpl>,
object_store: Arc<DynObjectStore>,
time_provider: Arc<dyn TimeProvider>,
exec: Arc<Executor>,
) -> Arc<dyn ServerType> {