Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Add actions job log buffer and profiler#866

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.

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

Already on GitHub?Sign in to your account

Merged
mattdholloway merged 46 commits intomainfromactions-job-log-buffer
Aug 19, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
46 commits
Select commitHold shift + click to select a range
8a5efb9
add sliding window for actions logs
mattdhollowayAug 12, 2025
e6ef962
refactor: fix sliding
mattdhollowayAug 12, 2025
271c7c2
remove trim content
mattdhollowayAug 12, 2025
e65c0f0
only use up to 1mb of memory for logs
mattdhollowayAug 12, 2025
ade3852
update to tail lines in second pass
mattdhollowayAug 13, 2025
5a76cbd
add better memory usage calculation
mattdhollowayAug 13, 2025
8e60fb2
increase window size to 5MB
mattdhollowayAug 13, 2025
e1c3143
update test
mattdhollowayAug 13, 2025
75dc8e7
Merge branch 'main' into actions-job-log-buffer
mattdhollowayAug 13, 2025
b128e44
Merge branch 'actions-job-log-buffer' of https://github.com/github/gi…
mattdhollowayAug 13, 2025
88d16d2
Merge branch 'main' into actions-job-log-buffer
mattdhollowayAug 14, 2025
4bf84b2
Merge branch 'main' into actions-job-log-buffer
mattdhollowayAug 15, 2025
6b8f2ba
update vers
mattdhollowayAug 15, 2025
8002fbd
undo vers change
mattdhollowayAug 15, 2025
52e531e
add incremental memory tracking
mattdhollowayAug 15, 2025
8f85398
use ring buffer
mattdhollowayAug 15, 2025
0d19480
remove unused ctx param
mattdhollowayAug 15, 2025
f104e67
remove manual GC clear
mattdhollowayAug 15, 2025
9d273b9
fix cca feedback
mattdhollowayAug 15, 2025
4e43327
extract ring buffer logic to new package
mattdhollowayAug 15, 2025
2ff2d4f
handle log content processing errors and use correct param for maxjob…
mattdhollowayAug 15, 2025
c6f5f7f
fix tailing
mattdhollowayAug 15, 2025
1c1061c
account for if tailLines exceeds window size
mattdhollowayAug 15, 2025
75b8c94
add profiling thats reusable
mattdhollowayAug 15, 2025
71bfac8
remove profiler testing
mattdhollowayAug 15, 2025
a43b03c
refactor profiler: introduce safeMemoryDelta for accurate memory delt…
mattdhollowayAug 15, 2025
d9c8825
linter fixes
mattdhollowayAug 15, 2025
ec070ee
Update pkg/buffer/buffer.go
mattdhollowayAug 15, 2025
0434b7e
use flag for maxJobLogLines
mattdhollowayAug 18, 2025
fb301c6
add param passing for context window size
mattdhollowayAug 18, 2025
106d802
refactor: rename contextWindowSize to contentWindowSize for consistency
mattdhollowayAug 18, 2025
516c0f7
fix: use tailLines if bigger but only if <= 5000
mattdhollowayAug 18, 2025
6c3c31a
fix: limit tailLines to a maximum of 500 for log content download
mattdhollowayAug 18, 2025
82d4ce2
Update cmd/github-mcp-server/main.go
mattdhollowayAug 18, 2025
e40e289
Update cmd/github-mcp-server/main.go
mattdhollowayAug 18, 2025
4310db8
move profiler to internal/
mattdhollowayAug 18, 2025
e0767fe
update actions test with new profiler location
mattdhollowayAug 18, 2025
9677c07
fix: adjust buffer size limits
mattdhollowayAug 18, 2025
ed6bc2d
make line buffer 1028kb
mattdhollowayAug 18, 2025
696e5fd
fix mod path
mattdhollowayAug 18, 2025
10e1995
change test to use same buffer size as normal use
mattdhollowayAug 18, 2025
2eb2e16
improve test for non-sliding window implementation to not count empty…
mattdhollowayAug 18, 2025
47aaa01
make test memory measurement more accurate
mattdhollowayAug 18, 2025
6b910ff
Merge branch 'main' into actions-job-log-buffer
mattdhollowayAug 18, 2025
4a673c9
Merge branch 'main' into actions-job-log-buffer
mattdhollowayAug 18, 2025
556a41c
remove impossible conditional
mattdhollowayAug 18, 2025
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
4 changes: 2 additions & 2 deletionscmd/github-mcp-server/generate_docs.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func generateReadmeDocs(readmePath string) error {
t, _ := translations.TranslationHelper()

// Create toolset group with mock clients
tsg := github.DefaultToolsetGroup(false, mockGetClient, mockGetGQLClient, mockGetRawClient, t)
tsg := github.DefaultToolsetGroup(false, mockGetClient, mockGetGQLClient, mockGetRawClient, t, 5000)

// Generate toolsets documentation
toolsetsDoc := generateToolsetsDoc(tsg)
Expand DownExpand Up@@ -302,7 +302,7 @@ func generateRemoteToolsetsDoc() string {
t, _ := translations.TranslationHelper()

// Create toolset group with mock clients
tsg := github.DefaultToolsetGroup(false, mockGetClient, mockGetGQLClient, mockGetRawClient, t)
tsg := github.DefaultToolsetGroup(false, mockGetClient, mockGetGQLClient, mockGetRawClient, t, 5000)

// Generate table header
buf.WriteString("| Name | Description | API URL | 1-Click Install (VS Code) | Read-only Link | 1-Click Read-only Install (VS Code) |\n")
Expand Down
3 changes: 3 additions & 0 deletionscmd/github-mcp-server/main.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ var (
ExportTranslations: viper.GetBool("export-translations"),
EnableCommandLogging: viper.GetBool("enable-command-logging"),
LogFilePath: viper.GetString("log-file"),
ContentWindowSize: viper.GetInt("content-window-size"),
}
return ghmcp.RunStdioServer(stdioServerConfig)
},
Expand All@@ -75,6 +76,7 @@ func init() {
rootCmd.PersistentFlags().Bool("enable-command-logging", false, "When enabled, the server will log all command requests and responses to the log file")
rootCmd.PersistentFlags().Bool("export-translations", false, "Save translations to a JSON file")
rootCmd.PersistentFlags().String("gh-host", "", "Specify the GitHub hostname (for GitHub Enterprise etc.)")
rootCmd.PersistentFlags().Int("content-window-size", 5000, "Specify the content window size")

// Bind flag to viper
_ = viper.BindPFlag("toolsets", rootCmd.PersistentFlags().Lookup("toolsets"))
Expand All@@ -84,6 +86,7 @@ func init() {
_ = viper.BindPFlag("enable-command-logging", rootCmd.PersistentFlags().Lookup("enable-command-logging"))
_ = viper.BindPFlag("export-translations", rootCmd.PersistentFlags().Lookup("export-translations"))
_ = viper.BindPFlag("host", rootCmd.PersistentFlags().Lookup("gh-host"))
_ = viper.BindPFlag("content-window-size", rootCmd.PersistentFlags().Lookup("content-window-size"))

// Add subcommands
rootCmd.AddCommand(stdioCmd)
Expand Down
23 changes: 15 additions & 8 deletionsinternal/ghmcp/server.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ type MCPServerConfig struct {

// Translator provides translated text for the server tooling
Translator translations.TranslationHelperFunc

// Content window size
ContentWindowSize int
}

const stdioServerLogPrefix = "stdioserver"
Expand DownExpand Up@@ -132,7 +135,7 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
}

// Create default toolsets
tsg := github.DefaultToolsetGroup(cfg.ReadOnly, getClient, getGQLClient, getRawClient, cfg.Translator)
tsg := github.DefaultToolsetGroup(cfg.ReadOnly, getClient, getGQLClient, getRawClient, cfg.Translator, cfg.ContentWindowSize)
err = tsg.EnableToolsets(enabledToolsets)

if err != nil {
Expand DownExpand Up@@ -180,6 +183,9 @@ type StdioServerConfig struct {

// Path to the log file if not stderr
LogFilePath string

// Content window size
ContentWindowSize int
}

// RunStdioServer is not concurrent safe.
Expand All@@ -191,13 +197,14 @@ func RunStdioServer(cfg StdioServerConfig) error {
t, dumpTranslations := translations.TranslationHelper()

ghServer, err := NewMCPServer(MCPServerConfig{
Version: cfg.Version,
Host: cfg.Host,
Token: cfg.Token,
EnabledToolsets: cfg.EnabledToolsets,
DynamicToolsets: cfg.DynamicToolsets,
ReadOnly: cfg.ReadOnly,
Translator: t,
Version: cfg.Version,
Host: cfg.Host,
Token: cfg.Token,
EnabledToolsets: cfg.EnabledToolsets,
DynamicToolsets: cfg.DynamicToolsets,
ReadOnly: cfg.ReadOnly,
Translator: t,
ContentWindowSize: cfg.ContentWindowSize,
})
if err != nil {
return fmt.Errorf("failed to create MCP server: %w", err)
Expand Down
215 changes: 215 additions & 0 deletionsinternal/profiler/profiler.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
package profiler

import (
"context"
"fmt"
"os"
"runtime"
"strconv"
"time"

"log/slog"
"math"
)

// Profile represents performance metrics for an operation
type Profile struct {
Operation string `json:"operation"`
Duration time.Duration `json:"duration_ns"`
MemoryBefore uint64 `json:"memory_before_bytes"`
MemoryAfter uint64 `json:"memory_after_bytes"`
MemoryDelta int64 `json:"memory_delta_bytes"`
LinesCount int `json:"lines_count,omitempty"`
BytesCount int64 `json:"bytes_count,omitempty"`
Timestamp time.Time `json:"timestamp"`
}

// String returns a human-readable representation of the profile
func (p *Profile) String() string {
return fmt.Sprintf("[%s] %s: duration=%v, memory_delta=%+dB, lines=%d, bytes=%d",
p.Timestamp.Format("15:04:05.000"),
p.Operation,
p.Duration,
p.MemoryDelta,
p.LinesCount,
p.BytesCount,
)
}

func safeMemoryDelta(after, before uint64) int64 {
if after > math.MaxInt64 || before > math.MaxInt64 {
if after >= before {
diff := after - before
if diff > math.MaxInt64 {
return math.MaxInt64
}
return int64(diff)
}
diff := before - after
if diff > math.MaxInt64 {
return -math.MaxInt64
}
return -int64(diff)
}

return int64(after) - int64(before)

Choose a reason for hiding this comment

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

This condition checks if either value exceeds MaxInt64, but since these are uint64 values, they can legitimately be larger than MaxInt64. The logic should handle the conversion more clearly by checking if the difference itself would overflow int64 bounds.

Suggested change
returnint64(after)-int64(before)
ifafter>=before {
diff:=after-before
ifdiff> math.MaxInt64 {
returnmath.MaxInt64
}
returnint64(diff)
}
diff:=before-after
ifdiff> math.MaxInt64 {
return-math.MaxInt64
}
return-int64(diff)

Copilot uses AI. Check for mistakes.

}

// Profiler provides minimal performance profiling capabilities
type Profiler struct {
logger *slog.Logger
enabled bool
}

// New creates a new Profiler instance
func New(logger *slog.Logger, enabled bool) *Profiler {
return &Profiler{
logger: logger,
enabled: enabled,
}
}

// ProfileFunc profiles a function execution
func (p *Profiler) ProfileFunc(ctx context.Context, operation string, fn func() error) (*Profile, error) {
if !p.enabled {
return nil, fn()
}

profile := &Profile{
Operation: operation,
Timestamp: time.Now(),
}

var memBefore runtime.MemStats
runtime.ReadMemStats(&memBefore)
profile.MemoryBefore = memBefore.Alloc

start := time.Now()
err := fn()
profile.Duration = time.Since(start)

var memAfter runtime.MemStats
runtime.ReadMemStats(&memAfter)
profile.MemoryAfter = memAfter.Alloc
profile.MemoryDelta = safeMemoryDelta(memAfter.Alloc, memBefore.Alloc)

if p.logger != nil {
p.logger.InfoContext(ctx, "Performance profile", "profile", profile.String())
}

return profile, err
}

// ProfileFuncWithMetrics profiles a function execution and captures additional metrics
func (p *Profiler) ProfileFuncWithMetrics(ctx context.Context, operation string, fn func() (int, int64, error)) (*Profile, error) {
if !p.enabled {
_, _, err := fn()
return nil, err
}

profile := &Profile{
Operation: operation,
Timestamp: time.Now(),
}

var memBefore runtime.MemStats
runtime.ReadMemStats(&memBefore)
profile.MemoryBefore = memBefore.Alloc

start := time.Now()
lines, bytes, err := fn()
profile.Duration = time.Since(start)
profile.LinesCount = lines
profile.BytesCount = bytes

var memAfter runtime.MemStats
runtime.ReadMemStats(&memAfter)
profile.MemoryAfter = memAfter.Alloc
profile.MemoryDelta = safeMemoryDelta(memAfter.Alloc, memBefore.Alloc)

if p.logger != nil {
p.logger.InfoContext(ctx, "Performance profile", "profile", profile.String())
}

return profile, err
}

// Start begins timing an operation and returns a function to complete the profiling
func (p *Profiler) Start(ctx context.Context, operation string) func(lines int, bytes int64) *Profile {
if !p.enabled {
return func(int, int64) *Profile { return nil }
}

profile := &Profile{
Operation: operation,
Timestamp: time.Now(),
}

var memBefore runtime.MemStats
runtime.ReadMemStats(&memBefore)
profile.MemoryBefore = memBefore.Alloc

start := time.Now()

return func(lines int, bytes int64) *Profile {
profile.Duration = time.Since(start)
profile.LinesCount = lines
profile.BytesCount = bytes

var memAfter runtime.MemStats
runtime.ReadMemStats(&memAfter)
profile.MemoryAfter = memAfter.Alloc
profile.MemoryDelta = safeMemoryDelta(memAfter.Alloc, memBefore.Alloc)

if p.logger != nil {
p.logger.InfoContext(ctx, "Performance profile", "profile", profile.String())
}

return profile
}
}

var globalProfiler *Profiler

// IsProfilingEnabled checks if profiling is enabled via environment variables
func IsProfilingEnabled() bool {
if enabled, err := strconv.ParseBool(os.Getenv("GITHUB_MCP_PROFILING_ENABLED")); err == nil {
return enabled
}
return false
}

// Init initializes the global profiler
func Init(logger *slog.Logger, enabled bool) {
globalProfiler = New(logger, enabled)
}

// InitFromEnv initializes the global profiler using environment variables
func InitFromEnv(logger *slog.Logger) {
globalProfiler = New(logger, IsProfilingEnabled())
}

// ProfileFunc profiles a function using the global profiler
func ProfileFunc(ctx context.Context, operation string, fn func() error) (*Profile, error) {
if globalProfiler == nil {
return nil, fn()
}
return globalProfiler.ProfileFunc(ctx, operation, fn)
}

// ProfileFuncWithMetrics profiles a function with metrics using the global profiler
func ProfileFuncWithMetrics(ctx context.Context, operation string, fn func() (int, int64, error)) (*Profile, error) {
if globalProfiler == nil {
_, _, err := fn()
return nil, err
}
return globalProfiler.ProfileFuncWithMetrics(ctx, operation, fn)
}

// Start begins timing using the global profiler
func Start(ctx context.Context, operation string) func(int, int64) *Profile {
if globalProfiler == nil {
return func(int, int64) *Profile { return nil }
}
return globalProfiler.Start(ctx, operation)
}
69 changes: 69 additions & 0 deletionspkg/buffer/buffer.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
package buffer

import (
"bufio"
"fmt"
"net/http"
"strings"
)

// ProcessResponseAsRingBufferToEnd reads the body of an HTTP response line by line,
// storing only the last maxJobLogLines lines using a ring buffer (sliding window).
// This efficiently retains the most recent lines, overwriting older ones as needed.
//
// Parameters:
//
//httpResp: The HTTP response whose body will be read.
//maxJobLogLines: The maximum number of log lines to retain.
//
// Returns:
//
//string: The concatenated log lines (up to maxJobLogLines), separated by newlines.
//int: The total number of lines read from the response.
//*http.Response: The original HTTP response.
//error: Any error encountered during reading.
//
// The function uses a ring buffer to efficiently store only the last maxJobLogLines lines.
// If the response contains more lines than maxJobLogLines, only the most recent lines are kept.
func ProcessResponseAsRingBufferToEnd(httpResp *http.Response, maxJobLogLines int) (string, int, *http.Response, error) {
lines := make([]string, maxJobLogLines)
validLines := make([]bool, maxJobLogLines)
totalLines := 0
writeIndex := 0

scanner := bufio.NewScanner(httpResp.Body)
scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)

for scanner.Scan() {
line := scanner.Text()
totalLines++

lines[writeIndex] = line
validLines[writeIndex] = true
writeIndex = (writeIndex + 1) % maxJobLogLines
}

if err := scanner.Err(); err != nil {
return "", 0, httpResp, fmt.Errorf("failed to read log content: %w", err)
}

var result []string
linesInBuffer := totalLines
if linesInBuffer > maxJobLogLines {
linesInBuffer = maxJobLogLines
}

startIndex := 0
if totalLines > maxJobLogLines {
startIndex = writeIndex
}

for i := 0; i < linesInBuffer; i++ {
idx := (startIndex + i) % maxJobLogLines
if validLines[idx] {
result = append(result, lines[idx])
}
}

return strings.Join(result, "\n"), totalLines, httpResp, nil
}
Loading
Loading

[8]ページ先頭

©2009-2025 Movatter.jp