Merge pull request #181 from buildkite/chore_buildkite_logs_update

chore(deps): bump buildkite-logs to the latest version

Author: wolfeidau

go.mod

@@ -4,7 +4,7 @@ go 1.24.5
 
 require (
 	github.com/alecthomas/kong v1.12.1
-	github.com/buildkite/buildkite-logs v0.6.1
+	github.com/buildkite/buildkite-logs v0.6.2
 	github.com/buildkite/go-buildkite/v4 v4.9.1
 	github.com/cenkalti/backoff/v5 v5.0.3
 	github.com/mark3labs/mcp-go v0.43.0

go.sum

@@ -76,8 +76,8 @@ github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPn
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/buildkite/buildkite-logs v0.6.1 h1:5SlAsAFYKy1rl3j7GNldgeOzBMbuKYSgdFlvNnVINEs=
-github.com/buildkite/buildkite-logs v0.6.1/go.mod h1:ejxwp0IDk7Wd0yTH0Cvnw8GgRGnpboe6Up4k9SGmWTg=
+github.com/buildkite/buildkite-logs v0.6.2 h1:6QyxaPh0Ydn2TkBinzODEmhh1l4W4hmRKMkW216JOY0=
+github.com/buildkite/buildkite-logs v0.6.2/go.mod h1:5kxG9E/GTERyOBpMitXNFi9Q0YyFL+niBUO25TkPQa8=
 github.com/buildkite/go-buildkite/v4 v4.9.1 h1:dA32pinTsHMTCHO84awc9W9Y21knlPjd/ZOSntMPIb0=
 github.com/buildkite/go-buildkite/v4 v4.9.1/go.mod h1:DlebrRJqpZttXDjCW+MJ1QyW9AN++ZWt/UbPtKdbSSk=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=

pkg/buildkite/joblogs.go

@@ -65,7 +65,6 @@ type TerseLogEntry struct {
 type SearchResult = buildkitelogs.SearchResult
 type FileInfo struct {
 	buildkitelogs.ParquetFileInfo
-	CacheFile string `json:"cache_file"`
 }
 
 type LogResponse struct {
@@ -82,18 +81,14 @@ type SearchOptions = buildkitelogs.SearchOptions
 
 // Real implementation using buildkite-logs-parquet library with injected client
 func newParquetReader(ctx context.Context, client BuildkiteLogsClient, params JobLogsBaseParams) (*buildkitelogs.ParquetReader, error) {
-	// Parse cache TTL
 	ttl := parseCacheTTL(params.CacheTTL)
 
-	// Download and cache the logs using injected client
 	cacheFilePath, err := client.DownloadAndCache(ctx, params.OrgSlug, params.PipelineSlug, params.BuildNumber, params.JobID, ttl, params.ForceRefresh)
 	if err != nil {
 		return nil, fmt.Errorf("failed to download/cache logs: %w", err)
 	}
 
-	// Create parquet reader from cached file
-	reader := buildkitelogs.NewParquetReader(cacheFilePath)
-	return reader, nil
+	return buildkitelogs.NewParquetReader(cacheFilePath), nil
 }
 
 func parseCacheTTL(ttlStr string) time.Duration {
@@ -210,18 +205,15 @@ func SearchLogs(client BuildkiteLogsClient) (tool mcp.Tool, handler mcp.TypedToo
 				attribute.Int("limit", params.Limit),
 			)
 
-			// Validate search pattern
 			if err := validateSearchPattern(params.Pattern); err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
-			// Create parquet reader
 			reader, err := newParquetReader(ctx, client, params.JobLogsBaseParams)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to create log reader: %v", err)), nil
 			}
 
-			// Build search options
 			opts := SearchOptions{
 				Pattern:       params.Pattern,
 				CaseSensitive: params.CaseSensitive,
@@ -232,7 +224,6 @@ func SearchLogs(client BuildkiteLogsClient) (tool mcp.Tool, handler mcp.TypedToo
 				AfterContext:  params.AfterContext,
 			}
 
-			// Perform search using iterator
 			var results []SearchResult
 			count := 0
 			for result, err := range reader.SearchEntriesIter(opts) {
@@ -316,25 +307,18 @@ func TailLogs(client BuildkiteLogsClient) (tool mcp.Tool, handler mcp.TypedToolH
 				attribute.Int("tail", params.Tail),
 			)
 
-			// Create parquet reader
 			reader, err := newParquetReader(ctx, client, params.JobLogsBaseParams)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to create log reader: %v", err)), nil
 			}
 
-			// Get file info first to calculate tail position
 			fileInfo, err := reader.GetFileInfo()
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to get file info: %v", err)), nil
 			}
 
-			// Calculate starting position for tail
-			startRow := fileInfo.RowCount - int64(params.Tail)
-			if startRow < 0 {
-				startRow = 0
-			}
+			startRow := max(fileInfo.RowCount-int64(params.Tail), 0)
 
-			// Get tail entries using SeekToRow
 			var entries []buildkitelogs.ParquetLogEntry
 			for entry, err := range reader.SeekToRow(startRow) {
 				if err != nil {
@@ -401,28 +385,18 @@ func GetLogsInfo(client BuildkiteLogsClient) (tool mcp.Tool, handler mcp.TypedTo
 				attribute.String("job_id", params.JobID),
 			)
 
-			// Create parquet reader
 			reader, err := newParquetReader(ctx, client, params)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to create log reader: %v", err)), nil
 			}
 
-			// Get file info
 			libFileInfo, err := reader.GetFileInfo()
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to get file info: %v", err)), nil
 			}
 
-			// Get cache file path
-			cacheFile, err := buildkitelogs.GetCacheFilePath(params.OrgSlug, params.PipelineSlug, params.BuildNumber, params.JobID)
-			if err != nil {
-				return mcp.NewToolResultError(fmt.Sprintf("Failed to get cache file path: %v", err)), nil
-			}
-
-			// Create our response with additional cache file info
 			fileInfo := &FileInfo{
 				ParquetFileInfo: *libFileInfo,
-				CacheFile:       cacheFile,
 			}
 
 			queryTime := time.Since(startTime)
@@ -487,17 +461,14 @@ func ReadLogs(client BuildkiteLogsClient) (tool mcp.Tool, handler mcp.TypedToolH
 				attribute.Int("limit", params.Limit),
 			)
 
-			// Create parquet reader
 			reader, err := newParquetReader(ctx, client, params.JobLogsBaseParams)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("Failed to create log reader: %v", err)), nil
 			}
 
-			// Read entries with seek and limit
 			var entries []buildkitelogs.ParquetLogEntry
 			count := 0
 
-			// Choose iterator based on seek parameter
 			var entryIter iter.Seq2[buildkitelogs.ParquetLogEntry, error]
 			if params.Seek > 0 {
 				entryIter = reader.SeekToRow(int64(params.Seek))