Add debug logging

.github/workflows/build-cli.yml

@@ -6,6 +6,9 @@ on:
       - main
   pull_request:
 
+env:
+  WEB5_SDK_LOG_LEVEL: debug
+
 jobs:
   build_aarch64_apple_darwin:
     runs-on: macos-latest

Justfile

@@ -6,7 +6,7 @@ setup:
   source bin/activate-hermit
   git submodule update --init --recursive
   if [[ "$(cargo 2>&1)" == *"rustup could not choose a version of cargo to run"* ]]; then
-    rustup default 1.78.0
+    rustup default 1.80.0
     rustup target add aarch64-apple-darwin
   fi
 

bound/kt/pom.xml

@@ -539,6 +539,49 @@
           <jvmTarget>${kotlin.jvm.target}</jvmTarget>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+              <source>9</source>
+              <target>9</target>
+          </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.2.5</version>
+        <configuration>
+          <includes>
+            <include>*Test</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>get-git-commit-id</id>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+
+            <phase>initialize</phase>
+
+            <configuration>
+              <executable>git</executable>
+              <arguments>
+                <argument>rev-parse</argument>
+                <argument>--short</argument>
+                <argument>HEAD</argument>
+              </arguments>
+              <outputFile>${project.build.directory}/git-commit-id.txt</outputFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

bound/kt/src/main/kotlin/web5/sdk/rust/SystemTarget.kt

@@ -3,10 +3,19 @@ package web5.sdk.rust
 import java.io.File
 
 internal val logLevel = System.getenv("WEB5_SDK_LOG_LEVEL")?.lowercase()
+internal val gitCommitHash = run {
+    val commitFile = File("target/git-commit-id.txt")
+    if (commitFile.exists()) {
+        commitFile.readText().trim()
+    } else {
+        println("Git commit hash not found.")
+        ""
+    }
+}
 
 internal fun log(message: String) {
     if (logLevel == "debug") {
-        println("web5 sdk SystemArchitecture $message")
+        println("web5 sdk SystemArchitecture $gitCommitHash: $message")
     }
 }
 

crates/web5/Cargo.toml

@@ -15,6 +15,7 @@ josekit = "0.8.6"
 jsonpath-rust = "0.5.1"
 jsonschema = { version = "0.18.0", default-features = false }
 k256 = { version = "0.13.3", features = ["ecdsa", "jwk"] }
+lazy_static = "1.5.0"
 tokio = "1.38.0"
 rand = { workspace = true }
 regex = "1.10.4"

crates/web5/build.rs

@@ -0,0 +1,18 @@
+use std::process::Command;
+
+fn main() {
+    // Execute the `git rev-parse HEAD` command to get the current commit hash
+    let output = Command::new("git")
+        .args(["rev-parse", "HEAD"])
+        .output()
+        .expect("Failed to execute git command");
+
+    // Convert the output to a string
+    let git_hash = String::from_utf8(output.stdout).expect("Invalid UTF-8 sequence");
+
+    // Remove the newline character from the commit hash
+    let git_hash_trimmed = git_hash.trim();
+
+    // Pass the commit hash to the compiler as an environment variable
+    println!("cargo:rustc-env=WEB5_GIT_COMMIT_HASH={}", git_hash_trimmed);
+}

crates/web5/src/lib.rs

@@ -4,3 +4,30 @@ pub mod dids;
 
 #[cfg(test)]
 mod test_helpers;
+
+lazy_static::lazy_static! {
+  pub(crate) static ref LOG_LEVEL: Option<String> = {
+      std::env::var("WEB5_SDK_LOG_LEVEL").ok()
+  };
+}
+
+pub(crate) mod logging {
+    #[macro_export]
+    macro_rules! log_dbg {
+      ($msg:expr, $($arg:tt)*) => {
+          if let Some(ref level) = *$crate::LOG_LEVEL {
+              if level == "DEBUG" {
+                  println!("[DEBUG] {}:{}", env!("GIT_COMMIT_HASH"), format!($msg, $($arg)*));
+              }
+          }
+      };
+      ($closure:expr) => {
+          if let Some(ref level) = *$crate::LOG_LEVEL {
+              if level == "DEBUG" {
+                  let msg = $closure();
+                  println!("[DEBUG] {}:{}", env!("GIT_COMMIT_HASH"), msg);
+              }
+          }
+      };
+  }
+}