Test basic converter operation and fix missing resources

Author: parttimenerd

bin/copy_java_sources.py

@@ -14,24 +14,29 @@
 VERSION = RELEASE.split("-")[0]
 AP_SOURCE_DIR = BASEDIR / "ap-releases" / f"async-profiler-{VERSION}-code" / "src"
 AP_CONVERTER_SOURCE_DIR = AP_SOURCE_DIR / "converter"
+AP_RESOURCES_SOURCE_DIR = AP_SOURCE_DIR / "res"
 AP_API_SOURCE_DIR = AP_SOURCE_DIR / "api" / "one" / "profiler"
 TARGET_SOURCE_DIR = BASEDIR / "src" / "main" / "java"
 TARGET_ONE_DIR = TARGET_SOURCE_DIR / "one"
 TARGET_ONE_PROFILER_DIR = TARGET_ONE_DIR / "profiler"
 TARGET_CONVERTER_DIR = TARGET_ONE_DIR / "converter"
+TARGET_RESOURCES_DIR = BASEDIR / "src" / "main" / "resources"
 
 assert AP_SOURCE_DIR.exists(), f"Source directory {AP_SOURCE_DIR} does not exist"
 assert AP_CONVERTER_SOURCE_DIR.exists(), f"Source directory {AP_CONVERTER_SOURCE_DIR} does not exist"
 assert AP_API_SOURCE_DIR.exists()
 assert TARGET_SOURCE_DIR.exists()
 assert TARGET_ONE_PROFILER_DIR.exists()
+assert AP_RESOURCES_SOURCE_DIR.exists()
 
 PROJECT_FILES = ["AsyncProfilerLoader.java"]
 
 DRY_RUN = False
 
 os.chdir(BASEDIR)
 
+os.makedirs(TARGET_RESOURCES_DIR, exist_ok=True)
+
 print("Remove old files")
 for f in TARGET_ONE_PROFILER_DIR.glob("*"):
     if f.name not in PROJECT_FILES:
@@ -42,13 +47,15 @@
                 f.rmdir()
             else:
                 f.unlink()
+
 for f in TARGET_ONE_DIR.glob("*"):
     if not f.is_dir() or f.name == "profiler":
         continue
     if DRY_RUN:
         print("would remove " + str(f))
     else:
         shutil.rmtree(f)
+
 for f in TARGET_SOURCE_DIR.glob("*.java"):
     if DRY_RUN:
         print("would remove " + str(f))
@@ -64,6 +71,13 @@
     else:
         shutil.copy(f, target_file)
 
+print("Copy converter resource files")
+for f in AP_RESOURCES_SOURCE_DIR.glob("*"):
+    target_file = TARGET_RESOURCES_DIR / f.name
+    if DRY_RUN:
+        print(f"would copy {f} to {target_file}")
+    else:
+        shutil.copy(f, target_file)
 
 print("Copy converter directories")
 for directory in AP_CONVERTER_SOURCE_DIR.glob("one/*"):

bin/releaser.py

@@ -196,14 +196,21 @@ def test_release_basic_execution(release: str, platform: str, ignore_output=True
         if not agentpath.endswith(".so") or not os.path.exists(agentpath):
             print(f"Invalid agentpath: {agentpath}")
             return False
-        profile_file = f"{TESTS_DIR}/profile.html"
-        cmd = f"java -javaagent:{release_file}=start,file={profile_file} " \
+        profile_file = f"{TESTS_DIR}/profile.jfr"
+        cmd = f"java -javaagent:{release_file}=start,file={profile_file},jfr " \
               f"-cp {TESTS_CODE_DIR}/test ThreadsTarget"
         if not ignore_output:
             print(f"Execute {cmd}")
         subprocess.check_call(cmd, shell=True, cwd=CURRENT_DIR, stdout=pipe, stderr=pipe)
         if not os.path.exists(profile_file):
             return False
+        flamegraph_file = f"{TESTS_DIR}/flamegraph.html"
+        cmd = f"java -jar '{release_file}' converter jfr2flame {profile_file} {flamegraph_file}"
+        if not ignore_output:
+            print(f"Execute {cmd}")
+        subprocess.check_call(cmd, shell=True, cwd=CURRENT_DIR, stdout=pipe, stderr=pipe)
+        if not os.path.exists(flamegraph_file):
+            return False
         return True
     except subprocess.CalledProcessError:
         return False