root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix honeycomb build traces 

Using a unique span_id when invoking the buildevents cli
This commit is contained in:
Philip Kuryloski 2020-10-22 11:30:18 +02:00
parent 9fabae11a5
commit 62b7e8b986
9 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/dockerfiles/ci
View File

@ -37,6 +37,6 @@ RUN chown --recursive ${UNPRIVILEGED_USER} /workspace
USER ${UNPRIVILEGED_USER}
RUN BUILDEVENT_APIKEY=${BUILDEVENT_APIKEY} \
buildevents cmd ${GITHUB_RUN_ID} prepare deps -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-prepare deps -- \
make deps test-deps \
RABBITMQ_VERSION=${RABBITMQ_VERSION}

4
ci/dockerfiles/ci-dep
View File

@ -8,11 +8,11 @@ ARG project
WORKDIR /workspace/rabbitmq/deps/${project}
RUN BUILDEVENT_APIKEY=${BUILDEVENT_APIKEY} \
buildevents cmd ${GITHUB_RUN_ID} ${project} test-build -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} test-build -- \
make test-build
RUN BUILDEVENT_APIKEY=${BUILDEVENT_APIKEY} \
buildevents cmd ${GITHUB_RUN_ID} ${project} tests -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} tests -- \
make eunit \
FULL= \
FAIL_FAST=1 \

2
ci/scripts/collect.sh
View File

@ -3,5 +3,5 @@
set -euo pipefail
echo "Recording buildevents step finish for ${project} started at ${STEP_START}..."
buildevents step ${GITHUB_RUN_ID} ${project} ${STEP_START} ${project}
buildevents step ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} ${STEP_START} ${project}
echo "done."

2
ci/scripts/ct-suite.sh
View File

@ -14,7 +14,7 @@ catch() {
fi
}
buildevents cmd ${GITHUB_RUN_ID} ${project} ct-${CT_SUITE} -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-${project} ct-${CT_SUITE} -- \
make ct-${CT_SUITE} \
FULL= \
FAIL_FAST=1 \

2
ci/scripts/dialyze.sh
View File

@ -4,5 +4,5 @@ set -euo pipefail
cd /workspace/rabbitmq/deps/$project
buildevents cmd ${GITHUB_RUN_ID} dialyze ${project} -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-dialyze ${project} -- \
make dialyze

4
ci/scripts/package_generic_unix.sh
View File

@ -7,8 +7,8 @@ cd /workspace/rabbitmq
trap 'catch $?' EXIT
catch() {
buildevents step ${GITHUB_RUN_ID} packaging ${STEP_START} packaging
buildevents step ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-packaging ${STEP_START} packaging
}
buildevents cmd ${GITHUB_RUN_ID} packaging package-generic-unix -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-packaging package-generic-unix -- \
make package-generic-unix

16
ci/scripts/rabbitmq_cli.sh
View File

@ -6,8 +6,10 @@ cd /workspace/rabbitmq/deps/$project
trap 'catch $?' EXIT
SPAN_ID=${GITHUB_RUN_ID}-${project}
catch() {
buildevents cmd ${GITHUB_RUN_ID} ${project} stop-node -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} stop-node -- \
make stop-node -C ../.. \
DEPS_DIR=/workspace/rabbitmq/deps \
PLUGINS='rabbitmq_federation rabbitmq_stomp'
@ -17,31 +19,31 @@ catch() {
xz > /workspace/broker-logs/broker-logs.tar.xz
fi
buildevents step ${GITHUB_RUN_ID} ${project} ${STEP_START} ${project}
buildevents step ${GITHUB_RUN_ID} ${SPAN_ID} ${STEP_START} ${project}
}
buildevents cmd ${GITHUB_RUN_ID} ${project} make -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} make -- \
make DEPS_DIR=/workspace/rabbitmq/deps
buildevents cmd ${GITHUB_RUN_ID} ${project} start-background-broker -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} start-background-broker -- \
make start-background-broker \
-C ../.. \
DEPS_DIR=/workspace/rabbitmq/deps \
PLUGINS='rabbitmq_federation rabbitmq_stomp'
buildevents cmd ${GITHUB_RUN_ID} ${project} rebar -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} rebar -- \
mix local.rebar --force
# due to https://github.com/elixir-lang/elixir/issues/7699 we
# "run" the tests, but skip them all, in order to trigger
# compilation of all *_test.exs files before we actually run themq
buildevents cmd ${GITHUB_RUN_ID} ${project} compile-tests -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} compile-tests -- \
make tests \
MIX_TEST_OPTS="--exclude test" \
DEPS_DIR=/workspace/rabbitmq/deps
# rabbitmq-diagnostics erlang-cookie-sources reads USER from then env
export USER=$(whoami)
buildevents cmd ${GITHUB_RUN_ID} ${project} tests -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} tests -- \
make tests \
DEPS_DIR=/workspace/rabbitmq/deps

8
ci/scripts/tests.sh
View File

@ -6,18 +6,20 @@ cd /workspace/rabbitmq/deps/$project
trap 'catch $?' EXIT
SPAN_ID=${GITHUB_RUN_ID}-${project}
catch() {
if [ "$1" != "0" ]; then
make ct-logs-archive && mv *-ct-logs-*.tar.xz /workspace/ct-logs/
fi
buildevents step ${GITHUB_RUN_ID} ${project} ${STEP_START} ${project}
buildevents step ${GITHUB_RUN_ID} ${SPAN_ID} ${STEP_START} ${project}
}
buildevents cmd ${GITHUB_RUN_ID} ${project} test-build -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} test-build -- \
make test-build
buildevents cmd ${GITHUB_RUN_ID} ${project} tests -- \
buildevents cmd ${GITHUB_RUN_ID} ${SPAN_ID} tests -- \
make tests \
FULL= \
FAIL_FAST=1 \

2
ci/scripts/xref.sh
View File

@ -4,5 +4,5 @@ set -euo pipefail
cd /workspace/rabbitmq/deps/$project
buildevents cmd ${GITHUB_RUN_ID} xref ${project} -- \
buildevents cmd ${GITHUB_RUN_ID} ${GITHUB_RUN_ID}-xref ${project} -- \
make xref