Merge "Revert "Make native metrics logger write to statsd socket""
diff --git a/libmetricslogger/Android.bp b/libmetricslogger/Android.bp
index 2d327ee..1551b5b 100644
--- a/libmetricslogger/Android.bp
+++ b/libmetricslogger/Android.bp
@@ -11,11 +11,7 @@
export_include_dirs: ["include"],
local_include_dirs: ["include"],
- shared_libs: [
- "libbase",
- "liblog",
- "libstatssocket",
- ],
+ shared_libs: ["liblog"],
whole_static_libs: ["libgtest_prod"],
cflags: [
@@ -27,20 +23,17 @@
// metricslogger shared library
// -----------------------------------------------------------------------------
-cc_library {
+cc_library_shared {
name: "libmetricslogger",
srcs: metricslogger_lib_src_files,
defaults: ["metricslogger_defaults"],
- export_shared_lib_headers: ["libstatssocket"],
}
// static version of libmetricslogger, needed by a few art static binaries
-// TODO(b/117829226): Remove once dependencies are cleaned up.
cc_library_static {
name: "libmetricslogger_static",
srcs: metricslogger_lib_src_files,
defaults: ["metricslogger_defaults"],
- export_shared_lib_headers: ["libstatssocket"],
}
// metricslogger shared library, debug
diff --git a/libmetricslogger/include/metricslogger/metrics_logger.h b/libmetricslogger/include/metricslogger/metrics_logger.h
index 56bd6c4..c305db2 100644
--- a/libmetricslogger/include/metricslogger/metrics_logger.h
+++ b/libmetricslogger/include/metricslogger/metrics_logger.h
@@ -15,7 +15,6 @@
*/
#include <log/log_event_list.h>
-#include <stats_event_list.h>
#include <cstdint>
#include <string>
@@ -44,7 +43,6 @@
class ComplexEventLogger {
private:
android_log_event_list logger;
- stats_event_list stats_logger;
public:
// Create a complex event with category|category|.
diff --git a/libmetricslogger/metrics_logger.cpp b/libmetricslogger/metrics_logger.cpp
index 2a1b137..6a32153 100644
--- a/libmetricslogger/metrics_logger.cpp
+++ b/libmetricslogger/metrics_logger.cpp
@@ -18,15 +18,11 @@
#include <cstdlib>
-#include <android-base/chrono_utils.h>
#include <log/event_tag_map.h>
-
-using namespace android;
+#include <log/log_event_list.h>
namespace {
-const static int kStatsEventTag = 1937006964;
-const static int kKeyValuePairAtomId = 83;
#ifdef __ANDROID__
EventTagMap* kEventTagMap = android_openEventTagMap(nullptr);
const int kSysuiMultiActionTag = android_lookupEventTagNum(
@@ -36,12 +32,6 @@
const int kSysuiMultiActionTag = 0;
#endif
-int64_t getElapsedTimeNanoSinceBoot() {
- return std::chrono::duration_cast<std::chrono::nanoseconds>(
- android::base::boot_clock::now().time_since_epoch())
- .count();
-}
-
} // namespace
namespace android {
@@ -52,12 +42,6 @@
android_log_event_list log(kSysuiMultiActionTag);
log << LOGBUILDER_CATEGORY << LOGBUILDER_HISTOGRAM << LOGBUILDER_NAME << event
<< LOGBUILDER_BUCKET << data << LOGBUILDER_VALUE << 1 << LOG_ID_EVENTS;
-
- stats_event_list stats_log(kStatsEventTag);
- stats_log << getElapsedTimeNanoSinceBoot() << kKeyValuePairAtomId << LOGBUILDER_CATEGORY
- << LOGBUILDER_HISTOGRAM << LOGBUILDER_NAME << event << LOGBUILDER_BUCKET << data
- << LOGBUILDER_VALUE << 1;
- stats_log.write(LOG_ID_STATS);
}
// Mirror com.android.internal.logging.MetricsLogger#count().
@@ -65,11 +49,6 @@
android_log_event_list log(kSysuiMultiActionTag);
log << LOGBUILDER_CATEGORY << LOGBUILDER_COUNTER << LOGBUILDER_NAME << name << LOGBUILDER_VALUE
<< val << LOG_ID_EVENTS;
-
- stats_event_list stats_log(kStatsEventTag);
- stats_log << getElapsedTimeNanoSinceBoot() << kKeyValuePairAtomId << LOGBUILDER_CATEGORY
- << LOGBUILDER_COUNTER << LOGBUILDER_NAME << name << LOGBUILDER_VALUE << val;
- stats_log.write(LOG_ID_STATS);
}
// Mirror com.android.internal.logging.MetricsLogger#action().
@@ -77,48 +56,34 @@
android_log_event_list log(kSysuiMultiActionTag);
log << LOGBUILDER_CATEGORY << category << LOGBUILDER_TYPE << TYPE_ACTION
<< field << value << LOG_ID_EVENTS;
-
- stats_event_list stats_log(kStatsEventTag);
- stats_log << getElapsedTimeNanoSinceBoot() << kKeyValuePairAtomId << LOGBUILDER_CATEGORY
- << category << LOGBUILDER_TYPE << TYPE_ACTION << field << value;
- stats_log.write(LOG_ID_STATS);
}
-ComplexEventLogger::ComplexEventLogger(int category)
- : logger(kSysuiMultiActionTag), stats_logger(kStatsEventTag) {
+ComplexEventLogger::ComplexEventLogger(int category) : logger(kSysuiMultiActionTag) {
logger << LOGBUILDER_CATEGORY << category;
- stats_logger << getElapsedTimeNanoSinceBoot() << kKeyValuePairAtomId << LOGBUILDER_CATEGORY
- << category;
}
void ComplexEventLogger::SetPackageName(const std::string& package_name) {
logger << LOGBUILDER_PACKAGENAME << package_name;
- stats_logger << LOGBUILDER_PACKAGENAME << package_name;
}
void ComplexEventLogger::AddTaggedData(int tag, int32_t value) {
logger << tag << value;
- stats_logger << tag << value;
}
void ComplexEventLogger::AddTaggedData(int tag, const std::string& value) {
logger << tag << value;
- stats_logger << tag << value;
}
void ComplexEventLogger::AddTaggedData(int tag, int64_t value) {
logger << tag << value;
- stats_logger << tag << value;
}
void ComplexEventLogger::AddTaggedData(int tag, float value) {
logger << tag << value;
- stats_logger << tag << value;
}
void ComplexEventLogger::Record() {
logger << LOG_ID_EVENTS;
- stats_logger.write(LOG_ID_STATS);
}
} // namespace metricslogger
diff --git a/libstats/Android.bp b/libstats/Android.bp
index f5ee1da..d58f294 100644
--- a/libstats/Android.bp
+++ b/libstats/Android.bp
@@ -17,13 +17,12 @@
// ==========================================================
// Native library to write stats log to statsd socket
// ==========================================================
-cc_library {
+cc_library_static {
name: "libstatssocket",
srcs: [
"stats_event_list.c",
"statsd_writer.c",
],
- host_supported: true,
cflags: [
"-Wall",
"-Werror",
@@ -33,7 +32,6 @@
],
export_include_dirs: ["include"],
shared_libs: [
- "libcutils",
"liblog",
],
}
diff --git a/libstats/statsd_writer.c b/libstats/statsd_writer.c
index e24dff0..afe401f 100644
--- a/libstats/statsd_writer.c
+++ b/libstats/statsd_writer.c
@@ -15,9 +15,7 @@
*/
#include "statsd_writer.h"
-#include <cutils/fs.h>
#include <cutils/sockets.h>
-#include <cutils/threads.h>
#include <endian.h>
#include <errno.h>
#include <fcntl.h>
