diff --git a/MODULE.bazel b/MODULE.bazel
index bdba9667..43cdc9a7 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,25 +4,25 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "rules_cc", version = "0.1.5")
+bazel_dep(name = "rules_cc", version = "0.2.14")
 
 # GoogleTest/GoogleMock framework. Used by most unit-tests.
 bazel_dep(
     name = "googletest",
-    version = "1.11.0",
+    version = "1.17.0.bcr.2",
     repo_name = "com_google_googletest",
 )
 
 # zlib, used by proto builders.
 bazel_dep(
     name = "zlib",
-    version = "1.3.1",
+    version = "1.3.1.bcr.5",
 )
 
 # Proto rules for Bazel and Protobuf
 bazel_dep(
     name = "protobuf",
-    version = "31.1",
+    version = "33.4",
     repo_name = "com_google_protobuf",
 )
 bazel_dep(
@@ -31,10 +31,10 @@ bazel_dep(
 )
 bazel_dep(
     name = "gflags",
-    version = "2.2.2",
+    version = "2.2.2.bcr.1",
     repo_name = "com_github_gflags_gflags",
 )
 bazel_dep(
     name = "abseil-cpp",
-    version = "20250512.0",
+    version = "20250814.1",
 )
diff --git a/ci/linux_clang-latest_libcxx_bazel.sh b/ci/linux_clang-latest_libcxx_bazel.sh
index 293db74d..86f5acc0 100755
--- a/ci/linux_clang-latest_libcxx_bazel.sh
+++ b/ci/linux_clang-latest_libcxx_bazel.sh
@@ -9,22 +9,26 @@ set -euox pipefail
 
 if [ -z "${PDC_ROOT:-}" ]; then
   PDC_ROOT="$(realpath $(dirname ${0})/..)"
+  PDC_ROOT_DIR_NAME=$(basename "${PDC_ROOT}")
+  PDC_HOST_ROOT="${KOKORO_HOST_ROOT_DIR}/src/git/${PDC_ROOT_DIR_NAME}"
 fi
 
 # This container is a reasonable start but is missing some prerequisite libs and
 # an installation of linux_perf. We'll manually add them below.
-readonly DOCKER_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20231218"
+readonly DOCKER_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20260131"
 
 time docker run \
-    --volume="${PDC_ROOT}:/perf_data_converter:ro" \
+    --mount "type=bind,src=${PDC_HOST_ROOT},target=/perf_data_converter" \
     --workdir=/perf_data_converter \
     --cap-add=SYS_PTRACE \
     --rm \
     -i \
-    -e CC="/opt/llvm/clang/bin/clang" \
+    -e CC="/opt/llvm/bin/clang" \
     -e BAZEL_CXXOPTS="-nostdinc++" \
     -e BAZEL_LINKOPTS="-L/opt/llvm/libcxx/lib:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/libcxx/lib" \
     -e CPLUS_INCLUDE_PATH="/opt/llvm/libcxx/include/c++/v1" \
+    -e BAZEL_LINKOPTS="-L/opt/llvm/lib/x86_64-unknown-linux-gnu:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/lib/x86_64-unknown-linux-gnu" \
+    -e CPLUS_INCLUDE_PATH="/opt/llvm/include/c++/v1:/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1/" \
     ${DOCKER_EXTRA_ARGS:-} \
     ${DOCKER_CONTAINER} \
     bash <<EOF
@@ -40,7 +44,6 @@ time docker run \
       /usr/local/bin/bazel test ... \
         --compilation_mode=fastbuild \
         --copt=-fexceptions \
-        --copt=-Werror \
         --distdir="/bazel-distdir" \
         --keep_going \
         --show_timestamps \
diff --git a/src/BUILD b/src/BUILD
index ec768a11..b12658e5 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -2,6 +2,9 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+
 package(
     default_visibility = [
         "//src:__subpackages__",
diff --git a/src/quipper/BUILD b/src/quipper/BUILD
index 4e03ad36..14002555 100644
--- a/src/quipper/BUILD
+++ b/src/quipper/BUILD
@@ -1,4 +1,11 @@
 
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 perf_test_data = glob([
diff --git a/src/quipper/perf_data_utils.cc b/src/quipper/perf_data_utils.cc
index 4bdbeacd..1a54767c 100644
--- a/src/quipper/perf_data_utils.cc
+++ b/src/quipper/perf_data_utils.cc
@@ -115,6 +115,8 @@ const PerfDataProto_SampleInfo* GetSampleInfoForEvent(
       return &event.cgroup_event().sample_info();
     case PERF_RECORD_KSYMBOL:
       return &event.ksymbol_event().sample_info();
+    case PERF_RECORD_BPF_METADATA:
+      return &event.bpf_metadata_event().sample_info();
   }
   return nullptr;
 }
@@ -555,7 +557,7 @@ bool GetEventDataVariablePayloadSize(const event_t& event,
                    << remaining_event_size;
         return false;
       }
-      *size = remaining_event_size;
+      *size = actual_entries * sizeof(struct bpf_metadata_entry);
       break;
     }
     // The below events changed size between kernel versions,
diff --git a/src/quipper/perf_parser_test.cc b/src/quipper/perf_parser_test.cc
index b2bc4ba3..8552d806 100644
--- a/src/quipper/perf_parser_test.cc
+++ b/src/quipper/perf_parser_test.cc
@@ -1904,7 +1904,8 @@ TEST(PerfParserTest, BpfMetadataEvents) {
       {
           {.key = "my_key", .value = "my_value"},
           {.key = "longer_key", .value = "slightly_different_value"},
-      });
+      },
+      testing::SampleInfo().Tid(2010));
 
   size_t data_size = event.GetSize();
 
diff --git a/src/quipper/perf_serializer_test.cc b/src/quipper/perf_serializer_test.cc
index 4caf5127..dbdd2f64 100644
--- a/src/quipper/perf_serializer_test.cc
+++ b/src/quipper/perf_serializer_test.cc
@@ -85,6 +85,8 @@ uint64_t GetSampleTimestampFromEventProto(
     return event.context_switch_event().sample_info().sample_time_ns();
   } else if (event.has_namespaces_event()) {
     return event.namespaces_event().sample_info().sample_time_ns();
+  } else if (event.has_bpf_metadata_event()) {
+    return event.bpf_metadata_event().sample_info().sample_time_ns();
   }
   return 0;
 }
