From ed67c2cf36a6dc531972e4e17ed51a6ca2abebbe Mon Sep 17 00:00:00 2001
From: Matthew Andrew <matthew.andrew@tessella.com>
Date: Thu, 7 Nov 2019 13:06:30 +0000
Subject: [PATCH] Added application to feature usage messages Re #26991
---
Framework/Kernel/inc/MantidKernel/UsageService.h | 4 +++-
Framework/Kernel/src/UsageService.cpp | 13 ++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Framework/Kernel/inc/MantidKernel/UsageService.h b/Framework/Kernel/inc/MantidKernel/UsageService.h
index 15feb908cf8..7094bb1dd4f 100644
--- a/Framework/Kernel/inc/MantidKernel/UsageService.h
+++ b/Framework/Kernel/inc/MantidKernel/UsageService.h
@@ -41,7 +41,8 @@ enum class FeatureType { Algorithm, Interface, Feature };
class FeatureUsage {
public:
/// Constructor
- FeatureUsage(const FeatureType &type, std::string name, const bool internal);
+ FeatureUsage(const FeatureType &type, std::string name, const bool internal,
+ std::string application);
bool operator<(const FeatureUsage &r) const;
::Json::Value asJson() const;
@@ -49,6 +50,7 @@ public:
FeatureType type;
std::string name;
bool internal;
+ std::string application;
protected:
std::string featureTypeToString() const;
diff --git a/Framework/Kernel/src/UsageService.cpp b/Framework/Kernel/src/UsageService.cpp
index f6e5638d7cd..81a8a3630ba 100644
--- a/Framework/Kernel/src/UsageService.cpp
+++ b/Framework/Kernel/src/UsageService.cpp
@@ -37,8 +37,9 @@ Kernel::Logger g_log("UsageServiceImpl");
/** FeatureUsage
*/
FeatureUsage::FeatureUsage(const FeatureType &type, std::string name,
- const bool internal)
- : type(type), name(std::move(name)), internal(internal) {}
+ const bool internal, std::string application)
+ : type(type), name(std::move(name)), internal(internal),
+ application(std::move(application)) {}
// Better brute force.
bool FeatureUsage::operator<(const FeatureUsage &r) const {
@@ -80,6 +81,7 @@ std::string FeatureUsage::featureTypeToString() const {
retVal["type"] = featureTypeToString();
retVal["name"] = name;
retVal["internal"] = internal;
+ retVal["application"] = application;
return retVal;
}
@@ -136,7 +138,8 @@ void UsageServiceImpl::registerFeatureUsage(
std::lock_guard<std::mutex> _lock(m_mutex);
using boost::algorithm::join;
- m_FeatureQueue.push(FeatureUsage(type, join(name, SEPARATOR), internal));
+ m_FeatureQueue.push(FeatureUsage(type, join(name, SEPARATOR), internal,
+ getApplicationName()));
}
}
@@ -145,8 +148,8 @@ void UsageServiceImpl::registerFeatureUsage(const FeatureType &type,
const bool internal) {
if (isEnabled()) {
std::lock_guard<std::mutex> _lock(m_mutex);
-
- m_FeatureQueue.push(FeatureUsage(type, name, internal));
+ m_FeatureQueue.push(
+ FeatureUsage(type, name, internal, getApplicationName()));
}
}
--
GitLab