wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

.github/scripts/performance-to-markdown.py

@@ -2,46 +2,87 @@
 import json
 import sys
 import os
+import glob
 
-def convert_to_markdown(json_file):
+def load_all_summaries(json_files):
+    """Load summaries from all JSON files and group by test name"""
+    summaries_by_name = {}
+
+    for json_file in json_files:
+        try:
+            with open(json_file, 'r') as f:
+                data = json.load(f)
+
+            if 'summaries' in data and data['summaries']:
+                for summary in data['summaries']:
+                    name = summary.get('name', 'Unknown Test')
+                    if name not in summaries_by_name:
+                        summaries_by_name[name] = []
+                    summaries_by_name[name].append(summary)
+        except (FileNotFoundError, json.JSONDecodeError) as e:
+            print(f"Warning: Error processing {json_file}: {e}", file=sys.stderr)
+            continue
+
+    return summaries_by_name
+
+def convert_to_markdown(json_files):
     """Convert performance test JSON results to markdown format"""
-    try:
-        with open(json_file, 'r') as f:
-            data = json.load(f)
-    except FileNotFoundError:
+    summaries_by_name = load_all_summaries(json_files)
+
+    if not summaries_by_name:
         return "## Performance Test Results\n\nNo performance test results found."
-    except json.JSONDecodeError:
-        return "## Performance Test Results\n\nError parsing performance test results."
 
     markdown = "## Performance Test Results\n\n"
 
-    if 'summaries' not in data or not data['summaries']:
-        return markdown + "No test summaries available."
+    # Create a table for each test name
+    for name, summaries in sorted(summaries_by_name.items()):
+        markdown += f"### {name}\n\n"
+        markdown += "| Duration (ms) | Max Memory (GB) | Processors | Parameters |\n"
+        markdown += "|---------------|-----------------|------------|------------|\n"
 
-    for summary in data['summaries']:
-        name = summary.get('name', 'Unknown Test')
-        duration = summary.get('duration', 0)
-        processors = summary.get('numberOfProcessors', 0)
-        max_memory = summary.get('maxMemory', 0)
+        for summary in summaries:
+            duration = summary.get('duration', 0)
+            processors = summary.get('numberOfProcessors', 0)
+            max_memory = summary.get('maxMemory', 0)
 
-        # Convert memory from bytes to GB
-        max_memory_gb = max_memory / (1024 ** 3) if max_memory > 0 else 0
+            # Convert memory from bytes to GB
+            max_memory_gb = max_memory / (1024 ** 3) if max_memory > 0 else 0
+
+            # Extract dynamic properties (excluding standard fields)
+            standard_fields = {'name', 'duration', 'numberOfProcessors', 'maxMemory'}
+            params = []
+            for key, value in summary.items():
+                if key not in standard_fields:
+                    params.append(f"{key}={value}")
+
+            params_str = ", ".join(params) if params else "-"
+
+            markdown += f"| {duration} | {max_memory_gb:.2f} | {processors} | {params_str} |\n"
 
-        markdown += f"### {name}\n\n"
-        markdown += "| Metric | Value |\n"
-        markdown += "|--------|-------|\n"
-        markdown += f"| Duration | {duration} ms |\n"
-        markdown += f"| Processors | {processors} |\n"
-        markdown += f"| Max Memory | {max_memory_gb:.2f} GB |\n"
         markdown += "\n"
 
     return markdown
 
 if __name__ == "__main__":
-    if len(sys.argv) != 2:
-        print("Usage: performance-to-markdown.py <json_file>")
+    if len(sys.argv) < 2:
+        print("Usage: performance-to-markdown.py <json_file> [json_file2 ...]")
+        print("   or: performance-to-markdown.py <glob_pattern>")
         sys.exit(1)
 
-    json_file = sys.argv[1]
-    markdown = convert_to_markdown(json_file)
+    # Collect all JSON files from arguments (supporting both direct files and glob patterns)
+    json_files = []
+    for arg in sys.argv[1:]:
+        if '*' in arg:
+            json_files.extend(glob.glob(arg, recursive=True))
+        else:
+            json_files.append(arg)
+
+    # Filter to only existing files
+    json_files = [f for f in json_files if os.path.isfile(f)]
+
+    if not json_files:
+        print("## Performance Test Results\n\nNo performance test results found.")
+        sys.exit(0)
+
+    markdown = convert_to_markdown(json_files)
     print(markdown)