@@ -1868,7 +1870,8 @@ TEST(PerfSerializerTest, SerializesAndDeserializesBpfEvents) {
       {
           {.key = "my_key", .value = "my_value"},
           {.key = "longer_key", .value = "slightly_different_value"},
-      })
+      },
+      testing::SampleInfo().Tid(2010))
       .WriteTo(&input);
 
   // Serialize.
diff --git a/src/quipper/sample_info_reader.cc b/src/quipper/sample_info_reader.cc
index 59e42f45..41dc2ec0 100644
--- a/src/quipper/sample_info_reader.cc
+++ b/src/quipper/sample_info_reader.cc
@@ -829,6 +829,7 @@ bool SampleInfoReader::IsSupportedEventType(uint32_t type) {
     case PERF_RECORD_MMAP:
     case PERF_RECORD_MMAP2:
     case PERF_RECORD_KSYMBOL:
+    case PERF_RECORD_BPF_METADATA:
     case PERF_RECORD_FORK:
     case PERF_RECORD_EXIT:
     case PERF_RECORD_COMM:
@@ -922,6 +923,7 @@ uint64_t SampleInfoReader::GetSampleFieldsForEventType(uint32_t event_type,
     case PERF_RECORD_FORK:
     case PERF_RECORD_MMAP2:
     case PERF_RECORD_KSYMBOL:
+    case PERF_RECORD_BPF_METADATA:
     case PERF_RECORD_AUX:
     case PERF_RECORD_ITRACE_START:
     case PERF_RECORD_LOST_SAMPLES:
diff --git a/src/quipper/test_perf_data.cc b/src/quipper/test_perf_data.cc
index 248a4a1d..ababd214 100644
--- a/src/quipper/test_perf_data.cc
+++ b/src/quipper/test_perf_data.cc
@@ -940,7 +940,8 @@ void ExampleKsymbolEvent::WriteTo(std::ostream* out) const {
 
 size_t ExampleBpfMetadataEvent::GetSize() const {
   return offsetof(struct bpf_metadata_event, entries) +
-         entries_.size() * sizeof(struct bpf_metadata_entry);
+         entries_.size() * sizeof(struct bpf_metadata_entry) +
+         sample_id_.size();  // sample_id_all
 }
 
 void ExampleBpfMetadataEvent::WriteTo(std::ostream* out) const {
@@ -960,7 +961,9 @@ void ExampleBpfMetadataEvent::WriteTo(std::ostream* out) const {
   }
 
   const size_t previous_offset = out->tellp();
-  out->write(reinterpret_cast<const char*>(event.get()), event_size);
+  out->write(reinterpret_cast<const char*>(event.get()),
+             event_size - sample_id_.size());
+  out->write(sample_id_.data(), sample_id_.size());
   const size_t written_event_size =
       static_cast<size_t>(out->tellp()) - previous_offset;
   CHECK_EQ(event_size, static_cast<u64>(written_event_size));
diff --git a/src/quipper/test_perf_data.h b/src/quipper/test_perf_data.h
index 2561a0a9..1f0a0fbd 100644
--- a/src/quipper/test_perf_data.h
+++ b/src/quipper/test_perf_data.h
@@ -958,14 +958,18 @@ class ExampleKsymbolEvent : public StreamWriteable {
 class ExampleBpfMetadataEvent : public StreamWriteable {
  public:
   ExampleBpfMetadataEvent(std::string prog_name,
-                          std::vector<struct bpf_metadata_entry> entries)
-      : prog_name_(prog_name), entries_(std::move(entries)) {}
+                          std::vector<struct bpf_metadata_entry> entries,
+                          const SampleInfo& sample_id)
+      : prog_name_(prog_name),
+        entries_(std::move(entries)),
+        sample_id_(sample_id) {}
   size_t GetSize() const;
   void WriteTo(std::ostream* out) const override;
 
  private:
   const std::string prog_name_;
   const std::vector<struct bpf_metadata_entry> entries_;
+  const SampleInfo sample_id_;
 };
 
 }  // namespace testing