From f398ff0c65262f36afdbfacf5adf75b8f510015d Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Tue, 25 Oct 2022 21:33:09 +0200 Subject: [PATCH] Use DD_TRACE_CLIENT_IP_ENABLED as an env var This removes the `_HEADER` part inconsistent with the configuration setting. --- lib/datadog/core/configuration/settings.rb | 2 +- lib/datadog/tracing/configuration/ext.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 9ba208cc04..5695b57b0f 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -671,7 +671,7 @@ def initialize(*_) # # @see https://docs.datadoghq.com/tracing/configure_data_security#configuring-a-client-ip-header # - # @default `DD_TRACE_CLIENT_IP_HEADER_ENABLED` environment variable, otherwise `false`. + # @default `DD_TRACE_CLIENT_IP_ENABLED` environment variable, otherwise `false`. # @return [Boolean] option :enabled do |o| o.default do diff --git a/lib/datadog/tracing/configuration/ext.rb b/lib/datadog/tracing/configuration/ext.rb index 6c7ed920af..14ae2deae7 100644 --- a/lib/datadog/tracing/configuration/ext.rb +++ b/lib/datadog/tracing/configuration/ext.rb @@ -54,7 +54,7 @@ module Transport # @public_api module ClientIp - ENV_ENABLED = 'DD_TRACE_CLIENT_IP_HEADER_ENABLED'.freeze + ENV_ENABLED = 'DD_TRACE_CLIENT_IP_ENABLED'.freeze ENV_DISABLED = 'DD_TRACE_CLIENT_IP_HEADER_DISABLED'.freeze # TODO: deprecated, remove later ENV_HEADER_NAME = 'DD_TRACE_CLIENT_IP_HEADER'.freeze end