google-cloud-logging 1.10.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1f41e64309828c0a4ade40f6f37f34f5c880d5bc076cef18c3d864aba75e1d
-  data.tar.gz: 58f97d26011dbd5438f3644291096c37cf39fef9ab0394498148153d1a45ac50
+  metadata.gz: 7260d28a439e63fe96c5fa11487110226714c1f6faf62ed29ffeb48aba5c1914
+  data.tar.gz: c6eeefa5d3000417ca70eecbcc3a947268776947ad4922e08cb572579ae46257
 SHA512:
-  metadata.gz: f702d5baed7f22f965e294e4e81ec582aa04b0df72ffb9231d02a41791656acc486e8b0093b9c60c3f5119ceb195cf74208a5fdfa13373758f2d7a20e9326057
-  data.tar.gz: cf3d386de873038b9db370e66b85078dc4ed15961e5ba4410f7ac5dc192131db84ced61a9312d215b2e4039587433507c0758b8f913d5101d6ad1ec781d3baaa
+  metadata.gz: fc5593e6afcb5076293746ed65d754ba32b65df69e6749198eef48e9c23e0277e558fb2abb6064917ee947376d6506349916c9ea003f1bc59bcb89e0e3a71a9e
+  data.tar.gz: c4cf55027963d1ab020e3cae9049087dbf602860c5eb81c623059d5d6f3c4d0495cd30abda2b621ac385ba77c0c68ace6a9bb5851b90ac57fe57f28ce510a631

data/AUTHENTICATION.md

@@ -76,7 +76,8 @@ The environment variables that google-cloud-logging checks for project ID are:
 1. `LOGGING_PROJECT`
 2. `GOOGLE_CLOUD_PROJECT`
 
-The environment variables that google-cloud-logging checks for credentials are configured on {Google::Cloud::Logging::V2::Credentials}:
+The environment variables that google-cloud-logging checks for credentials are
+configured on `Google::Cloud::Logging::V2::LoggingService::Credentials`:
 
 1. `LOGGING_CREDENTIALS` - Path to JSON file, or JSON contents
 2. `LOGGING_KEYFILE` - Path to JSON file, or JSON contents

data/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Release History
 
+### 2.0.0 / 2020-07-21
+
+This is a major update that removes the "low-level" client interface code, and
+instead adds the new `google-cloud-logging-v2` gem as a dependency.
+The new dependency is a rewritten low-level client, produced by a next-
+generation client code generator, with improved performance and stability.
+
+This change should have no effect on the high-level interface that most users
+will use. The one exception is that the (mostly undocumented) `client_config`
+argument, for adjusting low-level parameters such as RPC retry settings on
+client objects, has been removed. If you need to adjust these parameters, use
+the configuration interface in `google-cloud-logging-v2`.
+
+Substantial changes have been made in the low-level interfaces, however. If you
+are using the low-level classes under the `Google::Cloud::Logging::V2` module,
+please review the docs for the new `google-cloud-logging-v2` gem. In
+particular:
+
+* Some classes have been renamed, notably the client class itself.
+* The client constructor takes a configuration block instead of configuration
+  keyword arguments.
+* All RPC method arguments are now keyword arguments.
+
+### 1.10.9 / 2020-06-17
+
+#### Documentation
+
+* Improved field descriptions in the low-level interface.
+
+### 1.10.8 / 2020-06-12
+
+#### Documentation
+
+* Provide more details on low-level monitored resource data types
+
+### 1.10.7 / 2020-05-28
+
+#### Documentation
+
+* Fix a few broken links
+
+### 1.10.6 / 2020-05-19
+
+#### Bug Fixes
+
+* Adjusted some default timeout and retry settings
+
 ### 1.10.5 / 2020-05-05
 
 #### Bug Fixes

data/TROUBLESHOOTING.md

@@ -24,14 +24,8 @@ improved, *please* create a new issue on GitHub so we can talk about it.
 
   - [New issue][gh-ruby]
 
