diff --git a/.bazelrc b/.bazelrc index ae9378903aa..af0442d2548 100644 --- a/.bazelrc +++ b/.bazelrc @@ -418,7 +418,7 @@ common:remote_test --features=-thin_archive common:remote_test --remote_download_outputs=minimal common:remote_test --test_output=summary common:remote_test --modify_execution_info=^(CppLink|CppArchive|SolibSymlink|ExtractDebuginfo|StripDebuginfo|CcGenerateIntermediateDwp|CcGenerateDwp)$=-no-remote-cache -common:remote_test --remote_download_regex=.*(TestLogs.*|metrics.*\.json|report.*\.json$|\.core$|data_archives.*\.tgz$) # Resmoke TestLogs directory, report, core dumps, and data directory archives. +common:remote_test --remote_download_regex=.*(TestLogs.*|report.*\.json$|\.core$|data_archives.*\.tgz$) # Resmoke TestLogs directory, report, core dumps, and data directory archives. test:remote_test --test_timeout=660 # Allow extra 60s for coredump on abort test:remote_test --test_tag_filters=-incompatible_with_bazel_remote_test diff --git a/bazel/resmoke/BUILD.bazel b/bazel/resmoke/BUILD.bazel index c365b305421..cd83b43cef4 100644 --- a/bazel/resmoke/BUILD.bazel +++ b/bazel/resmoke/BUILD.bazel @@ -54,10 +54,6 @@ genrule( cat bazel-out/volatile-status.txt > $@ """, stamp = True, - tags = [ - "external", - "no-cache", - ], # Consuming volatile-status, so this should not cache visibility = ["//visibility:public"], ) @@ -69,10 +65,6 @@ genrule( awk '/^TEST_RUNTIMES/ { for (i=2; i<=NF; i++) print $$i }' bazel-out/volatile-status.txt > $@ """, stamp = True, - tags = [ - "external", - "no-cache", - ], # Consuming volatile-status, so this should not cache visibility = ["//visibility:public"], ) diff --git a/bazel/resmoke/resmoke_shim.py b/bazel/resmoke/resmoke_shim.py index b054de189fb..0b44077db96 100644 --- a/bazel/resmoke/resmoke_shim.py +++ b/bazel/resmoke/resmoke_shim.py @@ -47,8 +47,6 @@ def add_evergreen_build_info(args): add_volatile_arg(args, "--variantName=", "build_variant") add_volatile_arg(args, "--versionId=", "version_id") add_volatile_arg(args, "--requester=", "requester") - add_volatile_arg(args, "--otelTraceId=", "otel_trace_id") - add_volatile_arg(args, "--otelParentId=", "otel_parent_id") class ResmokeShimContext: diff --git a/bazel/resmoke/workspace_status.sh b/bazel/resmoke/workspace_status.sh index c3894af00f2..582177c3dea 100755 --- a/bazel/resmoke/workspace_status.sh +++ b/bazel/resmoke/workspace_status.sh @@ -18,7 +18,5 @@ echo task_name ${task_name} echo build_variant ${build_variant} echo version_id ${version_id} echo requester ${requester} -echo otel_trace_id ${otel_trace_id} -echo otel_parent_id ${otel_parent_id} python bazel/resmoke/workspace_status.py diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index b30e472c725..a17adc8dff2 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -1349,8 +1349,6 @@ functions: build_variant: ${build_variant} version_id: ${version_id} requester: ${requester} - otel_trace_id: ${otel_trace_id} - otel_parent_id: ${otel_parent_id} args: - "./src/evergreen/resmoke_tests_execute_bazel.sh" diff --git a/evergreen/resmoke_tests_execute_bazel.sh b/evergreen/resmoke_tests_execute_bazel.sh index 61e604f3b39..c42682174d6 100644 --- a/evergreen/resmoke_tests_execute_bazel.sh +++ b/evergreen/resmoke_tests_execute_bazel.sh @@ -129,15 +129,6 @@ find bazel-testlogs/ -path '*data_archives/*.tgz' -print0 | ln -sf $source $target done -# Symlink OTel metrics from multiple tests/shards to ${workdir}/build/OTelTraces for Evergreen to parse. -find bazel-testlogs/ -type f -path '*test.outputs/build/metrics*' -print0 | - while IFS= read -r -d '' metrics; do - source=${workdir}/src/$metrics - target=${workdir}/build/OTelTraces/$(echo $metrics | sed -e 's/bazel-testlogs\///g' -e 's/test\.outputs\/build\/metrics\///g' -e 's/\//_/g') - mkdir -p $(dirname $target) - ln -sf $source $target - done - # Combine reports from potentially multiple tests/shards. find bazel-testlogs/ -name report*.json | xargs $python buildscripts/combine_reports.py --no-report-exit -o report.json