Merge pull request #445 from QuietMisdreavus/build-metrics

add build success/fail counts to metrics

Author: pietroalbini

src/db/add_package.rs

@@ -37,10 +37,7 @@ pub(crate) fn add_package_into_database(conn: &Connection,
     let rustdoc = get_rustdoc(metadata_pkg, source_dir).unwrap_or(None);
     let readme = get_readme(metadata_pkg, source_dir).unwrap_or(None);
     let (release_time, yanked, downloads) = try!(get_release_time_yanked_downloads(metadata_pkg));
-    let is_library = match metadata_pkg.targets[0].kind.as_slice() {
-        &[ref kind] if kind == "lib" || kind == "proc-macro" => true,
-        _ => false,
-    };
+    let is_library = metadata_pkg.is_library();
     let metadata = Metadata::from_source_dir(source_dir)?;
 
     let release_id: i32 = {

src/docbuilder/queue.rs

@@ -62,11 +62,17 @@ impl DocBuilder {
         match builder.build_package(self, &name, &version) {
             Ok(_) => {
                 let _ = conn.execute("DELETE FROM queue WHERE id = $1", &[&id]);
+                ::web::metrics::TOTAL_BUILDS.inc();
             }
             Err(e) => {
                 // Increase attempt count
-                let _ = conn.execute("UPDATE queue SET attempt = attempt + 1 WHERE id = $1",
-                                     &[&id]);
+                let rows = try!(conn.query("UPDATE queue SET attempt = attempt + 1 WHERE id = $1 RETURNING attempt",
+                                           &[&id]));
+                let attempt: i32 = rows.get(0).get(0);
+                if attempt >= 5 {
+                    ::web::metrics::FAILED_BUILDS.inc();
+                    ::web::metrics::TOTAL_BUILDS.inc();
+                }
                 error!("Failed to build package {}-{} from queue: {}",
                        name,
                        version,

src/docbuilder/rustwide_builder.rs

@@ -310,6 +310,13 @@ impl RustwideBuilder {
                 }
 
                 let has_examples = build.host_source_dir().join("examples").is_dir();
+                if res.successful {
+                    ::web::metrics::SUCCESSFUL_BUILDS.inc();
+                } else if res.cargo_metadata.root().is_library() {
+                    ::web::metrics::FAILED_BUILDS.inc();
+                } else {
+                    ::web::metrics::NON_LIBRARY_BUILDS.inc();
+                }
                 let release_id = add_package_into_database(
                     &conn,
                     res.cargo_metadata.root(),

src/utils/cargo_metadata.rs

@@ -78,6 +78,15 @@ pub(crate) struct Package {
     pub(crate) authors: Vec<String>,
 }
 
+impl Package {
+    pub(crate) fn is_library(&self) -> bool {
+        match self.targets[0].kind.as_slice() {
+            &[ref kind] if kind == "lib" || kind == "proc-macro" => true,
+            _ => false,
+        }
+    }
+}
+
 #[derive(RustcDecodable)]
 pub(crate) struct Target {
     pub(crate) name: String,

src/web/metrics.rs

@@ -2,7 +2,7 @@ use super::pool::Pool;
 use iron::headers::ContentType;
 use iron::prelude::*;
 use iron::status::Status;
-use prometheus::{Encoder, IntGauge, TextEncoder};
+use prometheus::{Encoder, IntGauge, IntCounter, TextEncoder};
 
 lazy_static! {
     static ref QUEUED_CRATES_COUNT: IntGauge = register_int_gauge!(
@@ -15,6 +15,26 @@ lazy_static! {
         "Number of crates that failed to build"
     )
     .unwrap();
+    pub static ref TOTAL_BUILDS: IntCounter = register_int_counter!(
+        "docsrs_total_builds",
+        "Number of crates built"
+    )
+    .unwrap();
+    pub static ref SUCCESSFUL_BUILDS: IntCounter = register_int_counter!(
+        "docsrs_successful_builds",
+        "Number of builds that successfully generated docs"
+    )
+    .unwrap();
+    pub static ref FAILED_BUILDS: IntCounter = register_int_counter!(
+        "docsrs_failed_builds",
+        "Number of builds that generated a compile error"
+    )
+    .unwrap();
+    pub static ref NON_LIBRARY_BUILDS: IntCounter = register_int_counter!(
+        "docsrs_non_library_builds",
+        "Number of builds that did not complete due to not being a library"
+    )
+    .unwrap();
 }
 
 pub fn metrics_handler(req: &mut Request) -> IronResult<Response> {

src/web/mod.rs

@@ -44,7 +44,7 @@ mod file;
 mod builds;
 mod error;
 mod sitemap;
-mod metrics;
+pub mod metrics;
 
 use std::{env, fmt};
 use std::error::Error;
@@ -433,6 +433,12 @@ fn latest_version(versions_json: &Vec<String>, req_version: &str) -> Option<Stri
 
 /// Starts cratesfyi web server
 pub fn start_web_server(sock_addr: Option<&str>) {
+    // poke all the metrics counters to instantiate and register them
+    metrics::TOTAL_BUILDS.inc_by(0);
+    metrics::SUCCESSFUL_BUILDS.inc_by(0);
+    metrics::FAILED_BUILDS.inc_by(0);
+    metrics::NON_LIBRARY_BUILDS.inc_by(0);
+
     let cratesfyi = CratesfyiHandler::new();
     Iron::new(cratesfyi).http(sock_addr.unwrap_or("0.0.0.0:3000")).unwrap();
 }