-Or, you can ask questions on the [Google Cloud Platform Slack][slack-ruby]. You
-can use the "ruby" channel for general Ruby questions, or use the
-"google-cloud-ruby" channel if you have questions about this gem in particular.
-
 [so-ruby]: http://stackoverflow.com/questions/tagged/google-cloud-platform+ruby+logging
 
-[gh-search-ruby]: https://github.com/googlecloudplatform/google-cloud-ruby/issues?q=label%3A%22api%3A+logging%22
-
-[gh-ruby]: https://github.com/googlecloudplatform/google-cloud-ruby/issues/new
+[gh-search-ruby]: https://github.com/googleapis/google-cloud-ruby/issues?q=label%3A%22api%3A+logging%22
 
-[slack-ruby]: https://gcp-slack.appspot.com/
+[gh-ruby]: https://github.com/googleapis/google-cloud-ruby/issues/new

data/lib/google-cloud-logging.rb

@@ -43,8 +43,6 @@ module Google
     #   * `https://www.googleapis.com/auth/logging.admin`
     #
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     #
     # @return [Google::Cloud::Logging::Project]
     #
@@ -66,11 +64,10 @@ module Google
     #   platform_scope = "https://www.googleapis.com/auth/cloud-platform"
     #   logging = gcloud.logging scope: platform_scope
     #
-    def logging scope: nil, timeout: nil, client_config: nil
+    def logging scope: nil, timeout: nil
       timeout ||= @timeout
-      Google::Cloud.logging @project, @keyfile, scope:         scope,
-                                                timeout:       timeout,
-                                                client_config: client_config
+      Google::Cloud.logging @project, @keyfile, scope:   scope,
+                                                timeout: timeout
     end
 
     ##
@@ -96,8 +93,6 @@ module Google
     #   * `https://www.googleapis.com/auth/logging.admin`
     #
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     #
     # @return [Google::Cloud::Logging::Project]
     #
@@ -111,13 +106,11 @@ module Google
     #     puts "[#{e.timestamp}] #{e.log_name} #{e.payload.inspect}"
     #   end
     #
-    def self.logging project_id = nil, credentials = nil, scope: nil,
-                     timeout: nil, client_config: nil
+    def self.logging project_id = nil, credentials = nil, scope: nil, timeout: nil
       require "google/cloud/logging"
       Google::Cloud::Logging.new project_id: project_id,
                                  credentials: credentials,
-                                 scope: scope, timeout: timeout,
-                                 client_config: client_config
+                                 scope: scope, timeout: timeout
     end
   end
 end
@@ -139,6 +132,13 @@ Google::Cloud.configure.add_config! :logging do |config|
       "LOGGING_CREDENTIALS", "LOGGING_CREDENTIALS_JSON",
       "LOGGING_KEYFILE", "LOGGING_KEYFILE_JSON"
   end
+  default_scopes = [
+    "https://www.googleapis.com/auth/cloud-platform",
+    "https://www.googleapis.com/auth/cloud-platform.read-only",
+    "https://www.googleapis.com/auth/logging.admin",
+    "https://www.googleapis.com/auth/logging.read",
+    "https://www.googleapis.com/auth/logging.write"
+  ]
 
   config.add_field! :project_id, default_project, match: String, allow_nil: true
   config.add_alias! :project, :project_id
@@ -146,10 +146,9 @@ Google::Cloud.configure.add_config! :logging do |config|
                     match:     [String, Hash, Google::Auth::Credentials],
                     allow_nil: true
   config.add_alias! :keyfile, :credentials
-  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :scope, default_scopes, match: [String, Array]
   config.add_field! :timeout, nil, match: Integer
-  config.add_field! :client_config, nil, match: Hash
-  config.add_field! :endpoint, nil, match: String
+  config.add_field! :endpoint, "logging.googleapis.com", match: String
   config.add_field! :log_name, nil, match: String
   config.add_field! :log_name_map, nil, match: Hash
   config.add_field! :labels, nil, match: Hash

data/lib/google/cloud/logging.rb

