summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-01-10 16:17:10 -0800
committerStan Hu <stanhu@gmail.com>2018-01-10 16:21:08 -0800
commitaa08a644a303e2444473b380c90b689f1c843032 (patch)
treec81847f3e82238766e2b81c37d691edd35df9d6a
parent3576d59ae95a61dd20e997a619dbc6c8e8a70276 (diff)
downloadgitlab-ce-sh-filter-build-trace-params.tar.gz
Filter out build traces from logged parameterssh-filter-build-trace-params
Most of the time `api_json.log` looks sane with one-line entries, but when CI jobs send build trace data, the `trace` parameter can cause the logs to balloon. Closes #41906
-rw-r--r--changelogs/unreleased/sh-filter-build-trace-params.yml5
-rw-r--r--config/application.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-filter-build-trace-params.yml b/changelogs/unreleased/sh-filter-build-trace-params.yml
new file mode 100644
index 00000000000..392d794c2e5
--- /dev/null
+++ b/changelogs/unreleased/sh-filter-build-trace-params.yml
@@ -0,0 +1,5 @@
+---
+title: Filter out build traces from logged parameters
+merge_request:
+author:
+type: changed
diff --git a/config/application.rb b/config/application.rb
index 1110199b888..cd5e3d45bab 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -61,6 +61,7 @@ module Gitlab
# - Any parameter containing `secret`
# - Two-factor tokens (:otp_attempt)
# - Repo/Project Import URLs (:import_url)
+ # - Build traces (:trace)
# - Build variables (:variables)
# - GitLab Pages SSL cert/key info (:certificate, :encrypted_key)
# - Webhook URLs (:hook)
@@ -75,6 +76,7 @@ module Gitlab
key
otp_attempt
sentry_dsn
+ trace
variables
)