Merge branch 'mk/add-primary-api-url-to-error-log' into 'master'

Geo: Add primary API URL to registry sync error log

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



Merged-by: Aakriti Gupta <agupta@gitlab.com>
Approved-by: Ian Baum <ibaum@gitlab.com>
Approved-by: Aakriti Gupta <agupta@gitlab.com>
Co-authored-by: Mike Kozono <mkozono@gitlab.com>

ee/app/services/geo/container_repository_sync_service.rb

@@ -54,13 +54,19 @@ def reschedule_sync
     def fail_registry_sync!(message, error)
       log_error(message, error)
 
-      Gitlab::ErrorTracking.track_exception(error,
-        {
-          container_repository_name: container_repository.name,
-          project_path: container_repository.project.full_path,
-          project_id: container_repository.project_id
-        }
-      )
+      extra = {
+        container_repository_name: container_repository.name,
+        project_path: container_repository.project.full_path,
+        project_id: container_repository.project_id
+      }
+
+      begin
+        primary_api_url = Gitlab.config&.geo&.registry_replication&.primary_api_url
+        extra[:primary_api_url] = primary_api_url if primary_api_url
+      rescue ::GitlabSettings::MissingSetting
+      end
+
+      Gitlab::ErrorTracking.track_exception(error, extra)
 
       registry.failed!(message: message, error: error)
     end

ee/spec/services/geo/container_repository_sync_service_spec.rb

@@ -65,6 +65,7 @@
     it 'tracks exception' do
       error = StandardError.new('Sync Error')
 
+      stub_registry_replication_config(enabled: true, primary_api_url: 'https://foo')
       allow_any_instance_of(Geo::ContainerRepositorySync)
         .to receive(:execute).and_raise(error)
 
@@ -73,7 +74,8 @@
         {
           container_repository_name: container_repository.name,
           project_path: container_repository.project.full_path,
-          project_id: container_repository.project_id
+          project_id: container_repository.project_id,
+          primary_api_url: 'https://foo'
         }
       )