Merge pull request #6633 from vespa-engine/balder/remove-some-event-logging

Balder/remove some event logging

23 files changed, 11 insertions, 345 deletions

diff --git a/configd/src/apps/sentinel/metrics.cpp b/configd/src/apps/sentinel/metrics.cpp
index df1b0076001..812ab56cd15 100644
--- a/configd/src/apps/sentinel/metrics.cpp
+++ b/configd/src/apps/sentinel/metrics.cpp
@@ -1,13 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "metrics.h"
-#include <vespa/log/log.h>
-LOG_SETUP(".metrics");
-
 #include <vespa/vespalib/metrics/simple_metrics.h>
 
-namespace config {
-namespace sentinel {
+namespace config::sentinel {
 
 using vespalib::metrics::SimpleMetricsManager;
 using vespalib::metrics::SimpleManagerConfig;
@@ -17,9 +13,7 @@ StartMetrics::StartMetrics()
       producer(metrics),
       currentlyRunningServices(0),
       totalRestartsCounter(0),
-      totalRestartsLastPeriod(1),
       startedTime(time(nullptr)),
-      lastLoggedTime(startedTime - 55),
       sentinel_restarts(metrics->counter("sentinel.restarts",
               "how many times sentinel restarted a service")),
       sentinel_totalRestarts(metrics->gauge("sentinel.totalRestarts",
@@ -33,20 +27,7 @@ StartMetrics::StartMetrics()
     sentinel_restarts.add();
 }
 
-void
-StartMetrics::output()
-{
-    EV_VALUE("currently_running_services", currentlyRunningServices);
-    EV_VALUE("total_restarts_last_period", totalRestartsLastPeriod);
-    EV_COUNT("total_restarts_counter", totalRestartsCounter);
-}
-
-void
-StartMetrics::reset(unsigned long curTime)
-{
-    totalRestartsLastPeriod = 0;
-    lastLoggedTime = curTime;
-}
+StartMetrics::~StartMetrics() = default;
 
 void
 StartMetrics::maybeLog()
@@ -55,11 +36,6 @@ StartMetrics::maybeLog()
     sentinel_totalRestarts.sample(totalRestartsCounter);
     sentinel_running.sample(currentlyRunningServices);
     sentinel_uptime.sample(curTime - startedTime);
-    if (curTime > lastLoggedTime + 59) {
-        output();
-        reset(curTime);
-    }
 }
 
-} // end namespace config::sentinel
-} // end namespace config
+}
diff --git a/configd/src/apps/sentinel/metrics.h b/configd/src/apps/sentinel/metrics.h
index 2378a055663..2263d70fb60 100644
--- a/configd/src/apps/sentinel/metrics.h
+++ b/configd/src/apps/sentinel/metrics.h
@@ -15,19 +15,15 @@ struct StartMetrics {
     vespalib::metrics::Producer producer;
     unsigned long currentlyRunningServices;
     unsigned long totalRestartsCounter;
-    unsigned long totalRestartsLastPeriod;
     long startedTime;
-    long lastLoggedTime;
     Counter sentinel_restarts;
     Gauge   sentinel_totalRestarts;
     Gauge   sentinel_running;
     Gauge   sentinel_uptime;
 
     StartMetrics();
-    ~StartMetrics() {}
+    ~StartMetrics();
 
-    void output();
-    void reset(unsigned long curTime);
     void maybeLog();
 };
 
diff --git a/configd/src/apps/sentinel/service.cpp b/configd/src/apps/sentinel/service.cpp
index e38328975dc..866171bf75f 100644
--- a/configd/src/apps/sentinel/service.cpp
+++ b/configd/src/apps/sentinel/service.cpp
@@ -336,7 +336,6 @@ Service::youExited(int status)
         LOG(debug, "%s: Has autorestart flag, restarting.", name().c_str());
         setState(READY);
         _metrics.totalRestartsCounter++;
-        _metrics.totalRestartsLastPeriod++;
         _metrics.sentinel_restarts.add();
         start();
     }
diff --git a/searchcore/src/apps/fdispatch/fdispatch.cpp b/searchcore/src/apps/fdispatch/fdispatch.cpp
index 97cfdcb408c..cd3ef3b7550 100644
--- a/searchcore/src/apps/fdispatch/fdispatch.cpp
+++ b/searchcore/src/apps/fdispatch/fdispatch.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/searchcore/fdispatch/program/fdispatch.h>
-#include <vespa/searchcore/fdispatch/common/perftask.h>
 #include <vespa/vespalib/net/state_server.h>
 #include <vespa/vespalib/net/simple_health_producer.h>
 #include <vespa/vespalib/net/simple_metrics_producer.h>
