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
7 changes: 6 additions & 1 deletion schema/ferrflow.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@
"description": "Main branch name.",
"default": "main"
},
"anonymous_telemetry": {
"type": "boolean",
"description": "Send anonymous usage statistics to improve FerrFlow. No identifying data is collected.",
"default": true
},
"telemetry": {
"type": "boolean",
"description": "Send anonymous usage statistics to improve FerrFlow.",
"description": "Deprecated: use anonymous_telemetry instead.",
"default": true
},
"versioning": {
Expand Down
8 changes: 4 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ pub struct WorkspaceConfig {
pub remote: String,
#[serde(default = "default_branch")]
pub branch: String,
#[serde(default = "default_telemetry")]
pub telemetry: bool,
#[serde(default = "default_telemetry", alias = "telemetry")]
pub anonymous_telemetry: bool,
#[serde(default)]
pub versioning: VersioningStrategy,
#[serde(alias = "tagTemplate")]
Expand Down Expand Up @@ -727,7 +727,7 @@ pub fn init(format: Option<ConfigFileFormat>) -> Result<()> {
println!("Created {filename}");
println!("Run: ferrflow check");

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

Expand Down Expand Up @@ -1667,7 +1667,7 @@ format = "toml"
let json = r#"{"workspace":{"remote":"origin"},"package":[]}"#;
let config: Config = serde_json::from_str(json).unwrap();
assert_eq!(config.workspace.remote, "origin");
assert!(config.workspace.telemetry);
assert!(config.workspace.anonymous_telemetry);
assert!(config.workspace.auto_merge_releases);
}

Expand Down
6 changes: 3 additions & 3 deletions src/monorepo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub fn check(config_path: Option<&Path>, verbose: bool) -> Result<()> {

let result = run_release_logic(&root, &config, true, verbose);

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

Expand Down Expand Up @@ -274,7 +274,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
auto_stage_new_files(&repo, &before, &mut files_to_commit);
}

if config.workspace.telemetry {
if config.workspace.anonymous_telemetry {
telemetry::send_event(
telemetry::EventType::VersionBump,
Some(&pkg.name),
Expand Down Expand Up @@ -459,7 +459,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
}
}

if config.workspace.telemetry {
if config.workspace.anonymous_telemetry {
for (_, _, _, pkg_name, version, commit_count) in &tags_to_create {
telemetry::send_event(
telemetry::EventType::Release,
Expand Down
7 changes: 6 additions & 1 deletion src/telemetry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ struct EventPayload {
}

fn is_enabled() -> bool {
check_enabled(std::env::var("FERRFLOW_TELEMETRY").ok().as_deref())
check_enabled(
std::env::var("FERRFLOW_ANONYMOUS_TELEMETRY")
.or_else(|_| std::env::var("FERRFLOW_TELEMETRY"))
.ok()
.as_deref(),
)
}

fn check_enabled(val: Option<&str>) -> bool {
Expand Down
Loading