Merge branch 'mahir/rename_onchain_observability' into 'master'

[Monitoring Canister][NET-1308] Rename ic_monitoring_canister -> onchain_observability

For consistency, rename service file, binary, and rust library to match the folder path

Test Plan
```
./gitlab-ci/container/container-run.sh

bazel test --config=systest //rs/tests:basic_health_test

journalctl -b | grep ic-onchain-observability-adapter
```

Confirmed service runs successfully 

See merge request dfinity-lab/public/ic!10418

.gitignore

@@ -95,7 +95,7 @@ prestorecon.o
 **/bin/ic-consensus-pool-util
 **/bin/ic-crypto-csp
 **/bin/ic-regedit
-**/bin/ic-monitoring-canister-adapter
+**/bin/ic-onchain-observability-adapter
 **/bin/orchestrator
 **/bin/replica
 **/bin/state-tool

gitlab-ci/src/job_scripts/lib/guest-os-updateimg.sh

@@ -22,7 +22,7 @@ fi
 
 groups
 
-for f in replica orchestrator canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-monitoring-canister-adapter; do
+for f in replica orchestrator canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-onchain-observability-adapter; do
     gunzip -c -d artifacts/release/$f.gz >artifacts/release/$f
 done
 

ic-os/defs.bzl

@@ -40,7 +40,7 @@ def _image_deps(mode, malicious = False):
             "//publish/binaries:ic-consensus-pool-util": "/opt/ic/bin/ic-consensus-pool-util:0755",
             "//publish/binaries:ic-canister-http-adapter": "/opt/ic/bin/ic-canister-http-adapter:0755",
             "//publish/binaries:ic-crypto-csp": "/opt/ic/bin/ic-crypto-csp:0755",
-            "//publish/binaries:ic-monitoring-canister-adapter": "/opt/ic/bin/ic-monitoring-canister-adapter:0755",
+            "//publish/binaries:ic-onchain-observability-adapter": "/opt/ic/bin/ic-onchain-observability-adapter:0755",
             "//publish/binaries:ic-regedit": "/opt/ic/bin/ic-regedit:0755",
             "//publish/binaries:ic-recovery": "/opt/ic/bin/ic-recovery:0755",
             "//publish/binaries:orchestrator": "/opt/ic/bin/orchestrator:0755",

ic-os/guestos/rootfs/etc/systemd/system/ic-monitoring-canister-adapter.service → ic-os/guestos/rootfs/etc/systemd/system/ic-onchain-observability-adapter.service

@@ -9,8 +9,8 @@ StartLimitIntervalSec=0
 [Service]
 User=ic-replica
 Environment=RUST_BACKTRACE=1
-ExecStartPre=+/opt/ic/bin/generate-monitoring-canister-adapter-config.sh -o /run/ic-node/config/ic-monitoring-canister-adapter.json
-ExecStart=/opt/ic/bin/ic-monitoring-canister-adapter /run/ic-node/config/ic-monitoring-canister-adapter.json
+ExecStartPre=+/opt/ic/bin/generate-onchain-observability-adapter-config.sh -o /run/ic-node/config/ic-onchain-observability-adapter.json
+ExecStart=/opt/ic/bin/ic-onchain-observability-adapter /run/ic-node/config/ic-onchain-observability-adapter.json
 NotifyAccess=main
 #TODO: once this service is complete, we can change to "always"
 Restart=on-failure 

ic-os/guestos/rootfs/opt/ic/bin/generate-monitoring-canister-adapter-config.sh → ic-os/guestos/rootfs/opt/ic/bin/generate-onchain-observability-adapter-config.sh

@@ -3,11 +3,11 @@
 function usage() {
     cat <<EOF
 Usage:
-  generate-monitoring-canister-adapter-config -o ic-monitoring-canister-adapter.json
+  generate-onchain-observability-adapter-config -o ic-onchain-observability-adapter.json
 
   Generate the monitoring canister adapter config.
 
-  -o outfile: output ic-monitoring-canister-adapter.json file
+  -o outfile: output ic-onchain-observability-adapter.json file
 EOF
 }
 

ic-os/guestos/scripts/build-disk-image.sh

@@ -94,7 +94,7 @@ make -C ${BASE_DIR}/src infogetty prestorecon
 
 # Compute arguments for actual build stage.
 
-declare -a IC_EXECUTABLES=(orchestrator replica canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-monitoring-canister-adapter)
+declare -a IC_EXECUTABLES=(orchestrator replica canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-onchain-observability-adapter)
 declare -a INSTALL_EXEC_ARGS=()
 for IC_EXECUTABLE in "${IC_EXECUTABLES[@]}"; do
     INSTALL_EXEC_ARGS+=("${EXEC_SRCDIR}/${IC_EXECUTABLE}:/opt/ic/bin/${IC_EXECUTABLE}:0755")

ic-os/guestos/scripts/build-update-image.sh

@@ -110,7 +110,7 @@ make -C ${BASE_DIR}/src infogetty prestorecon
 
 # Compute arguments for actual build stage.
 
-declare -a IC_EXECUTABLES=(orchestrator replica canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-monitoring-canister-adapter)
+declare -a IC_EXECUTABLES=(orchestrator replica canister_sandbox sandbox_launcher vsock_agent state-tool ic-consensus-pool-util ic-crypto-csp ic-regedit ic-recovery ic-btc-adapter ic-canister-http-adapter ic-onchain-observability-adapter)
 declare -a INSTALL_EXEC_ARGS=()
 for IC_EXECUTABLE in "${IC_EXECUTABLES[@]}"; do
     INSTALL_EXEC_ARGS+=("${EXEC_SRCDIR}/${IC_EXECUTABLE}:/opt/ic/bin/${IC_EXECUTABLE}:0755")

