Add more structured JSON logging to Kubernetes classes

2 files changed, 14 insertions, 0 deletions

diff --git a/app/services/clusters/gcp/fetch_operation_service.rb b/app/services/clusters/gcp/fetch_operation_service.rb
index 02c96a1e286..90afb1cee8e 100644
--- a/app/services/clusters/gcp/fetch_operation_service.rb
+++ b/app/services/clusters/gcp/fetch_operation_service.rb
@@ -11,8 +11,15 @@ module Clusters
 
         yield(operation) if block_given?
       rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
+        logger.error(exception: e.class.name, service: self.class.name, provider_id: provider.id, message: e.message)
         provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
       end
+
+      private
+
+      def logger
+        @logger ||= Gitlab::Kubernetes::Logger.build
+      end
     end
   end
 end
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb
index e029323774c..b94552c30fd 100644
--- a/app/services/clusters/gcp/finalize_creation_service.rb
+++ b/app/services/clusters/gcp/finalize_creation_service.rb
@@ -16,15 +16,22 @@ module Clusters
         ClusterPlatformConfigureWorker.perform_async(cluster.id)
 
       rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
+        logger.error(exception: e.class.name, service: self.class.name, provider_id: provider.id, message: e.message)
         provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
       rescue Kubeclient::HttpError => e
+        logger.error(exception: e.class.name, service: self.class.name, provider_id: provider.id, message: e.message)
         provider.make_errored!("Failed to run Kubeclient: #{e.message}")
       rescue ActiveRecord::RecordInvalid => e
+        logger.error(exception: e.class.name, service: self.class.name, provider_id: provider.id, message: e.message)
         provider.make_errored!("Failed to configure Google Kubernetes Engine Cluster: #{e.message}")
       end
 
       private
 
+      def logger
+        @logger ||= Gitlab::Kubernetes::Logger.build
+      end
+
       def create_gitlab_service_account!
         Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService.gitlab_creator(
           kube_client,