.github/workflows/integration-tests.yml

@@ -44,14 +44,14 @@ jobs:
           minikube version: 'v1.36.0'
           kubernetes version: '${{ inputs.kube-version }}'
           github token: ${{ github.token }}
-
       - name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
         run: |
           if [ -z "${{inputs.it-category}}" ]; then
             it_profile="integration-tests"
           else
             it_profile="integration-tests-${{inputs.it-category}}"
           fi
+          echo "{ "kube-version":"${{inputs.kube-version}}", "java-version":"${{ inputs.java-version }}","http-client":"${{inputs.http-client}}"}" >> run-properties.json
           echo "Using profile: ${it_profile}"
           ./mvnw ${MAVEN_ARGS} -T1C -B install -DskipTests -Pno-apt --file pom.xml
           ./mvnw ${MAVEN_ARGS} -T1C -B package -P${it_profile} -Dfabric8-httpclient-impl.name=${{inputs.http-client}} --file pom.xml

.github/workflows/pr.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Check for performance results
         id: check_results
         run: |
-          if [ -d "performance-results" ] && [ "$(ls -A performance-results/*.json 2>/dev/null)" ]; then
+          if [ -d "performance-results" ] && [ "$(ls -A performance-results/**/*.json 2>/dev/null)" ]; then
             echo "Has results"
             echo "has_results=true" >> $GITHUB_OUTPUT
           else
@@ -64,15 +64,7 @@ jobs:
         if: steps.check_results.outputs.has_results == 'true'
         id: convert
         run: |
-          echo "# Performance Test Results" > comment.md
-          echo "" >> comment.md
-          for file in performance-results/*.json; do
-            if [ -f "$file" ]; then
-              echo "Processing $file"
-              python3 .github/scripts/performance-to-markdown.py "$file" >> comment.md
-              echo "" >> comment.md
-            fi
-          done
+          python3 .github/scripts/performance-to-markdown.py performance-results/**/*.json > comment.md
 
       - name: Post PR comment
         if: steps.check_results.outputs.has_results == 'true' && github.event_name == 'pull_request'

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/performance/PerformanceTestResult.java

@@ -15,10 +15,27 @@
  */
 package io.javaoperatorsdk.operator.baseapi.performance;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class PerformanceTestResult {
 
+  private final Map<String, Object> additionalProperties = new HashMap<>();
+
+  @JsonAnySetter
+  public void addProperty(String key, Object value) {
+    additionalProperties.put(key, value);
+  }
+
+  @JsonAnyGetter
+  public Map<String, Object> getProperties() {
+    return additionalProperties;
+  }
+
   private List<PerformanceTestSummary> summaries;
 
   public List<PerformanceTestSummary> getSummaries() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/performance/SimplePerformanceTestIT.java

@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -39,7 +40,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class SimplePerformanceTestIT {
-
+  ObjectMapper objectMapper = new ObjectMapper();
   private static final Logger log = LoggerFactory.getLogger(SimplePerformanceTestIT.class);
   public static final String INITIAL_VALUE = "initialValue";
   public static final String RESOURCE_NAME_PREFIX = "resource";
@@ -89,19 +90,34 @@ void simpleNaivePerformanceTest() {
   private void saveResults(long duration) {
     try {
       var result = new PerformanceTestResult();
+      getRunProperties().forEach((k,v)->result.addProperty(k,v));
       var summary = new PerformanceTestSummary();
       result.setSummaries(List.of(summary));
       summary.setName("Naive performance test");
       summary.setDuration(duration);
       summary.setNumberOfProcessors(Runtime.getRuntime().availableProcessors());
       summary.setMaxMemory(Runtime.getRuntime().maxMemory());
-      var objectMapper = new ObjectMapper();
+
       objectMapper.writeValue(new File("target/performance_test_result.json"), result);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
 
+    private Map<String, Object> getRunProperties() {
+        try {
+          File runProperties = new File("../run-properties.json");
+          if (runProperties.exists()) {
+            return objectMapper.readValue(runProperties, HashMap.class);
+          } else {
+            log.warn("No run properties file found");
+            return Map.of();
+          }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
   private void createResources(int startIndex, int number, String value) {
     try {
       List<Callable<Void>> callables = new ArrayList<>(number);