merge: bring the noopMeter() clang-tidy fixes forward from phase8-log-correlation

include/xrpl/telemetry/Telemetry.h

@@ -142,11 +142,9 @@ inline constexpr std::string_view kMeterVersion{"1.0.0"};
  * it: telemetry disabled, or an exporter that failed to build. Callers then
  * need no null check, because an instrument always comes back.
  *
- * Two details are easy to get wrong alone, which is why this is shared: the
- * provider must be reached through a base `MeterProvider` pointer, because
- * `NoopMeterProvider`'s override hides the base class's defaulted overload;
- * and the version must be @ref kMeterVersion, or the meter identity differs
- * from the one the histogram views select on.
+ * Shared so every caller passes the same version, @ref kMeterVersion. A
+ * different version gives a different meter identity from the one the
+ * histogram views select on.
  *
  * @param name Instrumentation scope name to report.
  * @return An inert meter. Never empty.

src/libxrpl/telemetry/Telemetry.cpp

@@ -729,9 +729,9 @@ noopMeter(std::string_view name)
 {
     // One provider for the process: it holds a single inert meter, so nothing
     // is gained by building another.
-    static auto const provider = opentelemetry::nostd::shared_ptr<metrics_api::MeterProvider>(
+    static auto const kProvider = opentelemetry::nostd::shared_ptr<metrics_api::MeterProvider>(
         new metrics_api::NoopMeterProvider());
-    return provider->GetMeter(std::string(name), std::string(kMeterVersion));
+    return kProvider->GetMeter(std::string(name), std::string(kMeterVersion));
 }
 
 opentelemetry::exporter::otlp::OtlpHttpExporterOptions

src/tests/libxrpl/beast/insight/StatsDCollector.cpp

@@ -1,7 +1,5 @@
 #include <xrpl/beast/insight/StatsDCollector.h>
 
-#include <xrpl/beast/insight/Counter.h>
-#include <xrpl/beast/insight/Gauge.h>
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/beast/utility/Journal.h>
 

src/tests/libxrpl/telemetry/SpanGuardScope.cpp

@@ -41,7 +41,6 @@
 #include <opentelemetry/exporters/memory/in_memory_span_exporter_factory.h>
 #include <opentelemetry/metrics/meter.h>
 #include <opentelemetry/metrics/meter_provider.h>
-#include <opentelemetry/metrics/noop.h>
 #include <opentelemetry/nostd/shared_ptr.h>
 #include <opentelemetry/nostd/variant.h>
 #include <opentelemetry/sdk/resource/resource.h>