From ddc1a716d4340ebb5d92a2209f969acd8f897c52 Mon Sep 17 00:00:00 2001
From: Jakob Blomer <jblomer@cern.ch>
Date: Fri, 4 Sep 2026 22:31:57 +0200
Subject: [PATCH] [ntuple] fix clang-tidy detected defects

---
 tree/ntuple/src/RNTupleMetrics.cxx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tree/ntuple/src/RNTupleMetrics.cxx b/tree/ntuple/src/RNTupleMetrics.cxx
index 29025159176e8..8052885f8a560 100644
--- a/tree/ntuple/src/RNTupleMetrics.cxx
+++ b/tree/ntuple/src/RNTupleMetrics.cxx
@@ -14,6 +14,7 @@
 
 #include <ROOT/RNTupleMetrics.hxx>
 
+#include <ROOT/RError.hxx>
 #include <ROOT/RField.hxx>
 #include <ROOT/RLogger.hxx>
 #include <ROOT/RNTupleModel.hxx>
@@ -138,7 +139,11 @@ ROOT::Experimental::Detail::RNTupleMetrics::~RNTupleMetrics()
    if (!fIsEnabled || fExportPath.empty())
       return;
 
-   ExportToRootFile();
+   try {
+      ExportToRootFile();
+   } catch (const RException &e) {
+      R__LOG_ERROR(ROOT::Internal::NTupleLog()) << "cannot export metrics: " << e.what();
+   }
 }
 
 void ROOT::Experimental::Detail::RNTupleMetrics::CollectCounters(
@@ -174,10 +179,12 @@ void ROOT::Experimental::Detail::RNTupleMetrics::ExportToRootFile()
 
    auto model = ROOT::RNTupleModel::Create();
    for (const auto &[fullyQualifiedName, counter] : counters) {
-      if (const auto *calc = dynamic_cast<const RNTupleCalcPerf *>(counter))
+      R__ASSERT(counter);
+      if (const auto *calc = dynamic_cast<const RNTupleCalcPerf *>(counter)) {
          *model->MakeField<double>(fullyQualifiedName) = calc->GetValue();
-      else
+      } else {
          *model->MakeField<std::int64_t>(fullyQualifiedName) = counter->GetValueAsInt();
+      }
    }
 
    TMemFile memoryFile(fNTupleName.c_str(), "RECREATE");