telemetry: Add structured error logging to SaplingBackingStore layer

Summary: Threads ErrorLogger through SaplingBackingStore so that backing store fetch failures can be logged to perfpipe_edenfs_errors.

Reviewed By: vilatto

Differential Revision: D105073799

fbshipit-source-id: d91114567bcc5e1979a86f3e19467c5004711287

Author: Chandhana Solainathan

eden/fs/service/EdenMain.cpp

@@ -193,6 +193,7 @@ std::shared_ptr<SaplingBackingStore> createSaplingBackingStore(
       reloadableConfig,
       std::move(runtimeOptions),
       params.serverState->getEdenFsEventsLogger(),
+      params.serverState->getErrorLogger(),
       std::make_unique<BackingStoreLogger>(
           params.serverState->getEdenFsEventsLogger(),
           params.serverState->getProcessInfoCache()),

eden/fs/store/sl/BUCK

@@ -86,6 +86,7 @@ cpp_library(
         "//eden/fs/store:context",
         "//eden/fs/store:store",
         "//eden/fs/telemetry:activity_buffer",
+        "//eden/fs/telemetry:error_logger",
         "//eden/scm/lib/backingstore:backingstore",  # @manual
         "//eden/scm/lib/backingstore:backingstore@header",  # @manual
         "//eden/scm/lib/backingstore:sapling_native_backingstore",

eden/fs/store/sl/SaplingBackingStore.cpp

@@ -118,13 +118,15 @@ SaplingBackingStore::SaplingBackingStore(
     std::shared_ptr<ReloadableConfig> config,
     std::unique_ptr<SaplingBackingStoreOptions> runtimeOptions,
     std::shared_ptr<EdenFsEventsLogger> edenFsEventsLogger,
+    ErrorLogger& errorLogger,
     std::unique_ptr<BackingStoreLogger> logger,
     FaultInjector* FOLLY_NONNULL faultInjector)
     : stats_(stats.copy()),
       config_(config),
       serverThreadPool_(serverThreadPool),
       queue_(std::move(config)),
       edenFsEventsLogger_{std::move(edenFsEventsLogger)},
+      errorLogger_(errorLogger),
       logger_(std::move(logger)),
       faultInjector_{*faultInjector},
       runtimeOptions_(computeRuntimeOptions(std::move(runtimeOptions))),
@@ -187,13 +189,15 @@ SaplingBackingStore::SaplingBackingStore(
     std::shared_ptr<ReloadableConfig> config,
     std::unique_ptr<SaplingBackingStoreOptions> runtimeOptions,
     std::shared_ptr<EdenFsEventsLogger> edenFsEventsLogger,
+    ErrorLogger& errorLogger,
     std::unique_ptr<BackingStoreLogger> logger,
     FaultInjector* FOLLY_NONNULL faultInjector)
     : stats_(std::move(stats)),
       config_(config),
       serverThreadPool_(executor),
       queue_(std::move(config)),
       edenFsEventsLogger_{std::move(edenFsEventsLogger)},
+      errorLogger_(errorLogger),
       logger_(std::move(logger)),
       faultInjector_{*faultInjector},
       runtimeOptions_(std::move(runtimeOptions)),

eden/fs/store/sl/SaplingBackingStore.h

@@ -66,6 +66,7 @@ class BackingStoreLogger;
 class ReloadableConfig;
 class UnboundedQueueExecutor;
 class EdenStats;
+class ErrorLogger;
 class SaplingImportRequest;
 class EdenFsEventsLogger;
 class FaultInjector;
@@ -185,6 +186,7 @@ class SaplingBackingStore final
       std::shared_ptr<ReloadableConfig> config,
       std::unique_ptr<SaplingBackingStoreOptions> runtimeOptions,
       std::shared_ptr<EdenFsEventsLogger> edenFsEventsLogger,
+      ErrorLogger& errorLogger,
       std::unique_ptr<BackingStoreLogger> logger,
       FaultInjector* FOLLY_NONNULL faultInjector);
 
@@ -203,6 +205,7 @@ class SaplingBackingStore final
       std::shared_ptr<ReloadableConfig> config,
       std::unique_ptr<SaplingBackingStoreOptions> runtimeOptions,
       std::shared_ptr<EdenFsEventsLogger> edenFsEventsLogger,
+      ErrorLogger& errorLogger,
       std::unique_ptr<BackingStoreLogger> logger,
       FaultInjector* FOLLY_NONNULL faultInjector);
 
@@ -775,6 +778,7 @@ class SaplingBackingStore final
   std::vector<std::thread> threads_;
 
   std::shared_ptr<EdenFsEventsLogger> edenFsEventsLogger_;