@@ -96,7 +95,6 @@ FastS_FDispatchApp::Main()
             vespalib::SimpleHealthProducer health;
             vespalib::SimpleMetricsProducer metrics;
             vespalib::StateServer stateServer(myfdispatch->getHealthPort(), health, metrics, myfdispatch->getComponentConfig());
-            FastS_PerfTask perfTask(*myfdispatch, 300.0);
             while (!CheckShutdownFlags()) {
                 if (myfdispatch->Failed()) {
                     throw std::runtime_error("myfdispatch->Failed()");
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/fdispatch/common/CMakeLists.txt
index 7a91efcd2ec..45261162e93 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/CMakeLists.txt
@@ -2,8 +2,6 @@
 vespa_add_library(searchcore_fdcommon STATIC
     SOURCES
     appcontext.cpp
-    perftask.cpp
-    queryperf.cpp
     rpc.cpp
     search.cpp
     timestat.cpp
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
index 248babad316..78efc1f7429 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
@@ -28,53 +28,38 @@ FastS_AppContext::FastS_AppContext()
     _createTime = _timeKeeper.GetTime();
 }
 
-
-FastS_AppContext::~FastS_AppContext()
-{
-}
-
+FastS_AppContext::~FastS_AppContext() = default;
 
 FNET_Transport *
 FastS_AppContext::GetFNETTransport()
 {
-    return NULL;
+    return nullptr;
 }
 
-
 FNET_Scheduler *
 FastS_AppContext::GetFNETScheduler()
 {
-    return NULL;
+    return nullptr;
 }
 
-
 FastS_NodeManager *
 FastS_AppContext::GetNodeManager()
 {
-    return NULL;
+    return nullptr;
 }
 
-
 FastS_DataSetCollection *
 FastS_AppContext::GetDataSetCollection()
 {
-    return NULL;
+    return nullptr;
 }
 
-
 FastOS_ThreadPool *
 FastS_AppContext::GetThreadPool()
 {
-    return NULL;
-}
-
-
-void
-FastS_AppContext::logPerformance()
-{
+    return nullptr;
 }
 
-
 uint32_t
 FastS_AppContext::getDispatchLevel()
 {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
index 7a5652577a0..fce468b4532 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
@@ -41,7 +41,6 @@ public:
     virtual FNET_Scheduler *GetFNETScheduler();
     virtual FastS_DataSetCollection *GetDataSetCollection();
     virtual FastOS_ThreadPool *GetThreadPool();
-    virtual void logPerformance();
     virtual uint32_t getDispatchLevel();
 private:
 };
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/perftask.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/perftask.cpp
deleted file mode 100644
index 17113285fab..00000000000
--- a/searchcore/src/vespa/searchcore/fdispatch/common/perftask.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "perftask.h"
-#include "appcontext.h"
-
-#include <vespa/log/log.h>
-LOG_SETUP(".perftask");
-
-FastS_PerfTask::FastS_PerfTask(FastS_AppContext &ctx, double delay)
-    : FNET_Task(ctx.GetFNETScheduler()),
-      _ctx(ctx),
-      _delay(delay),
-      _valid(ctx.GetFNETScheduler() != NULL)
-{
-    if (_valid) {
-        ScheduleNow();
-    } else {
-        LOG(warning, "Performance monitoring disabled; "
-            "no scheduler found in application context");
-    }
-}
-
-
-FastS_PerfTask::~FastS_PerfTask()
-{
-    if (_valid) {
-        Kill();
-    }
-}
-
-
-void
-FastS_PerfTask::PerformTask()
-{
-    Schedule(_delay);
-    _ctx.logPerformance();
-}
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/perftask.h b/searchcore/src/vespa/searchcore/fdispatch/common/perftask.h
deleted file mode 100644
index 09c3b9840ab..00000000000
--- a/searchcore/src/vespa/searchcore/fdispatch/common/perftask.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include <vespa/fnet/task.h>
-
-class FastS_AppContext;
-
-class FastS_PerfTask : public FNET_Task
-{
-private:
-    FastS_AppContext &_ctx;
-    double            _delay;
-    bool              _valid;
-
-    FastS_PerfTask(const FastS_PerfTask &);
-    FastS_PerfTask &operator=(const FastS_PerfTask &);
-
-public:
-    FastS_PerfTask(FastS_AppContext &ctx, double delay);
-    ~FastS_PerfTask();
-    void PerformTask() override;
-    bool isValid() const { return _valid; }
-};
-
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.cpp
deleted file mode 100644
index a0cc89d15c6..00000000000
--- a/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "queryperf.h"
-
-#include <vespa/log/log.h>
-LOG_SETUP(".queryperf");
-
-namespace {
-
-struct MyLogTask : vespalib::Executor::Task {
-    uint32_t queueLen;
-    uint32_t activeCnt;
-    uint32_t queryCnt;
-    uint32_t dropCnt;
-    uint32_t timeoutCnt;
-    double avgQueryTime;
-    MyLogTask(uint32_t queueLen_in,
-              uint32_t activeCnt_in,
-              uint32_t queryCnt_in,
-              uint32_t dropCnt_in,
-              uint32_t timeoutCnt_in,
-              double avgQueryTime_in)
-        : queueLen(queueLen_in),
-          activeCnt(activeCnt_in),
-          queryCnt(queryCnt_in),
-          dropCnt(dropCnt_in),
-          timeoutCnt(timeoutCnt_in),
-          avgQueryTime(avgQueryTime_in)
-    {
-    }
-    void run() override {
-        EV_VALUE("queued_queries",   queueLen);
-        EV_VALUE("active_queries",   activeCnt);
-        EV_COUNT("queries",          queryCnt);
-        EV_COUNT("dropped_queries",  dropCnt);
-        EV_COUNT("timedout_queries", timeoutCnt);
-        if (avgQueryTime > 0.0) {
-            EV_VALUE("query_eval_time_avg_s", avgQueryTime);
-        }
-    }
-};
-
-} // namespace <unnamed>
-
-FastS_QueryPerf::FastS_QueryPerf()
-    : queueLen(0),
-      activeCnt(0),
-      queryCnt(0),
-      queryTime(0),
-      dropCnt(0),
-      timeoutCnt(0),
-      _lastQueryCnt(0),
-      _lastQueryTime(0.0)
-{
-}
-
-void
-FastS_QueryPerf::reset()
-{
-    queueLen   = 0;
-    activeCnt  = 0;
-    queryCnt   = 0;
-    queryTime  = 0;
-    dropCnt    = 0;
-    timeoutCnt = 0;
-}
-
-vespalib::Executor::Task::UP
-FastS_QueryPerf::make_log_task()
-{
-    double avgQueryTime = 0.0;
-    if (queryCnt > _lastQueryCnt) {
-        avgQueryTime = (queryTime - _lastQueryTime)
-                       / ((double)(queryCnt - _lastQueryCnt));
-    }
-    _lastQueryCnt  = queryCnt;
-    _lastQueryTime = queryTime;
-    return std::make_unique<MyLogTask>(queueLen,
-                                       activeCnt,
-                                       queryCnt,
-                                       dropCnt,
-                                       timeoutCnt,
-                                       avgQueryTime);
-}
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.h b/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.h
deleted file mode 100644
index ee31a8e58b2..00000000000
--- a/searchcore/src/vespa/searchcore/fdispatch/common/queryperf.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include <cstdint>
-#include <vespa/vespalib/util/executor.h>
-
-struct FastS_QueryPerf
-{
-    uint32_t queueLen;
-    uint32_t activeCnt;
-    uint32_t queryCnt;
-    double   queryTime;
-    uint32_t dropCnt;
-    uint32_t timeoutCnt;
-
-    FastS_QueryPerf();
-
-    /**
-     * reset all values except the cached 'old' values. This will
-     * prepare the object for reuse logging wise.
-     **/
-    void reset();
-    vespalib::Executor::Task::UP make_log_task();
-
-private:
-    uint32_t _lastQueryCnt;
-    double   _lastQueryTime;
-};
-
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
index b68566c3c9b..93680a95d44 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
@@ -389,13 +389,6 @@ Fdispatch::Init()
     return true;
 }
 
-
-void
-Fdispatch::logPerformance()
-{
-    _nodeManager->logPerformance(_executor);
-}
-
 uint32_t
 Fdispatch::getDispatchLevel()
 {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
index 6cfb4bfb5a1..093308d68d2 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
@@ -96,7 +96,6 @@ public:
     virtual FastS_NodeManager *GetNodeManager() override;
     virtual FastS_DataSetCollection *GetDataSetCollection() override;
     virtual FastOS_ThreadPool *GetThreadPool() override;
-    virtual void logPerformance() override;
     virtual uint32_t getDispatchLevel() override;
     bool CheckTempFail();
     bool Failed();
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
index 1b96a48d35b..519960bfad0 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
@@ -248,14 +248,12 @@ FastS_DataSetBase::AbortQueryQueue_HasLock()
     }
 }
 
