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
80 changes: 79 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ clap = { version = "4", features = ["derive", "env"], optional = true }
colored = { version = "3", optional = true }
git2 = { version = "0.20", features = ["vendored-libgit2", "vendored-openssl"], optional = true }
ureq = { version = "3", features = ["json"], optional = true }
sha2 = "0.11.0"
hex = "0.4.3"

[dev-dependencies]
cargo-husky = { version = "1", default-features = false, features = ["user-hooks"] }
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.telemetry {
telemetry::send_event(telemetry::EventType::Init, None, None, None);
telemetry::send_event(telemetry::EventType::Init, None, None, None, None);
}

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

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

result
Expand Down Expand Up @@ -79,8 +79,8 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)

let mut any_bumped = false;
let mut files_to_commit: Vec<String> = Vec::new();
// (tag_name, tag_msg, body, pkg_name, version)
let mut tags_to_create: Vec<(String, String, String, String, String)> = Vec::new();
// (tag_name, tag_msg, body, pkg_name, version, commits_count)
let mut tags_to_create: Vec<(String, String, String, String, String, i32)> = Vec::new();
let mut hook_contexts: Vec<(HookContext, usize)> = Vec::new(); // (ctx, pkg_index)

for (pkg_idx, pkg) in config.packages.iter().enumerate() {
Expand Down Expand Up @@ -280,6 +280,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
Some(&pkg.name),
Some(&new_version),
None,
Some(commits.len() as i32),
);
}

Expand All @@ -290,6 +291,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
body,
pkg.name.clone(),
new_version.clone(),
commits.len() as i32,
));
}

Expand Down Expand Up @@ -327,7 +329,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
// Build the release commit message.
let release_parts: Vec<String> = tags_to_create
.iter()
.map(|(_, _, _, name, ver)| format!("{name} v{ver}"))
.map(|(_, _, _, name, ver, _)| format!("{name} v{ver}"))
.collect();
let skip_ci = if config.workspace.effective_skip_ci() {
" [skip ci]"
Expand Down Expand Up @@ -362,7 +364,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
"Automated release commit.\n\n{}",
tags_to_create
.iter()
.map(|(tag, _, _, _, _)| format!("- `{tag}`"))
.map(|(tag, _, _, _, _, _)| format!("- `{tag}`"))
.collect::<Vec<_>>()
.join("\n")
);
Expand Down Expand Up @@ -400,7 +402,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
}

// Tags are always created on the current HEAD.
for (tag_name, tag_msg, _, _, _) in &tags_to_create {
for (tag_name, tag_msg, _, _, _, _) in &tags_to_create {
create_tag(&repo, tag_name, tag_msg)?;
println!(" ✓ Created tag {}", tag_name.cyan());
}
Expand Down Expand Up @@ -429,7 +431,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
// Push tags (and branch for commit mode).
let tag_refs: Vec<&str> = tags_to_create
.iter()
.map(|(t, _, _, _, _)| t.as_str())
.map(|(t, _, _, _, _, _)| t.as_str())
.collect();
match mode {
ReleaseCommitMode::Commit => {
Expand Down Expand Up @@ -458,20 +460,21 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
}

if config.workspace.telemetry {
for (_, _, _, pkg_name, version) in &tags_to_create {
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),
);
}
}

if let Ok(token) = std::env::var("GITHUB_TOKEN")
&& let Some(slug) = get_repo_slug(&repo, &config.workspace.remote)
{
for (tag_name, _, body, _, _) in &tags_to_create {
for (tag_name, _, body, _, _, _) in &tags_to_create {
match create_github_release(&token, &slug, tag_name, body) {
Ok(()) => println!(" ✓ GitHub Release {}", tag_name.cyan()),
Err(err) => eprintln!(
Expand All @@ -493,7 +496,7 @@ fn run_release_logic(root: &Path, config: &Config, dry_run: bool, verbose: bool)
.open(&summary_path)
{
let _ = writeln!(file, "## Released\n");
for (tag_name, _, body, _, _) in &tags_to_create {
for (tag_name, _, body, _, _, _) in &tags_to_create {
let _ = writeln!(file, "### {tag_name}\n");
let _ = writeln!(file, "{body}");
}
Expand Down
32 changes: 32 additions & 0 deletions src/telemetry.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use serde::Serialize;
use sha2::Digest;

const DEFAULT_API_URL: &str = "https://api.ferrflow.com";

Expand All @@ -22,6 +23,10 @@ struct EventPayload {
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>,
#[serde(skip_serializing_if = "Option::is_none")]
commits_count: Option<i32>,
}

fn is_enabled() -> bool {
Expand All @@ -39,11 +44,28 @@ fn api_url() -> String {
std::env::var("FERRFLOW_API_URL").unwrap_or_else(|_| DEFAULT_API_URL.to_string())
}

fn get_repo_hash() -> Option<String> {
let output = std::process::Command::new("git")
.args(["remote", "get-url", "origin"])
.output()
.ok()?;
if !output.status.success() {
return None;
}
let url = String::from_utf8(output.stdout).ok()?.trim().to_string();
if url.is_empty() {
return None;
}
let hash = sha2::Sha256::digest(url.as_bytes());
Some(hex::encode(hash))
}

pub fn send_event(
event_type: EventType,
package_name: Option<&str>,
package_version: Option<&str>,
metadata: Option<serde_json::Value>,
commits_count: Option<i32>,
) {
if !is_enabled() {
return;
Expand All @@ -54,6 +76,8 @@ pub fn send_event(
package_name: package_name.map(String::from),
package_version: package_version.map(String::from),
metadata,
repo_hash: get_repo_hash(),
commits_count,
};

let url = format!("{}/events", api_url());
Expand Down Expand Up @@ -99,11 +123,15 @@ mod tests {
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"));
}

#[test]
Expand All @@ -113,11 +141,15 @@ mod tests {
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);
}

#[test]
Expand Down
Loading