Skip to content

Commit c90f690

Browse files
Merge branch 'main' into brandon/sync-limit-and-max-rows
2 parents 202f1dd + 62eddcf commit c90f690

Some content is hidden

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

42 files changed

+533
-183
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/app": patch
4+
---
5+
6+
fix: Improve table key parsing

.changeset/grumpy-trees-mate.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hyperdx/app": patch
3+
---
4+
5+
Fixes scrolling in TimePicker

.changeset/quick-otters-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hyperdx/api": patch
3+
---
4+
5+
Add new logging pararmeter for otel collector

.changeset/short-turtles-change.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hyperdx/app": patch
3+
---
4+
5+
fix: Fix infinite querying on non-windowed searches

.changeset/two-melons-admire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/app": patch
4+
---
5+
6+
refactor: clean up table connections

docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
OPAMP_SERVER_URL: 'http://host.docker.internal:${HYPERDX_OPAMP_PORT}'
3434
CUSTOM_OTELCOL_CONFIG_FILE: '/etc/otelcol-contrib/custom.config.yaml'
3535
# Uncomment to enable stdout logging for the OTel collector
36-
OTEL_SUPERVISOR_PASSTHROUGH_LOGS: 'false'
36+
# OTEL_SUPERVISOR_LOGS: 'true'
3737
# Uncomment to enable JSON schema in ClickHouse
3838
# Be sure to also set BETA_CH_OTEL_JSON_SCHEMA_ENABLED to 'true' in ch-server
3939
# OTEL_AGENT_FEATURE_GATE_ARG: '--feature-gates=clickhouse.json'

docker/otel-collector/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ COPY --from=col --chmod=755 /otelcol-contrib /otelcontribcol
2626
# Copy entrypoint and log rotation scripts
2727
COPY --chmod=755 ./entrypoint.sh /entrypoint.sh
2828
COPY --chmod=755 ./log-rotator.sh /log-rotator.sh
29+
COPY --chmod=755 ./log-tailer.sh /log-tailer.sh
2930

3031
## dev ##############################################################################################
3132
FROM base AS dev

docker/otel-collector/entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ set -e
55
# Arguments: log_file_path [max_size_mb] [max_archives] [check_interval_seconds]
66
/log-rotator.sh /etc/otel/supervisor-data/agent.log 16 1 60 &
77

8+
# Start log tailer script in background for agent.log
9+
# Arguments: log_file_path [check_interval_seconds]
10+
if [ "$OTEL_SUPERVISOR_LOGS" = "true" ]; then
11+
/log-tailer.sh /etc/otel/supervisor-data/agent.log 1 &
12+
fi
13+
814
# Render the supervisor config template using gomplate
915
# Write to supervisor-data directory which has proper permissions for otel user
1016
gomplate -f /etc/otel/supervisor.yaml.tmpl -o /etc/otel/supervisor-data/supervisor-runtime.yaml
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
# Generic log tailer script that follows a log file and echoes new lines to stdout
3+
# Handles file rotation and truncation (e.g., when used with log-rotator.sh)
4+
# Usage: log-tailer.sh <log_file_path> [sleep_interval]
5+
6+
# Parse arguments
7+
LOG_FILE="${1}"
8+
SLEEP_INTERVAL="${2:-1}"
9+
10+
# Validate required argument
11+
if [ -z "$LOG_FILE" ]; then
12+
echo "Error: Log file path is required" >&2
13+
echo "Usage: $0 <log_file_path> [sleep_interval]" >&2
14+
exit 1
15+
fi
16+
17+
# Wait for file to exist if it doesn't yet
18+
while [ ! -f "$LOG_FILE" ]; do
19+
echo "Waiting for log file to be created: $LOG_FILE" >&2
20+
sleep "$SLEEP_INTERVAL"
21+
done
22+
23+
echo "Starting to tail: $LOG_FILE" >&2
24+
25+
# Use tail -F to follow the file by name, not by descriptor
26+
# This handles rotation and truncation gracefully
27+
# -n 0: Start from the end (don't output existing content)
28+
# -F: Follow by name and retry if file is inaccessible
29+
# -s: Sleep interval between checks
30+
tail -n 0 -F -s "$SLEEP_INTERVAL" "$LOG_FILE"

docker/otel-collector/supervisor_docker.yaml.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ agent:
2727
{{- if getenv "OTEL_AGENT_FEATURE_GATE_ARG" }}
2828
- {{ getenv "OTEL_AGENT_FEATURE_GATE_ARG" }}
2929
{{- end }}
30-
passthrough_logs: {{ getenv "OTEL_SUPERVISOR_PASSTHROUGH_LOGS" | default "false" }}
3130

3231
storage:
3332
directory: /etc/otel/supervisor-data/

0 commit comments

Comments
 (0)