Fix feature_category label in http_requests_total metric

When the feature category header from the application was an empty
string, we'd set an empty label in Prometheus, rather than the default
of 'unknown'.

lib/gitlab/metrics/requests_rack_middleware.rb

@@ -63,7 +63,7 @@ module Gitlab
           if health_endpoint
             RequestsRackMiddleware.http_health_requests_total.increment(status: status, method: method)
           else
-            RequestsRackMiddleware.http_request_total.increment(status: status, method: method, feature_category: feature_category || FEATURE_CATEGORY_DEFAULT)
+            RequestsRackMiddleware.http_request_total.increment(status: status, method: method, feature_category: feature_category.presence || FEATURE_CATEGORY_DEFAULT)
           end
         end
       end

spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb

@@ -113,24 +113,38 @@ RSpec.describe Gitlab::Metrics::RequestsRackMiddleware do
       end
     end
 
-    context 'when a feature category header is present' do
-      before do
-        allow(app).to receive(:call).and_return([200, { described_class::FEATURE_CATEGORY_HEADER => 'issue_tracking' }, nil])
-      end
+    context 'feature category header' do
+      context 'when a feature category header is present' do
+        before do
+          allow(app).to receive(:call).and_return([200, { described_class::FEATURE_CATEGORY_HEADER => 'issue_tracking' }, nil])
+        end
 
-      it 'adds the feature category to the labels for http_request_total' do
-        expect(described_class).to receive_message_chain(:http_request_total, :increment).with(method: 'get', status: 200, feature_category: 'issue_tracking')
+        it 'adds the feature category to the labels for http_request_total' do
+          expect(described_class).to receive_message_chain(:http_request_total, :increment).with(method: 'get', status: 200, feature_category: 'issue_tracking')
 
-        subject.call(env)
+          subject.call(env)
+        end
+
+        it 'does not record a feature category for health check endpoints' do
+          env['PATH_INFO'] = '/-/liveness'
+
+          expect(described_class).to receive_message_chain(:http_health_requests_total, :increment).with(method: 'get', status: 200)
+          expect(described_class).not_to receive(:http_request_total)
+
+          subject.call(env)
+        end
       end
 
-      it 'does not record a feature category for health check endpoints' do
-        env['PATH_INFO'] = '/-/liveness'
+      context 'when the feature category header is an empty string' do
+        before do
+          allow(app).to receive(:call).and_return([200, { described_class::FEATURE_CATEGORY_HEADER => '' }, nil])
+        end
 
-        expect(described_class).to receive_message_chain(:http_health_requests_total, :increment).with(method: 'get', status: 200)
-        expect(described_class).not_to receive(:http_request_total)
+        it 'sets the feature category to unknown' do
+          expect(described_class).to receive_message_chain(:http_request_total, :increment).with(method: 'get', status: 200, feature_category: 'unknown')
 
-        subject.call(env)
+          subject.call(env)
+        end
       end
     end