-
 void
 FastS_DataSetBase::AddCost()
 {
     _totalrefcost += _unitrefcost;
 }
 
-
 void
 FastS_DataSetBase::SubCost()
 {
@@ -263,10 +261,8 @@ FastS_DataSetBase::SubCost()
     _totalrefcost -= _unitrefcost;
 }
 
-
 void
-FastS_DataSetBase::UpdateSearchTime(double tnow,
-                                    double elapsed, bool timedout)
+FastS_DataSetBase::UpdateSearchTime(double tnow, double elapsed, bool timedout)
 {
     int slot;
     auto dsGuard(getDsGuard());
@@ -279,36 +275,18 @@ FastS_DataSetBase::UpdateSearchTime(double tnow,
     _total._normalTimeStat.Update(tnow, elapsed, timedout);
 }
 
-
 void
 FastS_DataSetBase::UpdateEstimateCount()
 {
     ++_total._estimates;
 }
 
-
 void
 FastS_DataSetBase::CountTimeout()
 {
     ++_total._nTimedOut;
 }
 
-
-void
-FastS_DataSetBase::addPerformance(FastS_QueryPerf &qp)
-{
-    FastS_TimeStatTotals totals;
-    auto dsGuard(getDsGuard());
-    _total._normalTimeStat.AddTotal(&totals);
-    qp.queueLen   += _queryQueue.GetQueueLen();
-    qp.activeCnt  += _queryQueue.GetActiveQueries();
-    qp.queryCnt   += totals._totalCount;
-    qp.queryTime  += totals._totalAccTime;
-    qp.dropCnt    += _total._nOverload;
-    qp.timeoutCnt += _total._nTimedOut;
-}
-
-
 ChildInfo
 FastS_DataSetBase::getChildInfo() const
 {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
index 042e18bf96f..f4f69285e89 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
@@ -20,7 +20,6 @@ class FastS_QueryResult;
 class FastS_PlainDataSet;
 class FastS_FNET_DataSet;
 class FastS_AppContext;
-class FastS_QueryPerf;
 class FNET_Task;
 
 //---------------------------------------------------------------------------
@@ -220,13 +219,9 @@ public:
                                         FastS_TimeKeeper *timeKeeper,
                                         bool async) = 0;
     virtual void Free() = 0;
-    virtual void addPerformance(FastS_QueryPerf &qp);
 
     // typesafe down-cast
     //-------------------
     virtual FastS_PlainDataSet     *GetPlainDataSet()     { return nullptr; }
     virtual FastS_FNET_DataSet     *GetFNETDataSet()      { return nullptr; }
 };
