Skip to content

Commit 373185a

Browse files
committed
logs
1 parent b5efb91 commit 373185a

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

ci3/aws_request_instance_type

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ fi
8888

8989
aws ec2 create-tags --resources $iid --tags "Key=Name,Value=$name"
9090
aws ec2 create-tags --resources $iid --tags "Key=Group,Value=build-instance"
91+
if [ "${UNSAFE_AWS_KEEP_ALIVE:-0}" -eq 1 ]; then
92+
echo_stderr "You have set UNSAFE_AWS_KEEP_ALIVE=1, so the instance will not be terminated after 1.5 hours by the reaper script. Make sure you sure you shut the machine down when done."
93+
# Tag instance with Keep-Alive=true
94+
aws ec2 create-tags --resources $iid --tags "Key=Keep-Alive,Value=true"
95+
fi
9196

9297
while [ -z "${ip:-}" ]; do
9398
sleep 1

docs/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function check_references {
5757

5858
function build_examples {
5959
echo_header "Building examples"
60-
(cd examples && ./bootstrap.sh "$@")
60+
(cd examples && ./bootstrap.sh "$@") || true
6161
}
6262

6363
case "$cmd" in

spartan/environments/kind-provers.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ SENTINEL_ENABLED=false
1414
# Epoch and slot timing (from next-scenario.env)
1515
AZTEC_SLOT_DURATION=36
1616
AZTEC_EPOCH_DURATION=32
17-
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=2
18-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=2
17+
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=1
18+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=1
1919

2020
# Slashing settings (from next-scenario.env)
2121
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS=1

spartan/scripts/k8s_log_reporter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,15 +404,14 @@ function startPodStream(podName: string): void {
404404
kubectlProc.on("close", () => {
405405
activeStreams.delete(podName);
406406
cacheLogProc.stdin?.end();
407-
report("STREAM", `${podName} stream ended`, colors.gray);
407+
report("POD", `${podName} has finished`, colors.gray);
408408
});
409409
410410
kubectlProc.on("error", () => {
411411
activeStreams.delete(podName);
412412
});
413413
414414
activeStreams.set(podName, { podName, kubectlProc, cacheLogProc });
415-
report("STREAM", `Started streaming ${podName}`, colors.gray);
416415
}
417416
418417
function stopAllStreams(): void {

spartan/scripts/otel-trace-dumper.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# Minimal OTEL collector that receives traces and dumps them as JSON to stdout
1+
# Minimal OTEL collector that receives traces+metrics and dumps them as JSON to stdout
2+
# Logs are intentionally NOT captured (they go to pod logs via pino)
23
# Deploy with: kubectl apply -f otel-trace-dumper.yaml -n $NAMESPACE
3-
# Stream logs with: kubectl logs -f otel-trace-dumper -n $NAMESPACE | cache_log "otel-traces"
4+
# Stream with: kubectl logs -f -l app=otel-trace-dumper -n $NAMESPACE | cache_log "otel"
45
apiVersion: v1
56
kind: ConfigMap
67
metadata:
@@ -28,11 +29,16 @@ data:
2829
sampling_thereafter: 10000
2930
3031
service:
32+
# Note: No logs pipeline - logs go to pod stdout via pino logger
3133
pipelines:
3234
traces:
3335
receivers: [otlp]
3436
processors: [batch]
3537
exporters: [debug]
38+
metrics:
39+
receivers: [otlp]
40+
processors: [batch]
41+
exporters: [debug]
3642
---
3743
apiVersion: apps/v1
3844
kind: Deployment

0 commit comments

Comments
 (0)