[1.9] Backport #1643 (#1646)

grafana · Feb 12, 2025 · 707adee · 707adee
1 parent cb0dc11
commit 707adee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/clang-tidy-check.yml b/.github/workflows/clang-tidy-check.yml
@@ -21,10 +21,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y wget lsb-release software-properties-common gnupg
           wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-          sudo add-apt-repository -y 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main'
-          sudo apt-get install -y clang-tidy-20
-
+          sudo add-apt-repository -y 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble main'
+          sudo apt-get install -y clang-tidy-19
+          
       - name: Check Clang Tidy
         run: |
-          CLANG_TIDY=clang-tidy-20 make clang-tidy
-
+          CLANG_TIDY=clang-tidy-19 make clang-tidy
diff --git a/pkg/internal/ebpf/common/http2grpc_transform.go b/pkg/internal/ebpf/common/http2grpc_transform.go
@@ -84,6 +84,7 @@ func knownFrameKeys(fr *http2.Framer, hf *http2.HeadersFrame) bool {
 	})
 	// Lose reference to MetaHeadersFrame:
 	defer commonHDec.SetEmitFunc(func(_ bhpack.HeaderField) {})
+	defer commonHDec.Close()
 
 	for {
 		frag := hf.HeaderBlockFragment()
@@ -133,6 +134,7 @@ func readMetaFrame(conn *BPFConnInfo, fr *http2.Framer, hf *http2.HeadersFrame)
 	})
 	// Lose reference to MetaHeadersFrame:
 	defer h2c.hdec.SetEmitFunc(func(_ bhpack.HeaderField) {})
+	defer h2c.hdec.Close()
 
 	for {
 		frag := hf.HeaderBlockFragment()
@@ -191,6 +193,7 @@ func readRetMetaFrame(conn *BPFConnInfo, fr *http2.Framer, hf *http2.HeadersFram
 	})
 	// Lose reference to MetaHeadersFrame:
 	defer h2c.hdecRet.SetEmitFunc(func(_ bhpack.HeaderField) {})
+	defer h2c.hdecRet.Close()
 
 	for {
 		frag := hf.HeaderBlockFragment()