Merge pull request #253 from parca-dev/upstream-merge

Merge 8 upstream commits (up to lock file maintenance open-telemetry#1251)

Author: gnurizen

.github/workflows/unit-test-on-pull-request.yml

@@ -183,7 +183,7 @@ jobs:
           go install github.com/florianl/bluebox@v0.0.1
           sudo mv ~/go/bin/bluebox /usr/local/bin/.
       - name: Fetch integration test binaries
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with: { name: "integration-test-binaries-${{ matrix.target_arch }}" }
       - name: Fetch precompiled kernel
         run: |

Cargo.lock

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build linux
+//go:build linux && (amd64 || arm64)
 
 package collector // import "go.opentelemetry.io/ebpf-profiler/collector"
 

collector/factory_linux.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build !linux
+//go:build !(linux && (amd64 || arm64))
 
 package collector // import "go.opentelemetry.io/ebpf-profiler/collector"
 
@@ -21,7 +21,7 @@ func BuildProfilesReceiver(options ...Option) xreceiver.CreateProfilesFunc {
 		_ component.Config,
 		_ xconsumer.Profiles,
 	) (xreceiver.Profiles, error) {
-		return nil, errors.New("profiling receiver is only supported on Linux")
+		return nil, errors.New("profiling receiver is only supported on Linux and arm64 or amd64")
 
 	}
 }

collector/factory_others.go

@@ -46,7 +46,7 @@ require (
 	go.uber.org/zap/exp v0.3.0
 	golang.org/x/arch v0.25.0
 	golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa
-	golang.org/x/mod v0.33.0
+	golang.org/x/mod v0.34.0
 	golang.org/x/sync v0.20.0
 	golang.org/x/sys v0.42.0
 	google.golang.org/grpc v1.79.2

go.mod

@@ -312,8 +312,8 @@ golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
 golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
 golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

go.sum

@@ -166,17 +166,18 @@ type hotspotVMData struct {
 			ConstMethod uint `name:"_constMethod"`
 		} `name:"Method,methodOopDesc"`
 		Nmethod struct { // .Sizeof >256
-			Sizeof             uint
-			CompileID          uint `name:"_compile_id"`
-			MetadataOffset     uint `name:"_metadata_offset,_oops_offset"`
-			ScopesPcsOffset    uint `name:"_scopes_pcs_offset"`
-			DependenciesOffset uint `name:"_dependencies_offset"` // JDK -22 only
-			ImmutableData      uint `name:"_immutable_data"`      // JDK 23+ only
-			ImmutableDataSize  uint `name:"_immutable_data_size"` // JDK 23+ only
-			OrigPcOffset       uint `name:"_orig_pc_offset"`
-			DeoptimizeOffset   uint `name:"_deoptimize_offset,_deopt_handler_offset,_deopt_handler_begin"`
-			Method             uint `name:"_method"`
-			ScopesDataOffset   uint `name:"_scopes_data_offset,_scopes_data_begin"`
+			Sizeof                   uint
+			CompileID                uint `name:"_compile_id"`
+			MetadataOffset           uint `name:"_metadata_offset,_oops_offset"`
+			ScopesPcsOffset          uint `name:"_scopes_pcs_offset"`
+			DependenciesOffset       uint `name:"_dependencies_offset"`             // JDK -22 only
+			ImmutableData            uint `name:"_immutable_data"`                  // JDK 23+ only
+			ImmutableDataSize        uint `name:"_immutable_data_size"`             // JDK 23+ only
+			ImmutableDataRefCountOff uint `name:"_immutable_data_ref_count_offset"` // JDK 26+ only
+			OrigPcOffset             uint `name:"_orig_pc_offset"`
+			DeoptimizeOffset         uint `name:"_deoptimize_offset,_deopt_handler_offset,_deopt_handler_begin,_deopt_handler_entry_offset"`
+			Method                   uint `name:"_method"`
+			ScopesDataOffset         uint `name:"_scopes_data_offset,_scopes_data_begin"`
 		} `name:"nmethod,CompiledMethod"`
 		OopDesc struct {
 			Sizeof uint
@@ -601,6 +602,11 @@ func (d *hotspotData) newVMData(rm remotememory.RemoteMemory, bias libpf.Address
 		vms.CodeBlob.RelocationSize = 0
 	}
 
+	// JDK26+: immutable data has a ref count trailer; not present prior to JDK26
+	if vms.Nmethod.ImmutableDataRefCountOff == ^uint(0) {
+		vms.Nmethod.ImmutableDataRefCountOff = 0
+	}
+
 	// Check that all symbols got loaded from JVM introspection data
 	err := forEachItem("", reflect.ValueOf(&vmd.vmStructs).Elem(),
 		func(item reflect.Value, name string) error {

interpreter/hotspot/data.go

@@ -78,6 +78,9 @@ package hotspot // import "go.opentelemetry.io/ebpf-profiler/interpreter/hotspot
 //  JDK24 - Tested ok
 //   - nmethod metadata moved to codeblob mutable data area
 //  JDK25 - Tested ok
+//  JDK26 - Tested ok
+//   - nmethod._deopt_handler_offset renamed to _deopt_handler_entry_offset
+//   - immutable_data now has ref count trailer (_immutable_data_ref_count_offset)
 //
 // NOTE: Ahead-Of-Time compilation (AOT) is NOT SUPPORTED. The main complication is that, the AOT
 // ELF files are mapped directly to the program virtual space, and contain the code to execute.

interpreter/hotspot/hotspot.go

@@ -511,7 +511,8 @@ func (d *hotspotInstance) getJITInfo(addr libpf.Address, addrCheck uint32) (
 		// [scopes_data]	@ _immutable_data + nmethod._scopes_data_begin	\ arrays we need
 		// [scopes_pcs]		@ _immutable_data + nmethod._scopes_pcs_offset	/ for inlining info
 		// [speculations]	@ _immutable_data + nmethod._speculations_offset
-		// [end]		@ _immutable_Data + nmethod._immutable_data_size
+		// [end]		    @ _immutable_data + nmethod._immutable_data_size
+		// [end]            @ _immutable_data + min(_immutable_data_size, _immutable_data_ref_count_offset)  (JDK 26+)
 		// ...
 		// speculations presence depends on JDK build, and is not used. Instead the scopes
 		// end is determined from immutable data size.
@@ -535,6 +536,15 @@ func (d *hotspotInstance) getJITInfo(addr libpf.Address, addrCheck uint32) (
 		scopesDataOff := npsr.PtrDiff32(nmethod, vms.Nmethod.ScopesDataOffset)
 		immutableDataPtr := npsr.Ptr(nmethod, vms.Nmethod.ImmutableData)
 		immutableDataSize := npsr.Uint32(nmethod, vms.Nmethod.ImmutableDataSize)
+
+		// JDK26+: immutable data ends at ref_count offset, not at immutable_data_size
+		if vms.Nmethod.ImmutableDataRefCountOff != 0 {
+			immutableDataRefCountOff := npsr.Uint32(nmethod, vms.Nmethod.ImmutableDataRefCountOff)
+			if immutableDataRefCountOff < immutableDataSize {
+				immutableDataSize = immutableDataRefCountOff
+			}
+		}
+
 		if immutableDataSize >= maxMetadataSize {
 			return nil, fmt.Errorf("unreasonably large immutable data region: %d bytes",
 				immutableDataSize)