ci: build the 2.16 stack, which needs no work-around patches

THAPI records raw bytes as lttng-ust 2.16 BLOB fields, so the two halves of
the old work-around are gone: `55cca69.diff`, which made lttng-ust write an
array of text in full rather than stopping at the first NUL, and babeltrace's
null-character patch, which let the reader run past that NUL. Neither is
wanted now, and the babeltrace one is actively wrong on a blob-era build --
it makes a genuine ctf_string read past its terminator.

lttng-tools and babeltrace still come from the ANL branches, since those carry
the pause/resume commands and the archive component class that upstream does
not have; they are simply rebased onto 2.16.0 and 2.1.2. The
anl-ms3-v2.1.2 branch also now carries the fix for the crash behind
`# TODO use anl-ms3-v2.1.2 when ctf.archive.reader doesn't segfault anymore`,
so that comment goes with it.

babeltrace_thapi resolved `source.ctf.lttng-archive` on every invocation,
which fails on a build without archive support: that component class is an ANL
addition, and `~archive` links a plain babeltrace2. Resolve it only when a
graph names it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: TApplencourt

.github/actions/setup-thapi/action.yml

@@ -66,10 +66,8 @@ runs:
     shell: bash
     if: steps.efficios_dep.outputs.cache-hit != 'true'
     run: |
-      git clone https://github.com/lttng/lttng-ust -b v2.14.0
+      git clone https://github.com/lttng/lttng-ust -b v2.16.0
       cd lttng-ust
-      wget https://raw.githubusercontent.com/argonne-lcf/THAPI-spack/a57eb4fa1b2b8621bb0e83a6ec25e48e3a761d15/packages/lttng-ust/55cca69.diff
-      patch -p1 < 55cca69.diff
       ./bootstrap
       ./configure --disable-man-pages --prefix=$HOME/efficios_dep/
       make -j$(nproc)
@@ -78,7 +76,7 @@ runs:
     shell: bash
     if: steps.efficios_dep.outputs.cache-hit != 'true'
     run: |
-      git clone https://github.com/argonne-lcf/lttng-tools.git -b anl-v2.14.0
+      git clone https://github.com/argonne-lcf/lttng-tools.git -b anl-v2.16.0
       cd lttng-tools
       ./bootstrap
       ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/efficios_dep
@@ -88,15 +86,11 @@ runs:
     shell: bash
     if: steps.efficios_dep.outputs.cache-hit != 'true'
     run: |
-      git clone https://github.com/argonne-lcf/babeltrace.git -b anl-ms3
-      # TODO use anl-ms3-v2.1.2 when ctf.archive.reader doesn't segfault anymore
+      git clone https://github.com/argonne-lcf/babeltrace.git -b anl-ms3-v2.1.2
       cd babeltrace
       # Fix include path
       wget https://raw.githubusercontent.com/argonne-lcf/THAPI/4418916620496fd66cde0b3d5e241bed0a4c18a3/.github/workflows/bt_makefile.patch
       patch -p1 < bt_makefile.patch
-      # Null char
-      wget https://raw.githubusercontent.com/argonne-lcf/THAPI-spack/ddc9a12a498331a7c312941df0d4e7078d03ae93/packages/babeltrace2/0001-Prevent-null-character-from-stopping-string-decoding.patch
-      patch -p1 < 0001-Prevent-null-character-from-stopping-string-decoding.patch
       ./bootstrap
       ./configure --disable-man-pages --prefix=$HOME/efficios_dep
       make -j$(nproc)

utils/babeltrace_thapi.in

@@ -132,13 +132,21 @@ def get_components(names)
   components_classes = {
     'source.ctf.fs' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('fs'),
     'source.ctf.lttng_live' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-live'),
-    'source.ctf.lttng_archive' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive'),
     'filter.utils.muxer' => BT2::BTPlugin.find('utils').get_filter_component_class_by_name('muxer'),
     'sink.text.pretty' => BT2::BTPlugin.find('text').get_sink_component_class_by_name('pretty'),
     'sink.ctf.fs' => BT2::BTPlugin.find('ctf').get_sink_component_class_by_name('fs'),
     'sink.utils.dummy' => BT2::BTPlugin.find('utils').get_sink_component_class_by_name('dummy'),
   }
 
+  # `lttng-archive` is an ANL addition rather than an upstream component class,
+  # and a build without archive support links a plain babeltrace2 that does not
+  # have it. Resolve it only when a graph actually names it, so every other
+  # mode keeps working.
+  if names.include?('source.ctf.lttng_archive')
+    components_classes['source.ctf.lttng_archive'] =
+      BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive')
+  end
+
   # THAPI components
   thapi_plugins = BT2::BTPlugin.find_all_from_dir(File.join('@prefix@', 'lib', '@PACKAGE@', 'bt2'))
   thapi_plugins.map do |pg|