From 21ac285cd8f0c1e0b0609c9bc442326b10c91486 Mon Sep 17 00:00:00 2001 From: Martin Duffy Date: Mon, 14 Jul 2025 16:05:14 -0400 Subject: [PATCH] Experimental: Update the Instrumentation UUID Update experimental UUID for instrumentation after commit afa94bae1e (instrumentation: Rename queries field to options, 2025-07-08) broke compatibility for old queries. --- Help/dev/experimental.rst | 8 ++++---- Source/cmExperimental.cxx | 2 +- Tests/RunCMake/ConfigDir/check-reply.cmake | 2 +- .../v1/query/query.json | 0 Tests/RunCMake/Instrumentation/RunCMakeTest.cmake | 2 +- Tests/RunCMake/Instrumentation/project/CMakeLists.txt | 2 +- Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in | 2 +- .../InstrumentationInCTestXML-check.cmake | 2 +- Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake | 2 +- .../ctest_labels_for_subprojects/RunCMakeTest.cmake | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename Tests/RunCMake/ConfigDir/config/{instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0 => instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27}/v1/query/query.json (100%) diff --git a/Help/dev/experimental.rst b/Help/dev/experimental.rst index 81ddc8c38c..f5e4bd4643 100644 --- a/Help/dev/experimental.rst +++ b/Help/dev/experimental.rst @@ -127,15 +127,15 @@ In order to activate support for the :command:`cmake_instrumentation` command, set * variable ``CMAKE_EXPERIMENTAL_INSTRUMENTATION`` to -* value ``a37d1069-1972-4901-b9c9-f194aaf2b6e0``. +* value ``d16a3082-c4e1-489b-b90c-55750a334f27``. To enable instrumentation at the user-level, files should be placed under either -``/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0`` or -``/.cmake/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0``. +``/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27`` or +``/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27``. To include instrumentation data in CTest XML files (for submission to CDash), you need to set the following environment variables: * ``CTEST_USE_INSTRUMENTATION=1`` -* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=a37d1069-1972-4901-b9c9-f194aaf2b6e0`` +* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=d16a3082-c4e1-489b-b90c-55750a334f27`` diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index fcd2d60ebc..c4036bfe15 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -73,7 +73,7 @@ cmExperimental::FeatureData const LookupTable[] = { cmExperimental::TryCompileCondition::Never }, // Instrumentation { "Instrumentation", - "a37d1069-1972-4901-b9c9-f194aaf2b6e0", + "d16a3082-c4e1-489b-b90c-55750a334f27", "CMAKE_EXPERIMENTAL_INSTRUMENTATION", "CMake's support for collecting instrumentation data is experimental. It " "is meant only for experimentation and feedback to CMake developers.", diff --git a/Tests/RunCMake/ConfigDir/check-reply.cmake b/Tests/RunCMake/ConfigDir/check-reply.cmake index eb534c01a2..26c5022614 100644 --- a/Tests/RunCMake/ConfigDir/check-reply.cmake +++ b/Tests/RunCMake/ConfigDir/check-reply.cmake @@ -1,6 +1,6 @@ if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply) set(RunCMake_TEST_FAILED "Failed to read FileAPI query from user config directory") endif() -if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1/data) +if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/data) set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory") endif() diff --git a/Tests/RunCMake/ConfigDir/config/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1/query/query.json b/Tests/RunCMake/ConfigDir/config/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/query/query.json similarity index 100% rename from Tests/RunCMake/ConfigDir/config/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1/query/query.json rename to Tests/RunCMake/ConfigDir/config/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/query/query.json diff --git a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake index 149b889ebd..7d53b41ca0 100644 --- a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake +++ b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake @@ -9,7 +9,7 @@ function(instrument test) "BUILD;BUILD_MAKE_PROGRAM;INSTALL;TEST;COPY_QUERIES;COPY_QUERIES_GENERATED;NO_WARN;STATIC_QUERY;DYNAMIC_QUERY;INSTALL_PARALLEL;MANUAL_HOOK" "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN}) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}) - set(uuid "a37d1069-1972-4901-b9c9-f194aaf2b6e0") + set(uuid "d16a3082-c4e1-489b-b90c-55750a334f27") set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1) set(query_dir ${CMAKE_CURRENT_LIST_DIR}/query) diff --git a/Tests/RunCMake/Instrumentation/project/CMakeLists.txt b/Tests/RunCMake/Instrumentation/project/CMakeLists.txt index 0d90faff9f..a6fa16bd32 100644 --- a/Tests/RunCMake/Instrumentation/project/CMakeLists.txt +++ b/Tests/RunCMake/Instrumentation/project/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.30) project(instrumentation) enable_testing() if (EXISTS ${INSTRUMENT_COMMAND_FILE}) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") include(${INSTRUMENT_COMMAND_FILE}) endif() diff --git a/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in b/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in index 057f708032..976364df8c 100644 --- a/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in +++ b/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) @CASE_CMAKELISTS_PREFIX_CODE@ project(CTestInstrumentation@CASE_NAME@) if(USE_INSTRUMENTATION) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") endif() include(CTest) add_executable(main main.c) diff --git a/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake b/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake index b487573484..0f80214a5f 100644 --- a/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake +++ b/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake @@ -1,4 +1,4 @@ -set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1") +set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1") file(READ "${timingDir}/query/generated/query-0.json" jsonData) string(JSON options GET "${jsonData}" options) if (options MATCHES cdashVerbose AND NOT ${RunCMake_USE_VERBOSE_INSTRUMENTATION}) diff --git a/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake index d1e25d953b..da7c616f5c 100644 --- a/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake @@ -10,7 +10,7 @@ function(run_InstrumentationInCTestXML CASE_NAME USE_INSTRUMENTATION USE_VERBOSE endif() if(USE_INSTRUMENTATION) set(ENV{CTEST_USE_INSTRUMENTATION} "1") - set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "a37d1069-1972-4901-b9c9-f194aaf2b6e0") + set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "d16a3082-c4e1-489b-b90c-55750a334f27") set(RunCMake_USE_INSTRUMENTATION TRUE) set(CASE_NAME InstrumentationInCTestXML) else() diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake b/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake index 9b3b6f4927..4149cdb20b 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake @@ -38,7 +38,7 @@ file(COPY "${CTEST_RUNCMAKE_SOURCE_DIRECTORY}/MyThirdPartyDependency" if(USE_INSTRUMENTATION) set(CASE_CMAKELISTS_SUFFIX_CODE [[ add_subdirectory(MyThirdPartyDependency) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") cmake_instrumentation(DATA_VERSION 1 API_VERSION 1) ]]) set(RunCMake-check-file CTestScriptVariableCommandLine-check.cmake)