@@ -63,8 +63,6 @@ module Google
       #   * `https://www.googleapis.com/auth/logging.admin`
       #
       # @param [Integer] timeout Default timeout to use in requests. Optional.
-      # @param [Hash] client_config A hash of values to override the default
-      #   behavior of the API client. Optional.
       # @param [String] endpoint Override of the endpoint host name. Optional.
       #   If the param is nil, uses the default endpoint.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
@@ -83,12 +81,16 @@ module Google
       #     puts "[#{e.timestamp}] #{e.log_name} #{e.payload.inspect}"
       #   end
       #
-      def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
-                   client_config: nil, endpoint: nil, project: nil, keyfile: nil
+      def self.new project_id: nil,
+                   credentials: nil,
+                   scope: nil,
+                   timeout: nil,
+                   endpoint: nil,
+                   project: nil,
+                   keyfile: nil
         project_id    ||= (project || default_project_id)
         scope         ||= configure.scope
         timeout       ||= configure.timeout
-        client_config ||= configure.client_config
         endpoint      ||= configure.endpoint
         credentials   ||= (keyfile || default_credentials(scope: scope))
 
@@ -102,12 +104,8 @@ module Google
         project_id = project_id.to_s # Always cast to a string
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        Logging::Project.new(
-          Logging::Service.new(
-            project_id, credentials,
-            host: endpoint, timeout: timeout, client_config: client_config
-          )
-        )
+        service = Logging::Service.new project_id, credentials, host: endpoint, timeout: timeout
+        Logging::Project.new service
       end
 
       ##
@@ -127,8 +125,6 @@ module Google
       # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       # * `timeout` - (Integer) Default timeout to use in requests.
-      # * `client_config` - (Hash) A hash of values to override the default
-      #   behavior of the API client.
       # * `endpoint` - (String) Override of the endpoint host name, or `nil`
       #   to use the default endpoint.
       # * `log_name` - (String) Name of the application log file. Default:
@@ -186,4 +182,7 @@ module Google
       end
     end
   end
+
+  # @private
+  Logging = Cloud::Logging unless const_defined? :Logging
 end

data/lib/google/cloud/logging/credentials.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-require "google/cloud/logging/v2/credentials"
+require "google/cloud/logging/v2/logging_service/credentials"
 
 module Google
   module Cloud
@@ -37,7 +37,7 @@ module Google
       #
       #   logging.project_id #=> "my-project"
       #
-      class Credentials < Google::Cloud::Logging::V2::Credentials
+      class Credentials < Google::Cloud::Logging::V2::LoggingService::Credentials
       end
     end
   end

data/lib/google/cloud/logging/entry.rb

@@ -422,9 +422,9 @@ module Google
         end
 
         ##
-        # @private Exports the Entry to a Google::Logging::V2::LogEntry object.
+        # @private Exports the Entry to a Google::Cloud::Logging::V2::LogEntry object.
         def to_grpc
