Verified Commit 8ee8406f authored by Elliot Forbes's avatar Elliot Forbes 2️⃣ Committed by GitLab
Browse files

Merge branch 'malvarez-correct-deprecation-for-remote-ip' into 'master' 

fix: Correct the deprecation values for remote_ip

See merge request !285

Merged-by: Elliot Forbes's avatarElliot Forbes <eforbes@gitlab.com>
Approved-by: Elliot Forbes's avatarElliot Forbes <eforbes@gitlab.com>
Co-authored-by: default avatarMatias Alvarez <malvarez@gitlab.com>
parents bbc780dd 8bcce5af

lib/labkit/fields.rb

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ module Labkit 
        Fields::HTTP_STATUS_CODE => %w[status_code extra.status status_text http_status],

        Fields::HTTP_URL => %w[req_url],

        Fields::DURATION_S => %w[duration duration_ms elapsed_time actual_duration time_ms total_time gitaly.duration],

        Fields::REMOTE_IP => %w[ip source_ip ip_address meta.remote_ip],

        Fields::REMOTE_IP => %w[ip source_ip ip_address],

        Fields::HTTP_HOST => %w[hostname request_host gitlab_host kubernetes.host],

        Fields::GL_PROJECT_ID => %w[extra.project_id meta.project_id meta.search.project_id job_project_id target_project_id],

        Fields::GL_PIPELINE_ID => %w[extra.pipeline_id meta.pipeline_id root_pipeline_id],