From 2aca1a00c323d957745d8d0b85ddca4f9ff7e98c Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.fr>
Date: Mon, 2 Oct 2023 14:46:40 +0200
Subject: [PATCH] devscripts/extract-pr.sh: update PR commits for xenctrl
 plugin

Commit messages (and metrics_sample/ files) were still referencing
the squeezed plugin.
---
 devscripts/extract-pr.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/devscripts/extract-pr.sh b/devscripts/extract-pr.sh
index b662066..49da34d 100755
--- a/devscripts/extract-pr.sh
+++ b/devscripts/extract-pr.sh
@@ -18,7 +18,7 @@ git diff-index --quiet HEAD -- || die "dirty workspace"
 cargo build --offline
 git diff-index --quiet HEAD -- || die "moving Cargo.lock"
 
-## basics and squeezed plugin
+## basics and xenctrl plugin
 
 CRATES="
   plugins/xcp-metrics-plugin-xen
@@ -37,7 +37,8 @@ CONTENTS="
   .github
   LICENSE
   devscripts/gen-vendor-tarball.sh
-  metrics_sample/xcp-rrdd-squeezed
+  metrics_sample/xcp-rrdd-mem_host
+  metrics_sample/xcp-rrdd-xenpm
 "
 
 # new branch for initial commit
@@ -62,21 +63,19 @@ git add Cargo.lock
 
 # commit
 <<EOF cat |
-WIP Introduce xcp-metrics-plugin-squeezed plugin for xcp-rrdd
+WIP Introduce xcp-metrics-plugin-xen plugin for xcp-rrdd
 
-xcp-metrics-plugin-squeezed is meant as a drop-in replacement for
-rrdp-squeezed, as a first Rust-written brick for XAPI.
+xcp-metrics-plugin-xen is meant as a replacement for
+- the metrics collection built into xcp-rrdd, which requires the
+  latter to depend on libxenctrl
+- the rrdp-pm plugin, which also fetches data through libxenctrl
 
-Metrics are read in Xenstore using the xenstore-rs bindings of
-libxenstore, structured in a suitable way for upcoming OpenMetrics
-support, and communicated to xcp-rrdd using its v2 protocol.
+Metrics are collected using the `xenctrl` Rust crate, structured in a
+suitable way for upcoming OpenMetrics support, and communicated to
+xcp-rrdd using its v2 protocol.
 
-NOTE: while the full xcp-metrics work currently references external
-git repository for xenstore-rs and xenctrl-rs as we had to add some
-features there and the PRs are still pending, this initial work
-explicitly does ot require any of those, and we went into some
-gymnastics to support this, which reflects in the scripts extracting
-this PR source code, as well as in parts of the code itself.
+NOTE: at the time of this writing, we still rely on extra features we
+had to add to the `xenctrl` crate, PR pending.
 
 Signed-off-by: Teddy Astie <teddy.astie@outlook.fr>
 Reviewed-by: Yann Dirson <yann.dirson@vates.fr>