Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metrics Field Alignment #711

Merged
merged 5 commits into from
Jan 27, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions core/main/src/state/metrics_state.rs
Original file line number Diff line number Diff line change
@@ -26,10 +26,7 @@ use ripple_sdk::{
context::RippleContextUpdateRequest,
device::device_info_request::{DeviceInfoRequest, DeviceResponse, FirmwareInfo},
distributor::distributor_privacy::{DataEventType, PrivacySettingsData},
firebolt::{
fb_metrics::{MetricsContext, MetricsEnvironment},
fb_openrpc::FireboltSemanticVersion,
},
firebolt::{fb_metrics::MetricsContext, fb_openrpc::FireboltSemanticVersion},
gateway::rpc_gateway_api::rpc_value_result_to_string_result,
manifest::device_manifest::DataGovernanceConfig,
observability::metrics_util::ApiStats,
@@ -286,6 +283,21 @@ impl MetricsState {
};

debug!("got os_info={:?}", &os_info);

let os_ver =
BrokerUtils::process_internal_main_request(state, "ripple.device_os_version", None)
.await
.and_then(|val| {
from_value::<String>(val).map_err(|_| {
jsonrpsee::core::Error::Call(CallError::Custom {
code: -32100,
message: "Failed to parse ripple.device_os_version".into(),
data: None,
})
})
})
.unwrap_or_default();

let device_name = rpc_value_result_to_string_result(
BrokerUtils::process_internal_main_request(state, "device.name", None).await,
Some(Self::unset("device.name")),
@@ -306,25 +318,15 @@ impl MetricsState {
*/

let mut firmware = String::default();
let mut env = None;

match state
if let Ok(resp) = state
.get_client()
.send_extn_request(DeviceInfoRequest::PlatformBuildInfo)
.send_extn_request(DeviceInfoRequest::FirmwareInfo)
.await
{
Ok(resp) => {
if let Some(DeviceResponse::PlatformBuildInfo(info)) = resp.payload.extract() {
firmware = info.name;
env = if info.debug {
Some(MetricsEnvironment::Dev.to_string())
} else {
Some(MetricsEnvironment::Prod.to_string())
};
}
if let Some(DeviceResponse::FirmwareInfo(info)) = resp.payload.extract() {
firmware = info.name;
}
Err(_) => env = None,
};
}

let activated = Some(true);
let proposition =
@@ -415,7 +417,7 @@ impl MetricsState {

context.device_language = language;
context.os_name = os_info.name;
context.os_ver = os_info.version.readable;
context.os_ver = os_ver;
context.device_name = Some(device_name);
context.device_session_id = state.device_session_id.clone().into();
context.firmware = firmware;
@@ -429,7 +431,6 @@ impl MetricsState {
context.device_timezone = t;
}*/

context.env = env;
context.activated = activated;
context.proposition = proposition;
context.retailer = retailer;
3 changes: 0 additions & 3 deletions core/sdk/src/api/firebolt/fb_metrics.rs
Original file line number Diff line number Diff line change
@@ -740,7 +740,6 @@ pub struct MetricsContext {
pub serial_number: String,
pub firmware: String,
pub ripple_version: String,
pub env: Option<String>,
pub data_governance_tags: Option<Vec<String>>,
pub activated: Option<bool>,
pub proposition: String,
@@ -810,7 +809,6 @@ impl MetricsContext {
distribution_tenant_id: String::from(""),
firmware: String::from(""),
ripple_version: String::from(""),
env: None,
data_governance_tags: None,
activated: None,
proposition: String::from(""),
@@ -1139,7 +1137,6 @@ mod tests {
serial_number: "test_serial_number".to_string(),
firmware: "test_firmware".to_string(),
ripple_version: "test_ripple_version".to_string(),
env: Some("test_env".to_string()),
data_governance_tags: None,
activated: None,
proposition: "test_proposition".to_string(),
1 change: 0 additions & 1 deletion core/sdk/src/api/observability/metrics_util.rs
Original file line number Diff line number Diff line change
@@ -143,7 +143,6 @@ mod tests {
serial_number: "test_serial_number".to_string(),
firmware: "test_firmware".to_string(),
ripple_version: "test_ripple_version".to_string(),
env: Some("test_env".to_string()),
data_governance_tags: None,
activated: None,
proposition: "test_proposition".to_string(),