policy-monitoring/.dockerignore

@@ -11,6 +11,6 @@ artifacts/
 **/bin/ic-crypto-csp
 **/bin/ic-btc-adapter
 **/bin/ic-canister-http-adapter
-**/bin/ic-monitoring-canister-adapter
+**/bin/ic-onchain-observability-adapter
 **/bin/state-tool
 **/disk.img

policy-monitoring/pipeline/es_doc.py

@@ -135,7 +135,7 @@ def is_host_reboot_intent(self) -> bool:
             "ic-btc-adapter",
             "ic-crypto-csp",
             "ic-canister-http-adapter",
-            "ic-monitoring-canister-adapter",
+            "ic-onchain-observability-adapter",
             # TODO: all components that use the ReplicaLogger library
         ]
     )

publish/binaries/BUILD.bazel

@@ -11,7 +11,7 @@ NO_STRIP = [
     "canister_sandbox",
     "ic-btc-adapter",
     "ic-canister-http-adapter",
-    "ic-monitoring-canister-adapter",
+    "ic-onchain-observability-adapter",
     "replica",
 ]
 
@@ -32,7 +32,7 @@ BINARIES = {
     "ic-canister-http-adapter": "//rs/https_outcalls/adapter:ic-canister-http-adapter",
     "ic-consensus-pool-util": "//rs/artifact_pool:ic-consensus-pool-util",
     "ic-crypto-csp": "//rs/crypto:ic-crypto-csp",
-    "ic-monitoring-canister-adapter": "//rs/monitoring/onchain_observability/adapter:ic-monitoring-canister-adapter",
+    "ic-onchain-observability-adapter": "//rs/monitoring/onchain_observability/adapter:ic-onchain-observability-adapter",
     "ic-nns-init": "//rs/nns/init:ic-nns-init",
     "ic-p8s-sd": "//rs/ic_p8s_service_discovery:ic-p8s-sd",
     "ic-p8s-service-discovery": "//rs/ic_p8s_service_discovery:ic-p8s-service-discovery",

rs/monitoring/onchain_observability/adapter/BUILD.bazel

@@ -22,14 +22,14 @@ rust_library(
     name = "adapter",
     srcs = glob(["src/**"]),
     aliases = ALIASES,
-    crate_name = "ic_monitoring_canister_adapter",
+    crate_name = "ic_onchain_observability_adapter",
     proc_macro_deps = MACRO_DEPENDENCIES,
     version = "0.1.0",
     deps = DEPENDENCIES,
 )
 
 rust_binary(
-    name = "ic-monitoring-canister-adapter",
+    name = "ic-onchain-observability-adapter",
     srcs = ["src/main.rs"],
     aliases = ALIASES,
     proc_macro_deps = MACRO_DEPENDENCIES,

rs/monitoring/onchain_observability/adapter/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "ic-monitoring-canister-adapter"
+name = "ic-onchain-observability-adapter"
 version = "0.1.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

rs/monitoring/onchain_observability/adapter/src/main.rs

@@ -1,12 +1,12 @@
 /// This binary is managed by systemd and added to the replica image.
 /// The replica communicates with the HTTP adapter over unix domain sockets.
 /// Relevant configuration files:
-/// systemd service ic-os/guestos/rootfs/etc/systemd/system/ic-monitoring-canister-adapter.service
-/// systemd socket ic-os/guestos/rootfs/etc/systemd/system/ic-monitoring-canister-adapter.socket
+/// systemd service ic-os/guestos/rootfs/etc/systemd/system/ic-onchain-observability-adapter.service
+/// systemd socket ic-os/guestos/rootfs/etc/systemd/system/ic-onchain-observability-adapter.socket
 use clap::Parser;
 use ic_async_utils::abort_on_panic;
 use ic_logger::{info, new_replica_logger_from_config};
-use ic_monitoring_canister_adapter::Cli;
+use ic_onchain_observability_adapter::Cli;
 use serde_json::to_string_pretty;
 
 #[tokio::main]
@@ -29,7 +29,7 @@ pub async fn main() {
 
     info!(
         logger,
-        "Starting the monitoring canister adapter with config: {}",
+        "Starting the onchain observability adapter with config: {}",
         to_string_pretty(&config).unwrap()
     );
 }

scalability/common/flamegraphs.py

@@ -80,7 +80,7 @@ def start_iteration(self, outdir):
                 f"sudo mkdir {TARGET_DIR}; "
                 f"sudo chmod 0777 {TARGET_DIR}; "
                 f"cp -f flamegraph {TARGET_DIR}; cd {TARGET_DIR}; "
-                f"sudo perf record -F {FREQUENCY} -p $(pidof ic-canister-http-adapter ic-btc-adapter ic-crypto-csp ic-monitoring-canister-adapter orchestrator replica sandbox_launcher canister_sandbox | sed 's/ /,/g') --call-graph dwarf,16384 -g -o {TARGET_DIR}/perf.data"
+                f"sudo perf record -F {FREQUENCY} -p $(pidof ic-canister-http-adapter ic-btc-adapter ic-crypto-csp ic-onchain-observability-adapter orchestrator replica sandbox_launcher canister_sandbox | sed 's/ /,/g') --call-graph dwarf,16384 -g -o {TARGET_DIR}/perf.data"
             ),
             os.path.join(outdir, "perf-{}.stdout.log".format(self.target)),
             os.path.join(outdir, "perf-{}.stderr.log".format(self.target)),

scalability/common/machine_failure.py

@@ -27,7 +27,7 @@ def get_services():
             "ic-btc-adapter",
             "ic-canister-http-adapter",
             "ic-crypto-csp",
-            "ic-monitoring-canister-adapter",
+            "ic-onchain-observability-adapter",
         ]
 
     def kill_nodes(machines: [str]):