From 28287bda0bf0c869d2d3a30e6e7af31314c1e4a0 Mon Sep 17 00:00:00 2001
From: Robert May <rmay@gitlab.com>
Date: Mon, 14 Feb 2022 14:22:50 +0000
Subject: [PATCH] Enable JSON limited encoder
Changelog: performance
---
.../feature_flags/development/json_limited_encoder.yml | 8 --------
lib/gitlab/json.rb | 2 --
spec/lib/gitlab/json_spec.rb | 10 ----------
3 files changed, 20 deletions(-)
delete mode 100644 config/feature_flags/development/json_limited_encoder.yml
diff --git a/config/feature_flags/development/json_limited_encoder.yml b/config/feature_flags/development/json_limited_encoder.yml
deleted file mode 100644
index 346013230a33..000000000000
--- a/config/feature_flags/development/json_limited_encoder.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: json_limited_encoder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38687
-rollout_issue_url:
-milestone: '13.3'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb
index c26ccb5c80d3..3d6b2ae80081 100644
--- a/lib/gitlab/json.rb
+++ b/lib/gitlab/json.rb
@@ -248,8 +248,6 @@ class LimitedEncoder
# @return [String]
# @raise [LimitExceeded] if the resulting json string is bigger than the specified limit
def self.encode(object, limit: 25.megabytes)
- return ::Gitlab::Json.dump(object) unless Feature.enabled?(:json_limited_encoder, default_enabled: :yaml)
-
buffer = StringIO.new
buffer_size = 0
diff --git a/spec/lib/gitlab/json_spec.rb b/spec/lib/gitlab/json_spec.rb
index f9f57752b0ab..8f846cdfab9a 100644
--- a/spec/lib/gitlab/json_spec.rb
+++ b/spec/lib/gitlab/json_spec.rb
@@ -440,15 +440,5 @@
expect(subject.size).to eq(10001)
end
end
-
- context 'when json_limited_encoder is disabled' do
- let(:obj) { [{ test: true }] * 1000 }
-
- it 'does not raise an error' do
- stub_feature_flags(json_limited_encoder: false)
-
- expect { subject }.not_to raise_error
- end
- end
end
end
--
GitLab