Skip to content

Commit 7277e88

Browse files
Ikuni17Ikuni17
authored
Merge branch '8.19' into backport/8.19/pr-238372
2 parents 81a7da6 + 3717903 commit 7277e88

48 files changed

Lines changed: 2096 additions & 372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/scripts/steps/code_coverage/jest_parallel.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ echo "--- Jest [$TEST_TYPE] configs complete"
8787
printf "%s\n" "${results[@]}"
8888

8989
# Scout reporter
90-
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
91-
node scripts/scout upload-events --dontFailOnError
90+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
9291

9392
# Force exit 0 to ensure the next build step starts.
9493
exit 0

‎.buildkite/scripts/steps/test/ftr_configs.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ printf "%s\n" "${results[@]}"
115115
echo ""
116116

117117
# Scout reporter
118-
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
119-
node scripts/scout upload-events --dontFailOnError
118+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
120119

121120
exit $exitCode

‎.buildkite/scripts/steps/test/jest_parallel.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ printf "%s\n" "${results[@]}"
115115
echo ""
116116

117117
# Scout reporter
118-
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
119-
node scripts/scout upload-events --dontFailOnError
118+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
120119

121120
exit $exitCode

‎.buildkite/scripts/steps/test/scout_configs.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ if [[ ${#failedConfigs[@]} -gt 0 ]]; then
129129
buildkite-agent meta-data set "$FAILED_CONFIGS_KEY" "$failedConfigs"
130130
fi
131131

132-
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
133-
node scripts/scout upload-events --dontFailOnError
132+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
134133

135134
exit $FINAL_EXIT_CODE # Exit with 10 only if there were config failures

‎.buildkite/scripts/steps/test/scout_test_run_builder.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ node scripts/scout.js run-tests \
1818
--config src/platform/packages/shared/kbn-scout/test/scout/playwright.config.ts \
1919
--kibana-install-dir "$KIBANA_BUILD_LOCATION"
2020

21+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
22+
2123
echo '--- Producing Scout Test Execution Steps'
2224
ts-node "$(dirname "${0}")/scout_test_run_builder.ts"

‎.buildkite/scripts/steps/test/scout_upload_report_events.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
6+
if [[ "${SCOUT_REPORTER_ENABLED:-}" == "true" ]]; then
7+
node scripts/scout upload-events --dontFailOnError
8+
else
9+
echo "⚠️ The SCOUT_REPORTER_ENABLED environment variable is not 'true'. Skipping event upload."
10+
fi

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@
10801080
"@mapbox/mapbox-gl-supported": "2.0.1",
10811081
"@mapbox/vector-tile": "1.3.1",
10821082
"@modelcontextprotocol/sdk": "^1.13.2",
1083-
"@moonrepo/cli": "1.41.2",
1083+
"@moonrepo/cli": "1.41.5",
10841084
"@n8n/json-schema-to-zod": "^1.1.0",
10851085
"@openfeature/core": "^1.9.0",
10861086
"@openfeature/launchdarkly-client-provider": "^0.3.2",
@@ -1713,7 +1713,7 @@
17131713
"@types/resolve": "^1.20.1",
17141714
"@types/scheduler": "^0.23.0",
17151715
"@types/seedrandom": ">=2.0.0 <4.0.0",
1716-
"@types/selenium-webdriver": "^4.1.28",
1716+
"@types/selenium-webdriver": "^4.35.1",
17171717
"@types/semver": "^7.7.1",
17181718
"@types/sinon": "^17.0.3",
17191719
"@types/source-map-support": "^0.5.10",
@@ -1761,7 +1761,7 @@
17611761
"cache-manager-fs-hash": "^2.0.0",
17621762
"callsites": "^3.1.0",
17631763
"chance": "1.0.18",
1764-
"chromedriver": "^140.0.0",
1764+
"chromedriver": "^141.0.0",
17651765
"clean-webpack-plugin": "^4.0.0",
17661766
"cli-progress": "^3.12.0",
17671767
"cli-table3": "^0.6.1",
@@ -1815,7 +1815,7 @@
18151815
"find-cypress-specs": "^1.41.4",
18161816
"fix-esm": "^1.0.1",
18171817
"form-data": "^4.0.4",
1818-
"geckodriver": "^6.0.1",
1818+
"geckodriver": "^6.0.2",
18191819
"globby": "^11.1.0",
18201820
"gulp-brotli": "^3.0.0",
18211821
"gulp-postcss": "^10.0.0",

‎src/dev/build/tasks/os_packages/docker_generator/run.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export async function runDockerGenerator(
5151
*/
5252
if (flags.baseImage === 'wolfi')
5353
baseImageName =
54-
'docker.elastic.co/wolfi/chainguard-base:latest@sha256:bb3bb9491f564296956a879033da287961829c431fc8dc68222c2b60f9bfa052';
54+
'docker.elastic.co/wolfi/chainguard-base:latest@sha256:eb38cadc8aa4d1e5fc159d40e0fb9eb23f59e139fe27483b674ba617d52db4e9';
5555

5656
let imageFlavor = '';
5757
if (flags.baseImage === 'ubi') imageFlavor += `-ubi`;
@@ -62,7 +62,7 @@ export async function runDockerGenerator(
6262
if (flags.fips) {
6363
imageFlavor += '-fips';
6464
baseImageName =
65-
'docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:1c77fc945beb2ce254d83931ca15ef770c8c8fec7fb8750d9f8a9b94f7ce71b7';
65+
'docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:334c255f2e430aa887b20ed86a64d615b4634a7fa1b170b147a9c19f4ae943d3';
6666
}
6767

6868
// General docker var config

‎src/platform/packages/private/kbn-apm-config-loader/src/config.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ describe('ApmConfiguration', () => {
8888
Object {
8989
"active": true,
9090
"breakdownMetrics": true,
91+
"captureHeaders": false,
9192
"captureSpanStackTraces": false,
9293
"centralConfig": false,
9394
"contextPropagationOnly": true,

‎src/platform/packages/private/kbn-apm-config-loader/src/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import type { ApmConfigSchema } from './apm_config';
2121
// https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html
2222
const DEFAULT_CONFIG: AgentConfigOptions = {
2323
active: true,
24+
captureHeaders: false,
2425
contextPropagationOnly: true,
2526
environment: 'development',
2627
globalLabels: {},
@@ -47,7 +48,6 @@ export const CENTRALIZED_SERVICE_BASE_CONFIG: AgentConfigOptions | RUMAgentConfi
4748
const CENTRALIZED_SERVICE_DIST_CONFIG: AgentConfigOptions = {
4849
breakdownMetrics: false,
4950
captureBody: 'off',
50-
captureHeaders: false,
5151
metricsInterval: '120s',
5252
transactionSampleRate: 0.1,
5353
};

0 commit comments

Comments
 (0)