+  ErrorLogger& errorLogger_;
 
   /**
    * Logger for backing store imports

eden/fs/store/sl/test/BUCK

@@ -41,6 +41,7 @@ cpp_unittest(
         "//eden/fs/store/sl:sapling_import_request",
         "//eden/fs/store/sl:sapling_import_request_queue",
         "//eden/fs/store/sl:sapling_object_id",
+        "//eden/fs/telemetry:error_logger",
         "//eden/fs/telemetry:stats",
         "//eden/fs/telemetry:structured_logger",
         "//eden/fs/testharness:hg_repo",

eden/fs/store/sl/test/SaplingBackingStoreTest.cpp

@@ -30,6 +30,7 @@
 #include "eden/fs/store/sl/SaplingBackingStoreOptions.h"
 #include "eden/fs/telemetry/EdenFsEventsLogger.h"
 #include "eden/fs/telemetry/EdenStats.h"
+#include "eden/fs/telemetry/ErrorLogger.h"
 #include "eden/fs/testharness/HgRepo.h"
 #include "eden/fs/testharness/TestConfigSource.h"
 #include "eden/scm/lib/backingstore/include/SaplingBackingStoreError.h"
@@ -94,6 +95,7 @@ struct SaplingBackingStoreTestBase : TestRepo, ::testing::Test {
 struct SaplingBackingStoreNoFaultInjectorTest : SaplingBackingStoreTestBase {
   FaultInjector faultInjector{/*enabled=*/false};
   folly::InlineExecutor executor = folly::InlineExecutor::instance();
+  ErrorLogger noopErrorLogger{nullptr, {}, nullptr};
 
   std::shared_ptr<SaplingBackingStore> queuedBackingStore =
       std::make_shared<SaplingBackingStore>(
@@ -105,6 +107,7 @@ struct SaplingBackingStoreNoFaultInjectorTest : SaplingBackingStoreTestBase {
           edenConfig,
           std::make_unique<SaplingBackingStoreOptions>(),
           makeTestEdenFsEventsLogger(edenConfig, stats),
+          /*errorLogger=*/noopErrorLogger,
           std::make_unique<BackingStoreLogger>(),
           &faultInjector);
 };
@@ -116,6 +119,7 @@ struct SaplingBackingStoreWithFaultInjectorTest : SaplingBackingStoreTestBase {
   // Use a real executor so coroutine tests don't trip the coro::Task
   // DCHECK on InlineExecutor (Task.h:470).
   folly::CPUThreadPoolExecutor executor{1};
+  ErrorLogger noopErrorLogger{nullptr, {}, nullptr};
 
   std::shared_ptr<SaplingBackingStore> queuedBackingStore =
       std::make_shared<SaplingBackingStore>(
@@ -127,6 +131,7 @@ struct SaplingBackingStoreWithFaultInjectorTest : SaplingBackingStoreTestBase {
           edenConfig,
           std::make_unique<SaplingBackingStoreOptions>(),
           makeTestEdenFsEventsLogger(edenConfig, stats),
+          /*errorLogger=*/noopErrorLogger,
           std::make_unique<BackingStoreLogger>(),
           &faultInjector);
 };
@@ -137,6 +142,7 @@ struct SaplingBackingStoreWithFaultInjectorIgnoreConfigTest
       std::make_shared<TestConfigSource>(ConfigSourceType::SystemConfig)};
   FaultInjector faultInjector{/*enabled=*/true};
   folly::InlineExecutor executor = folly::InlineExecutor::instance();
+  ErrorLogger noopErrorLogger{nullptr, {}, nullptr};
 
   std::shared_ptr<SaplingBackingStore> queuedBackingStore =
       std::make_shared<SaplingBackingStore>(
@@ -148,6 +154,7 @@ struct SaplingBackingStoreWithFaultInjectorIgnoreConfigTest
           edenConfig,
           std::make_unique<SaplingBackingStoreOptions>(),
           makeTestEdenFsEventsLogger(edenConfig, stats),
+          /*errorLogger=*/noopErrorLogger,
           std::make_unique<BackingStoreLogger>(),
           &faultInjector);
 };

eden/fs/store/test/BUCK

@@ -27,6 +27,7 @@ cpp_unittest(
         "//eden/fs/store/filter:hg_sparse_filter",
         "//eden/fs/store/sl:sapling_backing_store",
         "//eden/fs/store/sl:sapling_backing_store_options",
+        "//eden/fs/telemetry:error_logger",
         "//eden/fs/telemetry:stats",
         "//eden/fs/telemetry:structured_logger",
         "//eden/fs/testharness:fake_backing_store_and_tree_builder",

eden/fs/store/test/FilteredBackingStoreTest.cpp

@@ -33,6 +33,7 @@
 #include "eden/fs/store/sl/SaplingBackingStoreOptions.h"
 #include "eden/fs/telemetry/EdenFsEventsLogger.h"
 #include "eden/fs/telemetry/EdenStats.h"
+#include "eden/fs/telemetry/ErrorLogger.h"
 #include "eden/fs/testharness/FakeFilter.h"
 #include "eden/fs/testharness/HgRepo.h"
 #include "eden/fs/testharness/TestUtil.h"
@@ -154,6 +155,8 @@ struct SaplingFilteredBackingStoreTest : FilteredBackingStoreTestBase {
 
   folly::InlineExecutor executor_ = folly::InlineExecutor::instance();
 
+  ErrorLogger noopErrorLogger{nullptr, {}, nullptr};
+
   std::shared_ptr<SaplingBackingStore> wrappedStore_{
       std::make_shared<SaplingBackingStore>(
           repo.path(),
@@ -168,6 +171,7 @@ struct SaplingFilteredBackingStoreTest : FilteredBackingStoreTestBase {
               /*xplatLogger=*/nullptr,
               edenConfig,
               stats.copy()),
+          /*errorLogger=*/noopErrorLogger,
           std::make_unique<BackingStoreLogger>(),
           &faultInjector)};
 };