-
-//---------------------------------------------------------------------------
-
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp
index 879009c384f..f2af03d4c52 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp
@@ -88,7 +88,6 @@ FastS_NodeManager::FastS_NodeManager(vespalib::SimpleComponentConfigProducer &co
       _mldDocStamp(0),
       _mldDocStampMin(0),
       _gencnt(0),
-      _queryPerf(),
       _fetcher(),
       _configUri(config::ConfigUri::createEmpty()),
       _lastPartMap(NULL),
@@ -389,24 +388,6 @@ FastS_NodeManager::getChildInfo()
     return r;
 }
 
-
-void
-FastS_NodeManager::logPerformance(vespalib::Executor &executor)
-{
-    _queryPerf.reset();
-    FastS_DataSetCollection *dsc = GetDataSetCollection();
-
-    for (unsigned int i = 0; i < dsc->GetMaxNumDataSets(); i++) {
-        if (dsc->PeekDataSet(i) != NULL) {
-            dsc->PeekDataSet(i)->addPerformance(_queryPerf);
-        }
-    }
-
-    dsc->subRef();
-    executor.execute(_queryPerf.make_log_task());
-}
-
-
 void
 FastS_NodeManager::CheckEvents(FastS_TimeKeeper *timeKeeper)
 {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h
index 77d4482fba7..70dc80914f4 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h
@@ -5,7 +5,6 @@
 #include "child_info.h"
 #include "configdesc.h"
 #include <vespa/config/helper/configfetcher.h>
-#include <vespa/searchcore/fdispatch/common/queryperf.h>
 #include <vespa/vespalib/net/simple_component_config_producer.h>
 #include <vespa/config/subscription/configuri.h>
 #include <vespa/vespalib/util/executor.h>
@@ -34,7 +33,6 @@ private:
     uint32_t          _mldDocStampMin;  // Bumped for global cache flush
     uint32_t          _gencnt;
 
-    FastS_QueryPerf   _queryPerf;
 
 
     std::unique_ptr<config::ConfigFetcher> _fetcher;
@@ -89,12 +87,6 @@ public:
     ChildInfo getChildInfo();
     void ShutdownConfig();
 
-    /**
-     * log query performance. This method should only be invoked from
-     * the FNET thread.
-     **/
-    void logPerformance(vespalib::Executor &executor);
-
     void CheckEvents(FastS_TimeKeeper *timeKeeper); // invoked by FNET thread
 };
 
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index f9a82c8d20f..65bb682a389 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -165,7 +165,6 @@ void TransLogServer::run()
 {
     FRT_RPCRequest *req(NULL);
     bool hasPacket(false);
-    logMetric();
     do {
         for (req = NULL; (hasPacket = _reqQ.pop(req, 60000)) && (req != NULL); req = NULL) {
             bool immediate = true;
@@ -199,22 +198,10 @@ void TransLogServer::run()
                 req->Return();
             }
         }
-        logMetric();
     } while (running() && !(hasPacket && (req == NULL)));
     LOG(info, "TLS Stopped");
 }
 
