Add S3 metrics collection and reporting

athmaja-n · Aug 14, 2024 · 7798570 · 7798570
1 parent 17473f4
commit 7798570
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/velox/common/base/CMakeLists.txt b/velox/common/base/CMakeLists.txt
@@ -32,12 +32,11 @@ add_library(
   StatsReporter.cpp
   SuccinctPrinter.cpp)
 
+# Link the newly created velox_s3_metrics_aggregator library
 target_link_libraries(
   velox_common_base
-  #PUBLIC velox_exception Folly::folly fmt::fmt xsimd
-  #PRIVATE velox_common_compression velox_process velox_test_util glog::glog)
-  PUBLIC velox_exception velox_s3fs Folly::folly fmt::fmt xsimd
-  PRIVATE velox_common_compression velox_process velox_test_util glog::glog)
+  PUBLIC velox_exception Folly::folly fmt::fmt xsimd
+  PRIVATE velox_common_compression velox_process velox_test_util glog::glog velox_s3_metrics_aggregator)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)

diff --git a/velox/connectors/hive/storage_adapters/s3fs/CMakeLists.txt b/velox/connectors/hive/storage_adapters/s3fs/CMakeLists.txt
@@ -14,13 +14,26 @@
 
 # for generated headers
 
+# Create a new library for S3MetricsAggregator to avoid cyclic dependency
+add_library(velox_s3_metrics_aggregator STATIC
+  S3MetricsAggregator.cpp
+)
+
+target_include_directories(velox_s3_metrics_aggregator PUBLIC ${AWSSDK_INCLUDE_DIRS})
+
+target_link_libraries(velox_s3_metrics_aggregator
+  PUBLIC Folly::folly
+  PRIVATE glog::glog
+)
+
 add_library(velox_s3fs RegisterS3FileSystem.cpp)
 if(VELOX_ENABLE_S3)
-  target_sources(velox_s3fs PRIVATE S3FileSystem.cpp S3Util.cpp S3MetricsAggregator.cpp)
+  target_sources(velox_s3fs PRIVATE S3FileSystem.cpp S3Util.cpp)
 
   target_include_directories(velox_s3fs PUBLIC ${AWSSDK_INCLUDE_DIRS})
+
   target_link_libraries(velox_s3fs velox_dwio_common Folly::folly
-                        ${AWSSDK_LIBRARIES})
+                        ${AWSSDK_LIBRARIES} velox_s3_metrics_aggregator)
 
   if(${VELOX_BUILD_TESTING})
     add_subdirectory(tests)