Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(compute/build): normalise and bucket heap allocations #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Integralist merged 4 commits into from
Feb 14, 2024
Merged

fix(compute/build): normalise and bucket heap allocations #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b489fc1
fix(compute/build): normalise and bucket heap allocations
Integralist Feb 14, 2024
fbb6282
ci: bump go version to 1.22.x
Integralist Feb 14, 2024
9b7423a
ci: disable staticcheck until it's fixed
Integralist Feb 14, 2024
8babba8
doc(compute/build): typo
Integralist Feb 14, 2024
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
12 changes: 7 additions & 5 deletions .github/workflows/pr_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.21.x
go-version: 1.22.x
# NOTE: Manage GitHub Actions cache via https://github.com/fastly/cli/actions/caches
# This is useful if you need to clear the cache when a dependency doesn't update correctly.
#
Expand Down Expand Up @@ -76,9 +76,11 @@ jobs:
- name: "Run revive"
run: make revive
shell: bash
- name: "Static analysis check"
run: make staticcheck
shell: bash
# FIXME: Put back staticcheck once it fixes https://github.com/dominikh/go-tools/issues/1496
#
# - name: "Static analysis check"
# run: make staticcheck
# shell: bash
- name: "Security audit"
run: make gosec
shell: bash
Expand All @@ -87,7 +89,7 @@ jobs:
strategy:
matrix:
tinygo-version: [0.27.0]
go-version: [1.21.x]
go-version: [1.22.x]
node-version: [18]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: "Install Go"
uses: actions/setup-go@v4
with:
go-version: '1.21.x'
go-version: '1.22.x'
- name: "Set GOHOSTOS and GOHOSTARCH"
run: echo "GOHOSTOS=$(go env GOHOSTOS)" >> $GITHUB_ENV && echo "GOHOSTARCH=$(go env GOHOSTARCH)" >> $GITHUB_ENV
- name: "Install Rust"
Expand Down
34 changes: 32 additions & 2 deletions pkg/commands/compute/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"io"
"math"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -327,7 +328,7 @@ func (c *BuildCommand) AnnotateWasmBinaryLong(wasmtools string, args []string, l

if metadata.BuildInfo == "enable" {
dc.BuildInfo = DataCollectionBuildInfo{
MemoryHeapAlloc: ms.HeapAlloc,
MemoryHeapAlloc: bucketMB(bytesToMB(ms.HeapAlloc)) + "MB",
}
}
if metadata.MachineInfo == "enable" {
Expand Down Expand Up @@ -823,6 +824,35 @@ func GetNonIgnoredFiles(base string, ignoredFiles map[string]bool) ([]string, er
return files, err
}

// bytesToMB converts the runtime.MemStats.HeapAlloc bytes into megabytes.
func bytesToMB(bytes uint64) uint64 {
return uint64(math.Round(float64(bytes) / (1024 * 1024)))
}

// bucketMB determines a consistent bucket size for heap allocation.
// NOTE: This is to avoid building a package with a fluctuating hashsum.
// e.g. `fastly compute hash-files` should be consistent unless memory increase is significant.
func bucketMB(mb uint64) string {
switch {
case mb < 2:
return "<2"
case mb >= 2 && mb < 5:
return "2-5"
case mb >= 5 && mb < 10:
return "5-10"
case mb >= 10 && mb < 20:
return "10-20"
case mb >= 20 && mb < 30:
return "20-30"
case mb >= 30 && mb < 40:
return "30-40"
case mb >= 40 && mb < 50:
return "40-50"
default:
return ">50"
}
}

// DataCollection represents data annotated onto the Wasm binary.
type DataCollection struct {
BuildInfo DataCollectionBuildInfo `json:"build_info,omitempty"`
Expand All @@ -833,7 +863,7 @@ type DataCollection struct {

// DataCollectionBuildInfo represents build data annotated onto the Wasm binary.
type DataCollectionBuildInfo struct {
MemoryHeapAlloc uint64 `json:"mem_heap_alloc,omitempty"`
MemoryHeapAlloc string `json:"mem_heap_alloc,omitempty"`
}

// DataCollectionMachineInfo represents machine data annotated onto the Wasm binary.
Expand Down