Merge "system/common: Move remaining metrics to os/metrics.h" into main

5 files changed, 0 insertions, 220 deletions

diff --git a/system/common/Android.bp b/system/common/Android.bp
index c192613dbc..a22a733e75 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -32,17 +32,6 @@ cc_library_static {
         canonical_path_from_root: false,
         export_proto_headers: true,
     },
-    target: {
-        android: {
-            srcs: [
-                "metrics.cc",
-            ],
-            static_libs: ["libstatslog_bt"],
-        },
-        host: {
-            srcs: ["metrics_linux.cc"],
-        },
-    },
     shared_libs: [
         "libcrypto",
         "libcutils",
diff --git a/system/common/BUILD.gn b/system/common/BUILD.gn
index 50ec9c1dd0..5b0852bd36 100644
--- a/system/common/BUILD.gn
+++ b/system/common/BUILD.gn
@@ -19,8 +19,6 @@ static_library("common") {
     "address_obfuscator.cc",
     "le_conn_params.cc",
     "message_loop_thread.cc",
-    "metric_id_allocator.cc",
-    "metrics_linux.cc",
     "os_utils.cc",
     "repeating_timer.cc",
     "stop_watch_legacy.cc",
diff --git a/system/common/metrics.cc b/system/common/metrics.cc
deleted file mode 100644
index c6c0977115..0000000000
--- a/system/common/metrics.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- *
- *  Copyright 2016 Google, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at:
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-
-#include "common/metrics.h"
-
-#include <bluetooth/log.h>
-#include <frameworks/proto_logging/stats/enums/bluetooth/le/enums.pb.h>
-#include <statslog_bt.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "main/shim/metric_id_api.h"
-#include "types/raw_address.h"
-
-namespace bluetooth {
-namespace common {
-
-void LogRemoteVersionInfo(uint16_t handle, uint8_t status, uint8_t version,
-                          uint16_t manufacturer_name, uint16_t subversion) {
-  int ret = stats_write(BLUETOOTH_REMOTE_VERSION_INFO_REPORTED, handle, status, version,
-                        manufacturer_name, subversion);
-  if (ret < 0) {
-    log::warn(
-            "failed for handle {}, status 0x{:x}, version 0x{:x}, "
-            "manufacturer_name 0x{:x}, subversion 0x{:x}, error {}",
-            handle, status, version, manufacturer_name, subversion, ret);
-  }
-}
-
-void LogLeAudioConnectionSessionReported(
-        int32_t group_size, int32_t group_metric_id, int64_t connection_duration_nanos,
-        const std::vector<int64_t>& device_connecting_offset_nanos,
-        const std::vector<int64_t>& device_connected_offset_nanos,
-        const std::vector<int64_t>& device_connection_duration_nanos,
-        const std::vector<int32_t>& device_connection_status,
-        const std::vector<int32_t>& device_disconnection_status,
-        const std::vector<RawAddress>& device_address,
-        const std::vector<int64_t>& streaming_offset_nanos,
-        const std::vector<int64_t>& streaming_duration_nanos,
-        const std::vector<int32_t>& streaming_context_type) {
-  std::vector<int32_t> device_metric_id(device_address.size());
-  for (uint64_t i = 0; i < device_address.size(); i++) {
-    if (!device_address[i].IsEmpty()) {
-      device_metric_id[i] = bluetooth::shim::AllocateIdFromMetricIdAllocator(device_address[i]);
-    } else {
-      device_metric_id[i] = 0;
-    }
-  }
-  int ret = stats_write(LE_AUDIO_CONNECTION_SESSION_REPORTED, group_size, group_metric_id,
-                        connection_duration_nanos, device_connecting_offset_nanos,
-                        device_connected_offset_nanos, device_connection_duration_nanos,
-                        device_connection_status, device_disconnection_status, device_metric_id,
-                        streaming_offset_nanos, streaming_duration_nanos, streaming_context_type);
-  if (ret < 0) {
-    log::warn(
-            "failed for group {}device_connecting_offset_nanos[{}], "
-            "device_connected_offset_nanos[{}], "
-            "device_connection_duration_nanos[{}], device_connection_status[{}], "
-            "device_disconnection_status[{}], device_metric_id[{}], "
-            "streaming_offset_nanos[{}], streaming_duration_nanos[{}], "
-            "streaming_context_type[{}]",
-            group_metric_id, device_connecting_offset_nanos.size(),
-            device_connected_offset_nanos.size(), device_connection_duration_nanos.size(),
-            device_connection_status.size(), device_disconnection_status.size(),
-            device_metric_id.size(), streaming_offset_nanos.size(), streaming_duration_nanos.size(),
-            streaming_context_type.size());
-  }
-}
-
-void LogLeAudioBroadcastSessionReported(int64_t duration_nanos) {
-  int ret = stats_write(LE_AUDIO_BROADCAST_SESSION_REPORTED, duration_nanos);
-  if (ret < 0) {
-    log::warn("failed for duration={}", duration_nanos);
-  }
-}
-
-}  // namespace common
-}  // namespace bluetooth
diff --git a/system/common/metrics.h b/system/common/metrics.h
deleted file mode 100644
index 4d5a234ce5..0000000000
--- a/system/common/metrics.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- *
- *  Copyright 2016 Google, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at:
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-#include "types/raw_address.h"
-
-namespace bluetooth {
-namespace common {
-
-/**
- * Unknown connection handle for metrics purpose
- */
-static const uint32_t kUnknownConnectionHandle = 0xFFFF;
-
-/**
- * Logs when we receive Bluetooth Read Remote Version Information Complete
- * Event from the remote device, as documented by the Bluetooth Core HCI
- * specification
- *
- * Reference: 5.0 Core Specification, Vol 2, Part E, Page 1118
- *
- * @param handle handle of associated ACL connection
- * @param status HCI command status of this event
- * @param version version code from read remote version complete event
- * @param manufacturer_name manufacturer code from read remote version complete
- *                          event
- * @param subversion subversion code from read remote version complete event
- */
-void LogRemoteVersionInfo(uint16_t handle, uint8_t status, uint8_t version,
-                          uint16_t manufacturer_name, uint16_t subversion);
-
-void LogLeAudioConnectionSessionReported(
-        int32_t group_size, int32_t group_metric_id, int64_t connection_duration_nanos,
-        const std::vector<int64_t>& device_connecting_offset_nanos,
-        const std::vector<int64_t>& device_connected_offset_nanos,
-        const std::vector<int64_t>& device_connection_duration_nanos,
-        const std::vector<int32_t>& device_connection_status,
-        const std::vector<int32_t>& device_disconnection_status,
-        const std::vector<RawAddress>& device_address,
-        const std::vector<int64_t>& streaming_offset_nanos,
-        const std::vector<int64_t>& streaming_duration_nanos,
-        const std::vector<int32_t>& streaming_context_type);
-
-void LogLeAudioBroadcastSessionReported(int64_t duration_nanos);
-
-}  // namespace common
-}  // namespace bluetooth
diff --git a/system/common/metrics_linux.cc b/system/common/metrics_linux.cc
deleted file mode 100644
index e886c05bf3..0000000000
--- a/system/common/metrics_linux.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- *
- *  Copyright 2018 Google, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at:
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-
-#include <cstdint>
-#include <vector>
-
-#include "common/metrics.h"
-#include "types/raw_address.h"
-
-namespace bluetooth {
-namespace common {
-
-void LogRemoteVersionInfo(uint16_t /* handle */, uint8_t /* status */, uint8_t /* version */,
-                          uint16_t /* manufacturer_name */, uint16_t /* subversion */) {}
-
-void LogLeAudioConnectionSessionReported(
-        int32_t /* group_size */, int32_t /* group_metric_id */,
-        int64_t /* connection_duration_nanos */,
-        const std::vector<int64_t>& /* device_connecting_offset_nanos */,
-        const std::vector<int64_t>& /* device_connected_offset_nanos */,
-        const std::vector<int64_t>& /* device_connection_duration_nanos */,
-        const std::vector<int32_t>& /* device_connection_status */,
-        const std::vector<int32_t>& /* device_disconnection_status */,
-        const std::vector<RawAddress>& /* device_address */,
-        const std::vector<int64_t>& /* streaming_offset_nanos */,
-        const std::vector<int64_t>& /* streaming_duration_nanos */,
-        const std::vector<int32_t>& /* streaming_context_type */) {}
-
-void LogLeAudioBroadcastSessionReported(int64_t /* duration_nanos */) {}
-
-}  // namespace common
-}  // namespace bluetooth