Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ RUN mkdir src && echo 'fn main() {}' > src/main.rs && echo '' > src/lib.rs \
# Build for real
COPY src ./src
COPY benchmarks ./benchmarks
RUN cargo build --release --package ferrflow
RUN mkdir -p benches && echo 'fn main() {}' > benches/ferrflow_benchmarks.rs \
&& mkdir -p ferrflow-wasm/src && echo '' > ferrflow-wasm/src/lib.rs \
&& cargo build --release --package ferrflow

# Runtime stage
FROM alpine:3.23
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ pub fn init(format: Option<ConfigFileFormat>) -> Result<()> {
println!("Run: ferrflow check");

if config.workspace.anonymous_telemetry {
telemetry::send_event(telemetry::EventType::Init, None, None, None, None);
telemetry::send_event(telemetry::EventType::Init, None, None);
}

Ok(())
Expand Down
14 changes: 3 additions & 11 deletions src/monorepo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub fn check(config_path: Option<&Path>, verbose: bool, json: bool) -> Result<()
let result = run_release_logic(&root, &config, true, verbose, json);

if config.workspace.anonymous_telemetry {
telemetry::send_event(telemetry::EventType::Check, None, None, None, None);
telemetry::send_event(telemetry::EventType::Check, None, None);
}

result
Expand Down Expand Up @@ -339,8 +339,6 @@ fn run_release_logic(
if config.workspace.anonymous_telemetry {
telemetry::send_event(
telemetry::EventType::VersionBump,
Some(&pkg.name),
Some(&new_version),
None,
Some(commits.len() as i32),
);
Expand Down Expand Up @@ -532,14 +530,8 @@ fn run_release_logic(
}

if config.workspace.anonymous_telemetry {
for (_, _, _, pkg_name, version, commit_count) in &tags_to_create {
telemetry::send_event(
telemetry::EventType::Release,
Some(pkg_name),
Some(version),
None,
Some(*commit_count),
);
for (_, _, _, _, _, commit_count) in &tags_to_create {
telemetry::send_event(telemetry::EventType::Release, None, Some(*commit_count));
}
}

Expand Down
16 changes: 0 additions & 16 deletions src/telemetry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ pub enum EventType {
struct EventPayload {
event_type: EventType,
#[serde(skip_serializing_if = "Option::is_none")]
package_name: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
package_version: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
metadata: Option<serde_json::Value>,
#[serde(skip_serializing_if = "Option::is_none")]
repo_hash: Option<String>,
Expand Down Expand Up @@ -75,8 +71,6 @@ fn get_repo_hash() -> Option<String> {

pub fn send_event(
event_type: EventType,
package_name: Option<&str>,
package_version: Option<&str>,
metadata: Option<serde_json::Value>,
commits_count: Option<i32>,
) {
Expand All @@ -86,8 +80,6 @@ pub fn send_event(

let payload = EventPayload {
event_type,
package_name: package_name.map(String::from),
package_version: package_version.map(String::from),
metadata,
repo_hash: get_repo_hash(),
commits_count,
Expand Down Expand Up @@ -154,15 +146,11 @@ mod tests {
fn payload_skips_none_fields() {
let payload = EventPayload {
event_type: EventType::Check,
package_name: None,
package_version: None,
metadata: None,
repo_hash: None,
commits_count: None,
};
let json = serde_json::to_value(&payload).unwrap();
assert!(!json.as_object().unwrap().contains_key("package_name"));
assert!(!json.as_object().unwrap().contains_key("package_version"));
assert!(!json.as_object().unwrap().contains_key("metadata"));
assert!(!json.as_object().unwrap().contains_key("repo_hash"));
assert!(!json.as_object().unwrap().contains_key("commits_count"));
Expand All @@ -172,16 +160,12 @@ mod tests {
fn payload_includes_present_fields() {
let payload = EventPayload {
event_type: EventType::Release,
package_name: Some("my-pkg".into()),
package_version: Some("1.0.0".into()),
metadata: None,
repo_hash: Some("abc123".into()),
commits_count: Some(42),
};
let json = serde_json::to_value(&payload).unwrap();
assert_eq!(json["event_type"], "release");
assert_eq!(json["package_name"], "my-pkg");
assert_eq!(json["package_version"], "1.0.0");
assert_eq!(json["repo_hash"], "abc123");
assert_eq!(json["commits_count"], 42);
}
Expand Down
Loading