kk

Author: syphar

crates/bin/docs_rs_web/src/config.rs

@@ -39,6 +39,11 @@ pub struct Config {
     #[builder(default)]
     pub(crate) csp_report_only: bool,
 
+    /// Datadog graph embed URLs generated for a 400 × 200 viewport.
+    /// Unset URLs hide the corresponding graphs on the build queue page.
+    pub(crate) build_queue_length_graph_url: Option<String>,
+    pub(crate) build_queue_wait_time_graph_url: Option<String>,
+
     // Cache-Control header, for versioned URLs.
     // If both are absent, don't generate the header. If only one is present,
     // generate just that directive.
@@ -63,6 +68,10 @@ impl<S: State> ConfigBuilder<S> {
             .maybe_report_request_timeouts(maybe_env("DOCSRS_REPORT_REQUEST_TIMEOUTS")?)
             .maybe_random_crate_search_view_size(maybe_env("DOCSRS_RANDOM_CRATE_SEARCH_VIEW_SIZE")?)
             .maybe_csp_report_only(maybe_env("DOCSRS_CSP_REPORT_ONLY")?)
+            .maybe_build_queue_length_graph_url(maybe_env("DOCSRS_BUILD_QUEUE_LENGTH_GRAPH_URL")?)
+            .maybe_build_queue_wait_time_graph_url(maybe_env(
+                "DOCSRS_BUILD_QUEUE_WAIT_TIME_GRAPH_URL",
+            )?)
             .maybe_cache_control_stale_while_revalidate(maybe_env(
                 "CACHE_CONTROL_STALE_WHILE_REVALIDATE",
             )?)

crates/bin/docs_rs_web/src/handlers/releases.rs

@@ -768,6 +768,8 @@ struct BuildQueuePage {
     in_progress_builds: Vec<InProgressBuild>,
     expand_rebuild_queue: bool,
     show_length_warning: bool,
+    queue_length_graph_url: Option<String>,
+    queue_wait_time_graph_url: Option<String>,
 }
 
 impl_axum_webpage! { BuildQueuePage }
@@ -786,6 +788,7 @@ pub(crate) struct BuildQueueParams {
 }
 
 pub(crate) async fn build_queue_handler(
+    State(config): State<Arc<Config>>,
     State(build_queue): State<Arc<AsyncBuildQueue>>,
     Extension(csp): Extension<Arc<Csp>>,
     mut conn: DbConnection,
@@ -849,7 +852,11 @@ pub(crate) async fn build_queue_handler(
         }
     });
 
-    csp.allow_datadog_frame();
+    if config.build_queue_length_graph_url.is_some()
+        || config.build_queue_wait_time_graph_url.is_some()
+    {
+        csp.allow_datadog_frame();
+    }
 
     Ok(BuildQueuePage {
         description: "crate documentation scheduled to build & deploy",
@@ -858,6 +865,8 @@ pub(crate) async fn build_queue_handler(
         in_progress_builds,
         expand_rebuild_queue: params.expand.is_some(),
         show_length_warning,
+        queue_length_graph_url: config.build_queue_length_graph_url.clone(),
+        queue_wait_time_graph_url: config.build_queue_wait_time_graph_url.clone(),
     })
 }
 
@@ -886,6 +895,38 @@ mod tests {
     use std::str::FromStr;
     use test_case::test_case;
 
+    #[test_case(false, false)]
+    #[test_case(true, false)]
+    #[test_case(false, true)]
+    #[test_case(true, true)]
+    fn test_build_queue_optional_graphs(length: bool, wait_time: bool) {
+        let url = "https://app.datadoghq.com/graph/embed?token=test&legend=true";
+        let mut page = BuildQueuePage {
+            description: "test",
+            queue: Vec::new(),
+            rebuild_queue: Vec::new(),
+            in_progress_builds: Vec::new(),
+            expand_rebuild_queue: false,
+            show_length_warning: false,
+            queue_length_graph_url: length.then(|| url.to_owned()),
+            queue_wait_time_graph_url: wait_time.then(|| url.to_owned()),
+        };
+        let html =
+            kuchikiki::parse_html().one(page.render_with_csp_nonce("test-nonce".into()).unwrap());
+        let frames: Vec<_> = html
+            .select(".build-queue-metrics iframe")
+            .unwrap()
+            .collect();
+        assert_eq!(frames.len(), usize::from(length) + usize::from(wait_time));
+        for frame in frames {
+            assert_eq!(frame.attributes.borrow().get("src"), Some(url));
+        }
+        assert_eq!(
+            html.select(".build-queue-layout").unwrap().count(),
+            usize::from(length || wait_time)
+        );
+    }
+
     #[test]
     fn test_release_list_with_incomplete_release_and_successful_build() {
         async_wrapper(|env| async move {

crates/bin/docs_rs_web/templates/releases/build_queue.html

@@ -27,7 +27,7 @@
             </div>
         {%- endif %}
 
-        <div class="build-queue-layout">
+        <div class="{% if queue_length_graph_url.is_some() || queue_wait_time_graph_url.is_some() %}build-queue-layout{% endif %}">
             <div class="recent-releases-container">
                 <div class="release">
                     <strong>Currently being built</strong>
@@ -128,24 +128,30 @@
                     </ol>
                 {%- endif -%}
             </div>
+            {% if queue_length_graph_url.is_some() || queue_wait_time_graph_url.is_some() %}
             <aside class="build-queue-metrics" aria-label="Build metrics">
+                {% if let Some(url) = queue_length_graph_url %}
                 <iframe
                     class="build-metrics-graph"
-                    src="https://app.datadoghq.com/graph/embed?token=f0fcea6ecf4c6e24aee42bf3588050c6708bd6cf92f1a2eae770997a83f0f60d&amp;height=200&amp;width=400&amp;legend=false"
+                    src="{{ url }}"
                     title="Queue length graph"
                     width="400"
                     height="200"
                     frameborder="0"
                 ></iframe>
+                {% endif %}
+                {% if let Some(url) = queue_wait_time_graph_url %}
                 <iframe
                     class="build-metrics-graph"
-                    src="https://app.datadoghq.com/graph/embed?token=5a41fdbad1daf9e6f9e95f66aa09b24ae0efb40baf11930af0342693ce97ea77&amp;height=200&amp;width=400&amp;legend=true"
+                    src="{{ url }}"
                     title="Queue waiting time graph"
                     width="400"
                     height="200"
                     frameborder="0"
                 ></iframe>
+                {% endif %}
             </aside>
+            {% endif %}
         </div>
     </div>
 {%- endblock body -%}