Skip to content

Commit f48d91c

Browse files
committed
refactor: deprecate clickhouse.json feature gate in favor of per-exporter json config
Replace the deprecated --feature-gates=clickhouse.json CLI flag with the per-exporter json: true config option, as recommended by the upstream OpenTelemetry ClickHouse exporter (v0.149.0). The old OTEL_AGENT_FEATURE_GATE_ARG env var is still supported for other feature gates. When it contains clickhouse.json, the entrypoint strips that specific gate, maps it to HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE=true, and prints a deprecation warning. Any remaining feature gates are preserved and passed through to the collector binary as before. Changes: - Add HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE env var as the new canonical config - Add json field to ClickHouse exporter configs in opampController.ts - Add json field to standalone config (config.standalone.yaml) - Strip clickhouse.json from OTEL_AGENT_FEATURE_GATE_ARG with deprecation warning, preserving other feature gates Ref: HDX-3994
1 parent 6e9a553 commit f48d91c

4 files changed

Lines changed: 27 additions & 3 deletions

File tree

docker/otel-collector/config.standalone.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ exporters:
3333
logs_table_name: hyperdx_sessions
3434
timeout: 5s
3535
create_schema: ${env:HYPERDX_OTEL_EXPORTER_CREATE_LEGACY_SCHEMA:-false}
36+
json: ${env:HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE:-false}
3637
retry_on_failure:
3738
enabled: true
3839
initial_interval: 5s
@@ -46,6 +47,7 @@ exporters:
4647
ttl: 720h
4748
timeout: 5s
4849
create_schema: ${env:HYPERDX_OTEL_EXPORTER_CREATE_LEGACY_SCHEMA:-false}
50+
json: ${env:HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE:-false}
4951
retry_on_failure:
5052
enabled: true
5153
initial_interval: 5s

docker/otel-collector/entrypoint.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
#!/bin/sh
22
set -e
33

4-
# Fall back to legacy schema when the ClickHouse JSON feature gate is enabled
4+
# DEPRECATED: The clickhouse.json feature gate has been removed upstream.
5+
# When OTEL_AGENT_FEATURE_GATE_ARG contains clickhouse.json, strip it and
6+
# map it to HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE instead. Other feature gates
7+
# are preserved and passed through to the collector.
58
if echo "$OTEL_AGENT_FEATURE_GATE_ARG" | grep -q "clickhouse.json"; then
9+
echo "WARNING: '--feature-gates=clickhouse.json' is deprecated and no longer supported by the collector."
10+
echo "WARNING: Use HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE=true instead. This flag will be removed in a future release."
11+
export HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE=true
12+
13+
# Strip clickhouse.json from the feature gates, keeping any other gates
14+
REMAINING_GATES=$(echo "$OTEL_AGENT_FEATURE_GATE_ARG" | sed 's/--feature-gates=//' | tr ',' '\n' | grep -v 'clickhouse.json' | tr '\n' ',' | sed 's/,$//')
15+
if [ -n "$REMAINING_GATES" ]; then
16+
export OTEL_AGENT_FEATURE_GATE_ARG="--feature-gates=$REMAINING_GATES"
17+
else
18+
unset OTEL_AGENT_FEATURE_GATE_ARG
19+
fi
20+
fi
21+
22+
# Fall back to legacy schema when ClickHouse JSON exporter mode is enabled
23+
if [ "$HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE" = "true" ]; then
624
export HYPERDX_OTEL_EXPORTER_CREATE_LEGACY_SCHEMA=true
725
fi
826

@@ -39,7 +57,7 @@ if [ -z "$OPAMP_SERVER_URL" ]; then
3957
COLLECTOR_ARGS="$COLLECTOR_ARGS --config $CUSTOM_OTELCOL_CONFIG_FILE"
4058
fi
4159

42-
# Pass feature gates to the collector in standalone mode
60+
# Pass remaining feature gates to the collector in standalone mode
4361
if [ -n "$OTEL_AGENT_FEATURE_GATE_ARG" ]; then
4462
COLLECTOR_ARGS="$COLLECTOR_ARGS $OTEL_AGENT_FEATURE_GATE_ARG"
4563
fi

docker/otel-collector/supervisor_docker.yaml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ agent:
2323
{{- if getenv "CUSTOM_OTELCOL_CONFIG_FILE" }}
2424
- {{ getenv "CUSTOM_OTELCOL_CONFIG_FILE" }}
2525
{{- end }}
26-
args:
2726
{{- if getenv "OTEL_AGENT_FEATURE_GATE_ARG" }}
27+
args:
2828
- {{ getenv "OTEL_AGENT_FEATURE_GATE_ARG" }}
2929
{{- end }}
3030

packages/api/src/opamp/controllers/opampController.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ type CollectorConfig = {
8282
logs_table_name: string;
8383
timeout: string;
8484
create_schema: string;
85+
json: string;
8586
retry_on_failure: {
8687
enabled: boolean;
8788
initial_interval: string;
@@ -97,6 +98,7 @@ type CollectorConfig = {
9798
ttl: string;
9899
timeout: string;
99100
create_schema: string;
101+
json: string;
100102
retry_on_failure: {
101103
enabled: boolean;
102104
initial_interval: string;
@@ -205,6 +207,7 @@ export const buildOtelCollectorConfig = (
205207
timeout: '5s',
206208
create_schema:
207209
'${env:HYPERDX_OTEL_EXPORTER_CREATE_LEGACY_SCHEMA:-false}',
210+
json: '${env:HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE:-false}',
208211
retry_on_failure: {
209212
enabled: true,
210213
initial_interval: '5s',
@@ -221,6 +224,7 @@ export const buildOtelCollectorConfig = (
221224
timeout: '5s',
222225
create_schema:
223226
'${env:HYPERDX_OTEL_EXPORTER_CREATE_LEGACY_SCHEMA:-false}',
227+
json: '${env:HYPERDX_OTEL_EXPORTER_CLICKHOUSE_JSON_ENABLE:-false}',
224228
retry_on_failure: {
225229
enabled: true,
226230
initial_interval: '5s',

0 commit comments

Comments
 (0)