Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Main (unreleased)
-
- Support delimiters in `stage.luhn`. (@dehaansa)

- pyroscope.java: update async-profiler to 4.2 (@korniltsev-grafanista)
- Improve debug info output from exported receivers (loki, prometheus and pyroscope). (@kalleep)

- `prometheus.exporter.unix`: Add an `arp` config block to configure the ARP collector. (@ptodev)
Expand Down
2 changes: 1 addition & 1 deletion internal/component/pyroscope/java/asprof/asprof.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func ExtractDistribution(a Archive, tmpDir, distName string) (Distribution, erro

var launcher, lib []byte
err := readArchive(a.data, a.format, func(name string, fi fs.FileInfo, data []byte) error {
if strings.Contains(name, "asprof") {
if strings.HasSuffix(name, "/asprof") {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previous check captured asprof.h header file instead of the binary

launcher = data
}
if strings.Contains(name, "libasyncProfiler") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
)

//go:embed async-profiler-4.0-87b7b42-macos.zip
//go:embed async-profiler-4.2-macos.zip
var embeddedArchiveData []byte

// bin/asprof
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
_ "embed"
)

//go:embed async-profiler-4.0-87b7b42-linux-x64.tar.gz
//go:embed async-profiler-4.2-linux-x64.tar.gz
var embeddedArchiveData []byte

// bin/asprof
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
_ "embed"
)

//go:embed async-profiler-4.0-87b7b42-linux-arm64.tar.gz
//go:embed async-profiler-4.2-linux-arm64.tar.gz
var embeddedArchiveData []byte

// bin/asprof
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.