-          grpc = Google::Logging::V2::LogEntry.new(
+          grpc = Google::Cloud::Logging::V2::LogEntry.new(
             log_name:        log_name.to_s,
             timestamp:       timestamp_grpc,
             # TODO: verify severity is the correct type?
@@ -444,7 +444,7 @@ module Google
         end
 
         ##
-        # @private New Entry from a Google::Logging::V2::LogEntry object.
+        # @private New Entry from a Google::Cloud::Logging::V2::LogEntry object.
         def self.from_grpc grpc
           return new if grpc.nil?
           new.tap do |e|
@@ -483,7 +483,7 @@ module Google
 
         ##
         # @private Formats the labels so they can be saved to a
-        # Google::Logging::V2::LogEntry object.
+        # Google::Cloud::Logging::V2::LogEntry object.
         def labels_grpc
           return {} if labels.nil?
           # Coerce symbols to strings
@@ -494,7 +494,7 @@ module Google
         end
 
         ##
-        # @private Adds the payload data to a Google::Logging::V2::LogEntry
+        # @private Adds the payload data to a Google::Cloud::Logging::V2::LogEntry
         # object.
         def append_payload grpc
           grpc.proto_payload = nil

data/lib/google/cloud/logging/entry/http_request.rb

@@ -125,10 +125,10 @@ module Google
 
           ##
           # @private Exports the HttpRequest to a
-          # Google::Logging::Type::HttpRequest object.
+          # Google::Cloud::Logging::Type::HttpRequest object.
           def to_grpc
             return nil if empty?
-            Google::Logging::Type::HttpRequest.new(
+            Google::Cloud::Logging::Type::HttpRequest.new(
               request_method:                     request_method.to_s,
               request_url:                        url.to_s,
               request_size:                       size.to_i,
@@ -143,7 +143,7 @@ module Google
           end
 
           ##
-          # @private New HttpRequest from a Google::Logging::Type::HttpRequest
+          # @private New HttpRequest from a Google::Cloud::Logging::Type::HttpRequest
           # object.
           def self.from_grpc grpc
             return new if grpc.nil?

data/lib/google/cloud/logging/entry/list.rb

@@ -145,7 +145,7 @@ module Google
 
           ##
           # @private New Entry::List from a
-          # Google::Logging::V2::ListLogEntryResponse object.
+          # Google::Cloud::Logging::V2::ListLogEntryResponse object.
           def self.from_grpc grpc_list, service, resources: nil, filter: nil,
                              order: nil, max: nil, projects: nil
             entries = new(Array(grpc_list.entries).map do |grpc_entry|

data/lib/google/cloud/logging/entry/operation.rb

@@ -61,10 +61,10 @@ module Google
 
           ##
           # @private Exports the Operation to a
-          # Google::Logging::V2::LogEntryOperation object.
+          # Google::Cloud::Logging::V2::LogEntryOperation object.
           def to_grpc
             return nil if empty?
-            Google::Logging::V2::LogEntryOperation.new(
+            Google::Cloud::Logging::V2::LogEntryOperation.new(
               id:       id.to_s,
               producer: producer.to_s,
               first:    !(!first),
@@ -74,7 +74,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Logging::Entry::Operation from a
-          # Google::Logging::V2::LogEntryOperation object.
+          # Google::Cloud::Logging::V2::LogEntryOperation object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|

data/lib/google/cloud/logging/entry/source_location.rb

@@ -57,10 +57,10 @@ module Google
 
           ##
           # @private Exports the SourceLocation to a
-          # Google::Logging::V2::LogEntrySourceLocation object.
+          # Google::Cloud::Logging::V2::LogEntrySourceLocation object.
           def to_grpc
             return nil if empty?
-            Google::Logging::V2::LogEntrySourceLocation.new(
+            Google::Cloud::Logging::V2::LogEntrySourceLocation.new(
               file:     file.to_s,
               line:     line,
               function: function.to_s
@@ -69,7 +69,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Logging::Entry::SourceLocation from a
-          # Google::Logging::V2::LogEntrySourceLocation object.
+          # Google::Cloud::Logging::V2::LogEntrySourceLocation object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|

data/lib/google/cloud/logging/log/list.rb

@@ -129,7 +129,7 @@ module Google
 
           ##
           # @private New Log::List from a
-          # Google::Logging::V2::ListLogsResponse object.
+          # Google::Cloud::Logging::V2::ListLogsResponse object.
           def self.from_grpc grpc_list, service, resource: nil, max: nil
             logs = new Array(grpc_list.log_names)
             token = grpc_list.next_page_token

data/lib/google/cloud/logging/metric.rb

@@ -43,14 +43,14 @@ module Google
         attr_accessor :service
 
         ##
-        # @private The gRPC Google::Logging::V2::LogMetric object.
+        # @private The gRPC Google::Cloud::Logging::V2::LogMetric object.
         attr_accessor :grpc
 
         ##
         # @private Create an empty Metric object.
         def initialize
           @service = nil
-          @grpc = Google::Logging::V2::LogMetric.new
+          @grpc = Google::Cloud::Logging::V2::LogMetric.new
         end
 
         ##

data/lib/google/cloud/logging/metric/list.rb

@@ -142,7 +142,7 @@ module Google
 
           ##
           # @private New Metric::List from a
-          # Google::Logging::V2::ListLogMetricsResponse object.
+          # Google::Cloud::Logging::V2::ListLogMetricsResponse object.
           def self.from_grpc grpc_list, service, max = nil
             metrics = new(Array(grpc_list.metrics).map do |grpc_metric|
               Metric.from_grpc grpc_metric, service

data/lib/google/cloud/logging/resource_descriptor/list.rb

@@ -147,7 +147,7 @@ module Google
 
           ##
           # @private New ResourceDescriptor::List from a
-          # Google::Logging::V2::ListMonitoredResourceDescriptorsResponse
+          # Google::Cloud::Logging::V2::ListMonitoredResourceDescriptorsResponse
           # object.
           def self.from_grpc grpc_list, service, max = nil
             rds = new(Array(grpc_list.resource_descriptors).map do |grpc|

data/lib/google/cloud/logging/service.rb

@@ -16,7 +16,6 @@
 require "google/cloud/errors"
 require "google/cloud/logging/version"
 require "google/cloud/logging/v2"
-require "google/gax/errors"
 require "uri"
 
 module Google
@@ -26,61 +25,56 @@ module Google
       # @private Represents the gRPC Logging service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config, :host
+        attr_accessor :project, :credentials, :timeout, :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil,
-                       host: nil
+        def initialize project, credentials, timeout: nil, host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
-          @client_config = client_config || {}
-          @host = host || V2::LoggingServiceV2Client::SERVICE_ADDRESS
+          @host = host
         end
 
         def logging
           return mocked_logging if mocked_logging
           @logging ||= \
-            V2::LoggingServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::LoggingService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_logging
 
         def sinks
           return mocked_sinks if mocked_sinks
           @sinks ||= \
-            V2::ConfigServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::ConfigService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_sinks
 
         def metrics
           return mocked_metrics if mocked_metrics
           @metrics ||= \
-            V2::MetricsServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::MetricsService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_metrics
 
@@ -90,20 +84,12 @@ module Google
           project_ids = Array(projects).map { |p| "projects/#{p}" }
           resource_names = Array(resources) + project_ids
           resource_names = ["projects/#{@project}"] if resource_names.empty?
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = logging.list_log_entries \
-              resource_names, filter: filter, order_by: order, page_size: max,
-                              options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = logging.list_log_entries resource_names: resource_names,
+                                                filter:         filter,
+                                                order_by:       order,
+                                                page_size:      max,
+                                                page_token:     token
+          paged_enum.response
         end
 
         def write_entries entries, log_name: nil, resource: nil, labels: nil,
@@ -114,157 +100,93 @@ module Google
           end
           resource = resource.to_grpc if resource
           labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
-
-          execute do
-            logging.write_log_entries entries,
-                                      log_name: log_path(log_name),
-                                      resource: resource, labels: labels,
-                                      partial_success: partial_success,
-                                      options: default_options
-          end
+          logging.write_log_entries entries:         entries,
+                                    log_name:        log_path(log_name),
+                                    resource:        resource,
+                                    labels:          labels,
+                                    partial_success: partial_success
         end
 
         def list_logs resource: nil, token: nil, max: nil
           parent = resource || "projects/#{@project}"
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = logging.list_logs parent, page_size: max,
-                                                   options:   call_opts
-            paged_enum.page.response
-          end
+          paged_enum = logging.list_logs parent:     parent,
+                                         page_size:  max,
+                                         page_token: token
+          paged_enum.response
         end
 
         def delete_log name
-          execute do
-            logging.delete_log log_path(name), options: default_options
-          end
+          logging.delete_log log_name: log_path(name)
         end
 
         def list_resource_descriptors token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            logging.list_monitored_resource_descriptors \
-              page_size: max, options: call_opts
-          end
+          logging.list_monitored_resource_descriptors page_size: max, page_token: token
         end
 
         def list_sinks token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = sinks.list_sinks \
-              project_path, page_size: max, options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = sinks.list_sinks parent: project_path, page_size: max, page_token: token
+          paged_enum.response
         end
 
         def create_sink name, destination, filter, unique_writer_identity: nil
-          sink = Google::Logging::V2::LogSink.new({
-            name: name, destination: destination, filter: filter
-          }.delete_if { |_, v| v.nil? })
-
-          execute do
-            sinks.create_sink project_path, sink,
-                              unique_writer_identity: unique_writer_identity,
-                              options:                default_options
-          end
+          sink = Google::Cloud::Logging::V2::LogSink.new(
+            {
+              name: name, destination: destination, filter: filter
+            }.delete_if { |_, v| v.nil? }
+          )
+          sinks.create_sink parent:                 project_path,
+                            sink:                   sink,
+                            unique_writer_identity: unique_writer_identity
         end
 
         def get_sink name
-          execute { sinks.get_sink sink_path(name), options: default_options }
+          sinks.get_sink sink_name: sink_path(name)
         end
 
         def update_sink name, destination, filter, unique_writer_identity: nil
-          sink = Google::Logging::V2::LogSink.new(
+          sink = Google::Cloud::Logging::V2::LogSink.new(
             {
               name: name, destination: destination, filter: filter
             }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            sinks.update_sink sink_path(name), sink,
-                              unique_writer_identity: unique_writer_identity,
-                              options:                default_options
-          end
+          sinks.update_sink sink_name:              sink_path(name),
+                            sink:                   sink,
+                            unique_writer_identity: unique_writer_identity
         end
 
         def delete_sink name
-          execute do
-            sinks.delete_sink sink_path(name), options: default_options
-          end
+          sinks.delete_sink sink_name: sink_path(name)
         end
 
         def list_metrics token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = metrics.list_log_metrics \
-              project_path, page_size: max, options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = metrics.list_log_metrics parent:     project_path,
+                                                page_size:  max,
+                                                page_token: token
+          paged_enum.response
         end
 
         def create_metric name, filter, description
-          metric = Google::Logging::V2::LogMetric.new(
+          metric = Google::Cloud::Logging::V2::LogMetric.new(
             { name: name, description: description,
               filter: filter }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            metrics.create_log_metric project_path, metric,
-                                      options: default_options
-          end
+          metrics.create_log_metric parent: project_path, metric: metric
         end
 
         def get_metric name
-          execute do
-            metrics.get_log_metric metric_path(name), options: default_options
-          end
+          metrics.get_log_metric metric_name: metric_path(name)
         end
 
         def update_metric name, description, filter
-          metric = Google::Logging::V2::LogMetric.new(
+          metric = Google::Cloud::Logging::V2::LogMetric.new(
             { name: name, description: description,
               filter: filter }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            metrics.update_log_metric metric_path(name), metric,
-                                      options: default_options
-          end
+          metrics.update_log_metric metric_name: metric_path(name), metric: metric
         end
 
         def delete_metric name
-          execute do
-            metrics.delete_log_metric metric_path(name),
-                                      options: default_options
-          end
+          metrics.delete_log_metric metric_name: metric_path(name)
         end
 
         def log_path log_name
@@ -280,16 +202,6 @@ module Google
 
         protected
 
-        def service_address
-          return nil if host.nil?
-          URI.parse("//#{host}").host
-        end
-
-        def service_port
-          return nil if host.nil?
-          URI.parse("//#{host}").port
-        end
-
         def project_path
           "projects/#{@project}"
         end
@@ -304,14 +216,6 @@ module Google
           "#{project_path}/metrics/#{metric_name}"
         end
 
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
-
         ##
         # @private Get a Google::Protobuf::Timestamp object from a Time object.
         def time_to_timestamp time
@@ -329,13 +233,6 @@ module Google
           # Time.at takes microseconds, so convert nano seconds to microseconds
           Time.at timestamp.seconds, Rational(timestamp.nanos, 1000)
         end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        end
       end
     end
   end