Remove all legacy proton metrics (that were deprecated on Vespa 6).

1 files changed, 0 insertions, 84 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
index 71baabd9d6f..88220f7aaf0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
@@ -77,11 +77,6 @@ updateIndexMetrics(DocumentDBMetricsCollection &metrics, const search::Searchabl
     updateDiskUsageMetric(indexMetrics.diskUsage, stats.sizeOnDisk(), totalStats);
     updateMemoryUsageMetrics(indexMetrics.memoryUsage, stats.memoryUsage(), totalStats);
     indexMetrics.docsInMemory.set(stats.docsInMemory());
-
-    LegacyDocumentDBMetrics::IndexMetrics &legacyIndexMetrics = metrics.getLegacyMetrics().index;
-    legacyIndexMetrics.memoryUsage.set(stats.memoryUsage().allocatedBytes());
-    legacyIndexMetrics.docsInMemory.set(stats.docsInMemory());
-    legacyIndexMetrics.diskUsage.set(stats.sizeOnDisk());
 }
 
 struct TempAttributeMetric
@@ -153,22 +148,6 @@ fillTempAttributeMetrics(TempAttributeMetrics &totalMetrics,
 }
 
 void
-updateLegacyAttributeMetrics(LegacyAttributeMetrics &metrics, const TempAttributeMetrics &tmpMetrics)
-{
-    for (const auto &attr : tmpMetrics.attrs) {
-        LegacyAttributeMetrics::List::Entry *entry = metrics.list.get(attr.first);
-        if (entry) {
-            entry->memoryUsage.set(attr.second.memoryUsage.allocatedBytes());
-            entry->bitVectors.set(attr.second.bitVectors);
-        } else {
-            LOG(debug, "Could not update metrics for attribute: '%s'", attr.first.c_str());
-        }
-    }
-    metrics.memoryUsage.set(tmpMetrics.total.memoryUsage.allocatedBytes());
-    metrics.bitVectors.set(tmpMetrics.total.bitVectors);
-}
-
-void
 updateAttributeMetrics(AttributeMetrics &metrics, const TempAttributeMetrics &tmpMetrics)
 {
     for (const auto &attr : tmpMetrics.attrs) {
@@ -187,38 +166,22 @@ updateAttributeMetrics(DocumentDBMetricsCollection &metrics, const DocumentSubDB
     TempAttributeMetrics notReadyMetrics;
     fillTempAttributeMetrics(totalMetrics, readyMetrics, notReadyMetrics, subDbs);
 
-    updateLegacyAttributeMetrics(metrics.getLegacyMetrics().attributes, totalMetrics);
-    updateLegacyAttributeMetrics(metrics.getLegacyMetrics().ready.attributes, readyMetrics);
-    updateLegacyAttributeMetrics(metrics.getLegacyMetrics().notReady.attributes, notReadyMetrics);
-
     updateAttributeMetrics(metrics.getTaggedMetrics().ready.attributes, readyMetrics);
     updateAttributeMetrics(metrics.getTaggedMetrics().notReady.attributes, notReadyMetrics);
     updateMemoryUsageMetrics(metrics.getTaggedMetrics().attribute.totalMemoryUsage, totalMetrics.total.memoryUsage, totalStats);
 }
 
 void
-updateLegacyRankProfileMetrics(LegacyDocumentDBMetrics::MatchingMetrics &matchingMetrics,
-                               const vespalib::string &rankProfileName,
-                               const MatchingStats &stats)
-{
-    auto itr = matchingMetrics.rank_profiles.find(rankProfileName);
-    assert(itr != matchingMetrics.rank_profiles.end());
-    itr->second->update(stats);
-}
-
-void
 updateMatchingMetrics(DocumentDBMetricsCollection &metrics, const IDocumentSubDB &ready)
 {
     MatchingStats totalStats;
     for (const auto &rankProfile : metrics.getTaggedMetrics().matching.rank_profiles) {
         MatchingStats matchingStats = ready.getMatcherStats(rankProfile.first);
         rankProfile.second->update(matchingStats);
-        updateLegacyRankProfileMetrics(metrics.getLegacyMetrics().matching, rankProfile.first, matchingStats);
 
         totalStats.add(matchingStats);
     }
     metrics.getTaggedMetrics().matching.update(totalStats);
-    metrics.getLegacyMetrics().matching.update(totalStats);
 }
 
 void
@@ -229,7 +192,6 @@ updateSessionCacheMetrics(DocumentDBMetricsCollection &metrics, proton::matching
 
     auto groupingStats = sessionManager.getGroupingStats();
     metrics.getTaggedMetrics().sessionCache.grouping.update(groupingStats);
-    metrics.getLegacyMetrics().sessionManager.update(groupingStats);
 }
 
 void
@@ -246,13 +208,6 @@ updateDocumentsMetrics(DocumentDBMetricsCollection &metrics, const DocumentSubDB
     docsMetrics.ready.set(ready);
     docsMetrics.total.set(total);
     docsMetrics.removed.set(removed);
-
-    auto &legacyMetrics = metrics.getLegacyMetrics();
-    legacyMetrics.numDocs.set(ready);
-    legacyMetrics.numActiveDocs.set(active);
-    legacyMetrics.numIndexedDocs.set(ready);
-    legacyMetrics.numStoredDocs.set(total);
-    legacyMetrics.numRemovedDocs.set(removed);
 }
 
 void
@@ -283,28 +238,6 @@ updateCountMetric(uint64_t currVal, uint64_t lastVal, metrics::LongCountMetric &
 }
 
 void
-updateLegacyDocstoreMetrics(LegacyDocumentDBMetrics::DocstoreMetrics &metrics,
-                            const DocumentSubDBCollection &sub_dbs,
-                            CacheStats &lastCacheStats)
-{
-    size_t memoryUsage = 0;
-    CacheStats cache_stats;
-    for (const auto subDb : sub_dbs) {
-        const ISummaryManager::SP &summaryMgr = subDb->getSummaryManager();
-        if (summaryMgr) {
-            cache_stats += summaryMgr->getBackingStore().getCacheStats();
-            memoryUsage += summaryMgr->getBackingStore().memoryUsed();
-        }
-    }
-    metrics.memoryUsage.set(memoryUsage);
-    updateCountMetric(cache_stats.lookups(), lastCacheStats.lookups(), metrics.cacheLookups);
-    updateDocumentStoreCacheHitRate(cache_stats, lastCacheStats, metrics.cacheHitRate);
-    metrics.cacheElements.set(cache_stats.elements);
-    metrics.cacheMemoryUsed.set(cache_stats.memory_used);
-    lastCacheStats = cache_stats;
-}
-
-void
 updateDocumentStoreMetrics(DocumentDBTaggedMetrics::SubDBMetrics::DocumentStoreMetrics &metrics,
                            const IDocumentSubDB *subDb,
                            CacheStats &lastCacheStats,
@@ -357,7 +290,6 @@ DocumentDBMetricsUpdater::updateMetrics(DocumentDBMetricsCollection &metrics)
 {
     TotalStats totalStats;
     ExecutorThreadingServiceStats threadingServiceStats = _writeService.getStats();
-    updateLegacyMetrics(metrics.getLegacyMetrics(), threadingServiceStats);
     updateIndexMetrics(metrics, _subDBs.getReadySubDB()->getSearchableStats(), totalStats);
     updateAttributeMetrics(metrics, _subDBs, totalStats);
     updateMatchingMetrics(metrics, *_subDBs.getReadySubDB());
@@ -371,22 +303,6 @@ DocumentDBMetricsUpdater::updateMetrics(DocumentDBMetricsCollection &metrics)
 }
 
 void
-DocumentDBMetricsUpdater::updateLegacyMetrics(LegacyDocumentDBMetrics &metrics, const ExecutorThreadingServiceStats &threadingServiceStats)
-{
-    metrics.executor.update(threadingServiceStats.getMasterExecutorStats());
-    metrics.summaryExecutor.update(threadingServiceStats.getSummaryExecutorStats());
-    metrics.indexExecutor.update(threadingServiceStats.getIndexExecutorStats());
-    updateLegacyDocstoreMetrics(metrics.docstore, _subDBs, _lastDocStoreCacheStats.total);
-
-    DocumentMetaStoreReadGuards dmss(_subDBs);
-    updateLidSpaceMetrics(metrics.ready.docMetaStore, dmss.readydms->get());
-    updateLidSpaceMetrics(metrics.notReady.docMetaStore, dmss.notreadydms->get());
-    updateLidSpaceMetrics(metrics.removed.docMetaStore, dmss.remdms->get());
-
-    metrics.numBadConfigs.set(_state.getDelayedConfig() ? 1u : 0u);
-}
-
-void
 DocumentDBMetricsUpdater::updateAttributeResourceUsageMetrics(DocumentDBTaggedMetrics::AttributeMetrics &metrics)
 {
     AttributeUsageStats attributeUsageStats = _writeFilter.getAttributeUsageStats();