diff --git a/OpenTelemetryPlan/Phase7_taskList.md b/OpenTelemetryPlan/Phase7_taskList.md index 28463dad38..cdcb58b330 100644 --- a/OpenTelemetryPlan/Phase7_taskList.md +++ b/OpenTelemetryPlan/Phase7_taskList.md @@ -94,7 +94,7 @@ auto const endpoint = get(telemetryParams, "endpoint", "http://localhost:4318/v1/metrics"); std::string const& prefix(get(params, "prefix")); - m_collector = beast::insight::OTelCollector::New( + collector_ = beast::insight::OTelCollector::New( endpoint, prefix, journal); } ``` diff --git a/src/libxrpl/beast/insight/OTelCollector.cpp b/src/libxrpl/beast/insight/OTelCollector.cpp index 0638ce7fb9..555c9ed207 100644 --- a/src/libxrpl/beast/insight/OTelCollector.cpp +++ b/src/libxrpl/beast/insight/OTelCollector.cpp @@ -268,7 +268,7 @@ private: opentelemetry::nostd::shared_ptr m_gauge; /** Owning collector, used to invoke hooks before reading gauge values. */ - std::shared_ptr m_collector; + std::shared_ptr collector_; }; //------------------------------------------------------------------------------ @@ -578,9 +578,9 @@ OTelGaugeImpl::OTelGaugeImpl( std::string const& name, opentelemetry::nostd::shared_ptr const& meter, std::shared_ptr const& collector) - : m_gauge(meter->CreateInt64ObservableGauge(name)), m_collector(collector) + : m_gauge(meter->CreateInt64ObservableGauge(name)), collector_(collector) { - m_collector->addGauge(this); + collector_->addGauge(this); m_gauge->AddCallback(gaugeCallback, this); } @@ -588,7 +588,7 @@ void OTelGaugeImpl::gaugeCallback(opentelemetry::metrics::ObserverResult result, void* state) { auto* self = static_cast(state); - self->m_collector->callHooks(); + self->collector_->callHooks(); if (auto intResult = opentelemetry::nostd::get_if< opentelemetry::nostd::shared_ptr>>( &result)) @@ -600,7 +600,7 @@ OTelGaugeImpl::gaugeCallback(opentelemetry::metrics::ObserverResult result, void OTelGaugeImpl::~OTelGaugeImpl() { m_gauge->RemoveCallback(gaugeCallback, this); - m_collector->removeGauge(this); + collector_->removeGauge(this); } void diff --git a/src/xrpld/app/main/CollectorManager.cpp b/src/xrpld/app/main/CollectorManager.cpp index 3d1ea58f76..3773da1dd1 100644 --- a/src/xrpld/app/main/CollectorManager.cpp +++ b/src/xrpld/app/main/CollectorManager.cpp @@ -51,7 +51,7 @@ public: // metric sources via the exported_instance Prometheus label. std::string const instanceId = get(params, "service_instance_id"); - m_collector = beast::insight::OTelCollector::New(endpoint, prefix, instanceId, journal); + collector_ = beast::insight::OTelCollector::New(endpoint, prefix, instanceId, journal); } // LCOV_EXCL_STOP else