-void TransLogServer::logMetric() const
-{
-    Guard domainGuard(_lock);
-    for (DomainList::const_iterator it(_domains.begin()), mt(_domains.end()); it != mt; it++) {
-        vespalib::string prefix("translogserver." + it->first + ".serialnum.");
-        EV_COUNT((prefix + "last").c_str(),  it->second->end());
-        EV_COUNT((prefix + "first").c_str(), it->second->begin());
-        EV_VALUE((prefix + "numused").c_str(), it->second->size());
-    }
-}
-
 DomainStats
 TransLogServer::getDomainStats() const
 {
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
index 9dcc17a4a1f..189be8c38d8 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
@@ -67,7 +67,6 @@ private:
     void finiSession(FRT_RPCRequest *req);
     void downSession(FRT_RPCRequest *req);
 
-    void logMetric() const;
     std::vector<vespalib::string> getDomainNames();
     Domain::SP findDomain(vespalib::stringref name);
     vespalib::string dir()        const { return _baseDir + "/" + _name; }
diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
index b47b3b59b4f..904e8a66c27 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
@@ -6,7 +6,6 @@
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/storage/common/content_bucket_space_repo.h>
 #include <vespa/storage/common/nodestateupdater.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index d1f0a24178a..bf0244255c1 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -11,7 +11,6 @@
 #include <vespa/storage/config/config-stor-server.h>
 #include <vespa/storage/persistence/bucketownershipnotifier.h>
 #include <vespa/storage/persistence/persistencethread.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/storageapi/message/batch.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/state.h>
diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
index 01a84177e43..650637f206d 100644
--- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
+++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
@@ -2,7 +2,6 @@
 
 #include "bucketintegritychecker.h"
 #include <vespa/storage/common/bucketmessages.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vdslib/distribution/distribution.h>
diff --git a/storage/src/vespa/storage/storageutil/log.h b/storage/src/vespa/storage/storageutil/log.h
deleted file mode 100644
index f7e89443b32..00000000000
--- a/storage/src/vespa/storage/storageutil/log.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-#include <vespa/log/log.h>
-
-#define STORAGE_LOG_INTERVAL 30
-
-#define STORAGE_LOG_COUNT(name, interval)   do { \
-                                static uint64_t C_count ## name = 0; \
-                                static time_t C_last ## name = time(NULL); \
-                                C_count ## name ++; \
-                                time_t C_now ## name = time(NULL); \
-                                if (C_now  ## name - C_last ## name >= interval)  { \
-                                    EV_COUNT(#name, C_count ## name); \
-                                    C_last ## name = C_now ## name;       \
-                                } } while (false)
-
-#define STORAGE_LOG_AVERAGE(name, value, interval) do {  \
-                                static uint64_t A_count ## name = 0; \
-                                static float A_total ## name = 0.0; \
-                                static time_t A_last ## name = time(NULL); \
-                                A_count ## name ++; \
-                                A_total ## name += value; \
-                                time_t A_now ## name = time(NULL); \
-                                if (A_now  ## name - A_last ## name >= interval)  { \
-                                    EV_VALUE(#name, A_total ## name / A_count ## name); \
-                                    A_count ## name = 0; \
-                                    A_total ## name = 0; \
-                                    A_last ## name = A_now ## name;       \
-                                }} while (false)
-