Merge branch 'joe/observability_auth_scopes_logs' into 'master'

Enable observability auth scopes with logs FF

Closes gitlab-org/opstrace/opstrace#2651

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143350



Merged-by: Etienne Baqué <ebaque@gitlab.com>
Approved-by: Etienne Baqué <ebaque@gitlab.com>
Approved-by: Vladlena Shumilo <vshumilo@gitlab.com>
Co-authored-by: Joe Shaw <jshaw@gitlab.com>

lib/gitlab/observability.rb

@@ -26,7 +26,8 @@ def should_enable_observability_auth_scopes?(resource)
       # Enable the needed oauth scopes if tracing is enabled.
       if resource.is_a?(Group) || resource.is_a?(Project)
         return Feature.enabled?(:observability_tracing, resource.root_ancestor) ||
-            Feature.enabled?(:observability_metrics, resource.root_ancestor)
+            Feature.enabled?(:observability_metrics, resource.root_ancestor) ||
+            Feature.enabled?(:observability_logs, resource.root_ancestor)
       end
 
       false

spec/lib/gitlab/auth_spec.rb

@@ -76,7 +76,7 @@
     end
 
     context 'with observability feature flags' do
-      feature_flags = [:observability_tracing, :observability_metrics]
+      feature_flags = [:observability_tracing, :observability_metrics, :observability_logs]
 
       context 'when all disabled' do
         before do

spec/lib/gitlab/observability_spec.rb

@@ -56,7 +56,7 @@
       end
     end
 
-    feature_flags = [:observability_tracing, :observability_metrics]
+    feature_flags = [:observability_tracing, :observability_metrics, :observability_logs]
     flag_states = [true, false].repeated_permutation(feature_flags.length)
     flag_tests = flag_states.map { |flags| Hash[feature_flags.zip(flags)] }