Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions grandine-allin1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ services:
- CL_P2P_PORT=${CL_P2P_PORT:-9000}
- CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
- NETWORK=${NETWORK}
- COMPOSE_FILE=${COMPOSE_FILE}
- LOG_LEVEL=${LOG_LEVEL}
- RUST_LOG=${LOG_LEVEL:-info}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
Expand Down
3 changes: 3 additions & 0 deletions grandine-cl-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ services:
- CL_P2P_PORT=${CL_P2P_PORT:-9000}
- CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
- NETWORK=${NETWORK}
- COMPOSE_FILE=${COMPOSE_FILE}
- LOG_LEVEL=${LOG_LEVEL}
- RUST_LOG=${LOG_LEVEL:-info}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
Expand Down
15 changes: 13 additions & 2 deletions grandine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,26 @@ else
__w3s_url=""
fi

# Traces
if [[ "${COMPOSE_FILE}" =~ (grafana\.yml|grafana-rootless\.yml) ]]; then
__trace="--telemetry-metrics-url http://tempo:4317 --telemetry-service-name grandine --telemetry-level ${LOG_LEVEL:-info}"
# These may become default in future. Here so Grandine doesn't murder itself in the meantime
export OTEL_TRACES_SAMPLER=parentbased_traceidratio
export OTEL_TRACES_SAMPLER_ARG=0.01
export OTEL_EXPORTER_OTLP_INSECURE=true
else
__trace=""
fi

__strip_empty_args "$@"
set -- "${__args[@]}"

if [[ "${DEFAULT_GRAFFITI}" = "true" ]]; then
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__checkpoint_sync} ${__prune} ${__beacon_stats} ${__ipv6} ${__doppel} ${CL_EXTRAS} ${VC_EXTRAS}
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__checkpoint_sync} ${__prune} ${__beacon_stats} ${__ipv6} ${__doppel} ${__trace} ${CL_EXTRAS} ${VC_EXTRAS}
else
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__checkpoint_sync} ${__prune} ${__beacon_stats} ${__ipv6} ${__doppel} --graffiti "${GRAFFITI}" ${CL_EXTRAS} ${VC_EXTRAS}
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__checkpoint_sync} ${__prune} ${__beacon_stats} ${__ipv6} ${__doppel} --graffiti "${GRAFFITI}" ${__trace} ${CL_EXTRAS} ${VC_EXTRAS}
fi
1 change: 1 addition & 0 deletions nethermind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ services:
- NETWORK=${NETWORK}
# For Grandine plugin
- COMPOSE_FILE=${COMPOSE_FILE}
- LOG_LEVEL=${LOG_LEVEL}
volumes:
- nethermind-el-data:/var/lib/nethermind
- nm-eth1-data:/var/lib/nethermind-og
Expand Down
9 changes: 9 additions & 0 deletions nethermind/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,15 @@ if [[ "${COMPOSE_FILE}" =~ grandine-plugin(-allin1)?\.yml ]]; then
__grandine+=" --grandine-graffiti ${GRAFFITI}"
fi

# Traces
if [[ "${COMPOSE_FILE}" =~ (grafana\.yml|grafana-rootless\.yml) ]]; then
__grandine+=" --grandine-telemetrymetricsurl http://tempo:4317 --grandine-telemetryservicename grandine --grandine-telemetrylevel ${LOG_LEVEL:-info}"
# These may become default in future. Here so Grandine doesn't murder itself in the meantime
export OTEL_TRACES_SAMPLER=parentbased_traceidratio
export OTEL_TRACES_SAMPLER_ARG=0.01
export OTEL_EXPORTER_OTLP_INSECURE=true
fi

__grandine+=" ${CL_EXTRAS} ${VC_EXTRAS}"
else
__grandine=""
Expand Down