feat: ACI-4571 Get benchmark phase by zsolt-marta-bitrise · Pull Request #232 · bitrise-io/bitrise-build-cache-cli

zsolt-marta-bitrise · 2026-02-24T16:04:31Z

No description provided.

zsolt-marta-bitrise · 2026-02-26T15:18:03Z

cmd/xcode/activate_xcode.go

 		return fmt.Errorf("failed to create xcrun wrapper script: %w", err)
 	}

-	pathContent := fmt.Sprintf("export PATH=%s:$PATH", binPath)


Got refactored to a new package envexport

zsolt-marta-bitrise · 2026-02-26T15:19:10Z

cmd/xcode/activate_xcode_test.go

 		"BITRISE_BUILD_CACHE_AUTH_TOKEN":   "token",
 		"BITRISE_BUILD_CACHE_WORKSPACE_ID": "abc123",
-		"GITHUB_PATH":                      filepath.Join(home, ".github_path"),
+		"GITHUB_ENV":                       filepath.Join(home, ".github_env"),


This is the up-to-date way https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#example-of-writing-an-environment-variable-to-github_env

zsolt-marta-bitrise · 2026-02-26T15:20:51Z

internal/config/gradle/activate_for_gradle_params.go

+		return TemplateInventory{}, fmt.Errorf(ErrFmtReadAuthConfig, err)
+	}
+
+	metadata := common.NewMetadata(envs,


This was previously in the lower methods (e.g. commonTemplateInventory), I moved it up because we need it for the benchmark phasing

zsolt-marta-bitrise · 2026-02-26T15:22:10Z

internal/config/gradle/activate_for_gradle_params.go

+	Phase string `json:"phase"`
+}
+
+func writeBenchmarkPhaseFile(phase string, logger log.Logger) {


This is a fallback in case the env var export doesn't work

zsolt-marta-bitrise · 2026-02-26T15:23:24Z

internal/config/gradle/activate_for_gradle_params.go

+	logger.Infof("(i) Benchmark phase: %s", phase)
+	exporter := envexport.New(envs, logger)
+	exporter.Export("BITRISE_BUILD_CACHE_BENCHMARK_PHASE", phase)
+	exporter.ExportToShellRC("Bitrise Benchmark Phase", "export BITRISE_BUILD_CACHE_BENCHMARK_PHASE="+phase)


This would override the user's bashrc/zshrc but we don't support benchmark phasing for local builds anyway (see https://github.com/bitrise-io/bitrise-build-cache-cli/pull/232/changes#diff-c9e446e91766670af1e9940e37c9a12bd9568e2889a3e300e9dbd8b98e038115R98)

zsolt-marta-bitrise · 2026-02-26T15:33:41Z

bitrise.yml

            - content: |-
                set -exo pipefail
-                (./gradlew compileDebugKotlin --info --stacktrace 2>&1) | tee "$BITRISE_DEPLOY_DIR/logs.txt"
+                (./gradlew assembleDebug --info --stacktrace 2>&1) | tee "$BITRISE_DEPLOY_DIR/logs.txt"


It was failing frequently because there is only 1 cacheable task

zsolt-marta-bitrise · 2026-02-26T16:22:00Z

Works here: https://github.com/zsolt-marta-bitrise/DuckDuckGoAndroid/actions/runs/22450729906/job/65018160767

imrekel · 2026-02-27T09:10:19Z

internal/config/common/benchmark.go

+		params.Set("external_workflow_name", metadata.ExternalWorkflowName)
+	}
+
+	requestURL := fmt.Sprintf("%s/build-cache/%s/invocations/gradle/command_benchmark_status?%s",


build tool will need to change depending on the platform (later)

Good catch! We're doing it for Gradle only now but there's no blocker in supporting all tools in this method

zsolt-marta-bitrise · 2026-02-27T09:15:19Z

Summary

Added benchmark phase fetching from Bitrise API with support for external CI providers (CircleCI, GitHub Actions, GitLab CI). Refactored environment variable export logic into a new EnvExporter class. Enhanced cache metadata with external CI identifiers and JWT-based workspace ID extraction.

Walkthrough

File	Summary
bitrise.yml	Added gradle cache restore/save steps to three e2e test workflows and updated build command in feature-e2e-gradle-7
cmd/xcode/activate_xcode.go	Refactored PATH export logic to use new EnvExporter class
internal/config/common/auth.go	Added JWT extraction with workspace ID parsing and updated token formatting
internal/config/common/benchmark.go	New file: BenchmarkPhaseClient to fetch benchmark phase from Bitrise API
internal/config/common/cache_config.go	Added external CI provider detection and external CI identifiers to metadata
internal/config/gradle/activate_for_gradle_params.go	Refactored to read auth config upfront and added benchmark phase fetching
internal/consts/consts.go	Added BitriseWebsiteBaseURL constant
internal/envexport/envexport.go	New file: EnvExporter for exporting variables to process and CI systems
internal/xcelerate/analytics/invocations.go, types.go	Added external CI identifier fields to Invocation struct
Test and mock files	Added comprehensive test coverage for new functionality

zsolt-marta-bitrise

This is an AI-generated review. Please review it carefully.

Actionable comments posted: 1

zsolt-marta-bitrise · 2026-02-27T09:17:07Z

internal/config/common/benchmark.go

+		params.Set("external_workflow_name", metadata.ExternalWorkflowName)
+	}
+
+	requestURL := fmt.Sprintf("%s/build-cache/%s/invocations/gradle/command_benchmark_status?%s",


🐛 Bug

Missing validation for empty WorkspaceID. The function constructs a URL using c.authConfig.WorkspaceID without checking if it's empty first. This will result in a malformed URL (e.g., /build-cache//invocations/...) when WorkspaceID is empty. The test TestGetGradleBenchmarkPhase_EmptyWorkspaceID expects the function to return early with an empty string when WorkspaceID is empty, but the current implementation will attempt to make an HTTP request with an invalid URL instead.

🤖 Prompt for AI Agents:

In internal/config/common/benchmark.go at line 77, Add a check for empty WorkspaceID before constructing the URL. Return early with an empty string if WorkspaceID is empty, similar to how the function handles missing app IDs and workflow names.

zsolt-marta-bitrise

This is an AI-generated review. Please review it carefully.

Actionable comments posted: 1

zsolt-marta-bitrise · 2026-02-27T09:22:38Z

internal/config/common/benchmark.go

+		params.Set("external_workflow_name", metadata.ExternalWorkflowName)
+	}
+
+	requestURL := fmt.Sprintf("%s/build-cache/%s/invocations/%s/command_benchmark_status?%s",


🐛 Bug

The WorkspaceID is used to construct the URL without validation. If WorkspaceID is empty (which can happen if JWT extraction fails or returns an empty value), this creates a malformed URL like "/build-cache//invocations/...". The function should validate that WorkspaceID is not empty before constructing the request URL.

🤖 Prompt for AI Agents:

In internal/config/common/benchmark.go at line 82, Add validation to check if WorkspaceID is empty before constructing the request URL. Return an error or empty string if WorkspaceID is missing.

zsolt-marta-bitrise

This is an AI-generated review. Please review it carefully.

Actionable comments posted: 1

zsolt-marta-bitrise · 2026-02-27T10:13:00Z

internal/config/common/benchmark.go

+func (c *BenchmarkPhaseClient) GetBenchmarkPhase(buildTool string, metadata CacheConfigMetadata) (string, error) {
+	params := url.Values{}
+
+	if c.authConfig.WorkspaceID == "" {


🐛 Bug

The function returns an error when WorkspaceID is empty, but the test TestGetBenchmarkPhase_EmptyWorkspaceID expects it to return an empty string with no error. This breaks the expected behavior where missing workspace ID should gracefully skip the benchmark phase check instead of failing.

🔄 Suggestion:

Suggested change

if c.authConfig.WorkspaceID == "" {

if c.authConfig.WorkspaceID == "" {

c.logger.Debugf("workspace ID is not available, skipping benchmark phase check")

return "", nil

}

zsolt-marta-bitrise changed the title ~~feat: ACI-4571 Add external CI identifiers~~ feat: ACI-4571 Get benchmark phase Feb 26, 2026

zsolt-marta-bitrise added 9 commits February 26, 2026 15:44

feat: ACI-4571 Add external CI identifiers

de48fca

feat: ACI-4571 Call benchmark phase API

87a697a

feat: ACI-4571 Create EnvExporter and export benchmark phase

62eb610

feat: ACI-4571 Write benchmark phase file specifically

3844ad2

feat: ACI-4571 Log empty benchmark phase

7126e01

feat: ACI-4571 Log empty benchmark phase

602b85e

feat: ACI-4571 Log benchmark phase with Debug

38b21db

fix: run larger workflow to allow caching

1efc4bf

fix: Use dep caching

703e446

zsolt-marta-bitrise force-pushed the external-id branch from fcff77c to 703e446 Compare February 26, 2026 14:44

zsolt-marta-bitrise commented Feb 26, 2026

View reviewed changes

fix: lowercase bearer

98c7a20

zsolt-marta-bitrise marked this pull request as ready for review February 26, 2026 16:22

zsolt-marta-bitrise requested a review from imrekel February 26, 2026 16:23

imrekel reviewed Feb 27, 2026

View reviewed changes

imrekel approved these changes Feb 27, 2026

View reviewed changes

feat: ACI-4571 Extract workspace ID from JWT

dab9fa2

zsolt-marta-bitrise commented Feb 27, 2026

View reviewed changes

feat: ACI-4571 Add build tool as a param

9ce26c4

zsolt-marta-bitrise commented Feb 27, 2026

View reviewed changes

zsolt-marta-bitrise added 2 commits February 27, 2026 11:00

fix: ACI-4571 Fix JWT format

ea02d2c

fix: ACI-4571 Return error if workspace ID is missing

ccc62fe

zsolt-marta-bitrise commented Feb 27, 2026

View reviewed changes

Conversation

zsolt-marta-bitrise commented Feb 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zsolt-marta-bitrise commented Feb 26, 2026

Uh oh!

imrekel Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zsolt-marta-bitrise commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Walkthrough

Uh oh!

zsolt-marta-bitrise left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zsolt-marta-bitrise left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zsolt-marta-bitrise left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

imrekel Feb 27, 2026 •

edited

Loading

zsolt-marta-bitrise commented Feb 27, 2026 •

edited

Loading