google-cloud-error_reporting 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b08940e7e30a94943a7ab3fe2f1ce9695f3b574e4e0f8e895b8e06ba1b650f
-  data.tar.gz: 03d55257fbdd0a03e4b6ba60de5bf8511d2bf1a36ad684048c436e8de95d598c
+  metadata.gz: 84b5253d164ae3db6ddc1be54bfa7b9c9ce343a2324137c0c1ab08b3cdc4c66f
+  data.tar.gz: 64bd74a706fd71fc3f54ceacda2a6c5742f035f41d42c873121d8b8f9a23a90b
 SHA512:
-  metadata.gz: 32665a9fd9b67bca78ba3197b61ba7bb55f6f7907e904d99cb9384aa5347a99eafa253cc4dce07c15413dee3e0fdf87d7e970afd16ab4e548837c1f80ed956e3
-  data.tar.gz: e75022416eabb7eb6dd6b5cdc1de25f5758923093314dac7356a2dc4e48458e7154b90e9acf27edd110978a2ccb7a5c1b6b8cd848494626207df8e933330cae0
+  metadata.gz: 62a140a092f7b33d38c46ffe1d303b06aa12b3ad6fe2eb7781568d9a11111aba123fda5c481bdc1ae2c2a82692e086b56d1042518b99a05f9830d32e6da678df
+  data.tar.gz: a3d8cdfc89c1eeb7758da6fa59201dfec377b9a513570eebed212b3f9c088bcb11b3c81fee2481b522e33544faed4c971eade4e9cec276bbea226d704a7f6aee

data/README.md

@@ -2,10 +2,10 @@
 
 [Stackdriver Error Reporting](https://cloud.google.com/error-reporting/) counts,
 analyzes and aggregates errors raised in your running cloud services. A
-centralized error management interface displays the results with sorting 
-and filtering capabilities. A dedicated view shows the error details: time 
-chart, occurrences, affected user count, first and last seen dates and a 
-cleaned exception stack trace. Opt-in to receive email and mobile alerts on 
+centralized error management interface displays the results with sorting
+and filtering capabilities. A dedicated view shows the error details: time
+chart, occurrences, affected user count, first and last seen dates and a
+cleaned exception stack trace. Opt-in to receive email and mobile alerts on
 new errors.
 
 - [google-cloud-error_reporting API documentation](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-error_reporting/latest)
@@ -35,26 +35,26 @@ gem "google-cloud-error_reporting"
 $ bundle install
 ```
 
-Alternatively, check out the [`stackdriver`](../stackdriver) gem that includes 
+Alternatively, check out the [`stackdriver`](../stackdriver) gem that includes
 the `google-cloud-error_reporting` gem.
 
 ## Enable Stackdriver Error Reporting API
 
 The Stackdriver Error Reporting library needs the [Stackdriver Error
-Reporting API](https://console.cloud.google.com/apis/library/clouderrorreporting.googleapis.com) 
-to be enabled on your Google Cloud project. Make sure it's enabled if not 
+Reporting API](https://console.cloud.google.com/apis/library/clouderrorreporting.googleapis.com)
+to be enabled on your Google Cloud project. Make sure it's enabled if not
 already.
 
 ## Reporting errors in Rack-based frameworks
 
-The Stackdriver Error Reporting library for Ruby makes it easy to integrate 
-Stackdriver Error Reporting into popular Rack-based Ruby web frameworks such as 
-Ruby on Rails and Sinatra. When the library integration is enabled, it 
+The Stackdriver Error Reporting library for Ruby makes it easy to integrate
+Stackdriver Error Reporting into popular Rack-based Ruby web frameworks such as
+Ruby on Rails and Sinatra. When the library integration is enabled, it
 automatically reports exceptions captured from the application's Rack stack.
 
 ### With Ruby on Rails
 
-You can load the Railtie that comes with the library into your Ruby 
+You can load the Railtie that comes with the library into your Ruby
 on Rails application by explicitly requiring it during the application startup:
 
 ```ruby
@@ -62,12 +62,12 @@ on Rails application by explicitly requiring it during the application startup:
 require "google/cloud/error_reporting/rails"
 ```
 
-If you're using the `stackdriver` gem, it automatically loads the Railtie into 
+If you're using the `stackdriver` gem, it automatically loads the Railtie into
 your application when it starts.
 
 ### With other Rack-based frameworks
 
-Other Rack-based frameworks, such as Sinatra, can use the Rack Middleware 
+Other Rack-based frameworks, such as Sinatra, can use the Rack Middleware
 provided by the library:
 
 ```ruby
@@ -90,58 +90,58 @@ end
 
 ## Configuring the library
 
-You can customize the behavior of the Stackdriver Error Reporting library for 
-Ruby. See the [configuration guide](../stackdriver/docs/configuration.md) for a list 
+You can customize the behavior of the Stackdriver Error Reporting library for
+Ruby. See the [configuration guide](../stackdriver/docs/configuration.md) for a list
 of possible configuration options.
 
 ## Running on Google Cloud Platform
 
-The Stackdriver Error Reporting library for Ruby should work without you 
-manually providing authentication credentials for instances running on Google 
-Cloud Platform, as long as the Stackdriver Error Reporting API access scope is 
+The Stackdriver Error Reporting library for Ruby should work without you
+manually providing authentication credentials for instances running on Google
+Cloud Platform, as long as the Stackdriver Error Reporting API access scope is
 enabled on that instance.
 
 ### App Engine
 
-On Google App Engine, the Stackdriver Error Reporting API access scope is 
-enabled by default, and the Stackdriver Error Reporting library for Ruby can 
+On Google App Engine, the Stackdriver Error Reporting API access scope is
+enabled by default, and the Stackdriver Error Reporting library for Ruby can
 be used without providing credentials or a project ID.
 
 ### Container Engine
 
-On Google Container Engine, you must explicitly add the `cloud-platform` OAuth 
+On Google Container Engine, you must explicitly add the `cloud-platform` OAuth
 scope when creating the cluster:
 
 ```sh
 $ gcloud container clusters create example-cluster-name --scopes https://www.googleapis.com/auth/cloud-platform
 ```
 
-You may also do this through the Google Cloud Platform Console. Select 
+You may also do this through the Google Cloud Platform Console. Select
 **Enabled** in the **Cloud Platform** section of **Create a container cluster**.
 
 ### Compute Engine
 
-For Google Compute Engine instances, you must explicitly enable the 
-`cloud-platform` access scope for each instance. When you create a new instance 
-through the Google Cloud Platform Console, you can do this under Identity and 
-API access: Use the Compute Engine default service account and select "Allow 
+For Google Compute Engine instances, you must explicitly enable the
+`cloud-platform` access scope for each instance. When you create a new instance
+through the Google Cloud Platform Console, you can do this under Identity and
+API access: Use the Compute Engine default service account and select "Allow
 full access to all Cloud APIs" under Access scopes.
 
 ## Running locally and elsewhere
 
-To run the Stackdriver Error Reporting outside of Google Cloud Platform, you 
-must supply your GCP project ID and appropriate service account credentials 
-directly to the Stackdriver Error Reporting. This applies to running the 
-library on your own workstation, on your datacenter's computers, or on the VM 
-instances of another cloud provider. See the [Authentication 
+To run the Stackdriver Error Reporting outside of Google Cloud Platform, you
+must supply your GCP project ID and appropriate service account credentials
+directly to the Stackdriver Error Reporting. This applies to running the
+library on your own workstation, on your datacenter's computers, or on the VM
+instances of another cloud provider. See the [Authentication
 section](#authentication) for instructions on how to do so.
 
 ## Authentication
 
-The Instrumentation client and API use Service Account credentials to connect 
-to Google Cloud services. When running on Google Cloud Platform environments, 
-the credentials will be discovered automatically. When running on other 
-environments the Service Account credentials can be specified by providing in 
+The Instrumentation client and API use Service Account credentials to connect
+to Google Cloud services. When running on Google Cloud Platform environments,
+the credentials will be discovered automatically. When running on other
+environments the Service Account credentials can be specified by providing in
 several ways.
 
 The best way to provide authentication information if you're using Ruby on Rails
@@ -161,7 +161,7 @@ end
 
 Other Rack-based applications that are loading the Rack Middleware directly or
 using the manually reporting interface can leverage the configration interface:
- 
+
 ```ruby
 require "google/cloud/error_reporting"
 Google::Cloud.configure do |config|
@@ -174,8 +174,8 @@ Google::Cloud.configure do |config|
 end
 ```
 
-This library also supports the other authentication methods provided by the 
-`google-cloud-ruby` suite. Instructions and configuration options are covered 
+This library also supports the other authentication methods provided by the
+`google-cloud-ruby` suite. Instructions and configuration options are covered
 in the [Authentication Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-debugger/guides/authentication).
 
 ## Supported Ruby Versions
@@ -186,19 +186,19 @@ This library is supported on Ruby 2.0+.
 
 This library follows [Semantic Versioning](http://semver.org/).
 
-It is currently in major version zero (0.y.z), which means that anything may 
+It is currently in major version zero (0.y.z), which means that anything may
 change at any time and the public API should not be considered stable.
 
 ## Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See the 
-[Contributing Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/contributing) 
+See the
+[Contributing Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/contributing)
 for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By
-participating in this project you agree to abide by its terms. See 
+participating in this project you agree to abide by its terms. See
 [Code of Conduct](../CODE_OF_CONDUCT.md) for more information.
 
 ## License
@@ -208,9 +208,9 @@ This library is licensed under Apache 2.0. Full license text is available in
 
 ## Support
 
-Please 
+Please
 [report bugs at the project on Github](https://github.com/GoogleCloudPlatform/google-cloud-ruby/issues).
-Don't hesitate to 
-[ask questions](http://stackoverflow.com/questions/tagged/google-cloud-platform+ruby) 
+Don't hesitate to
+[ask questions](http://stackoverflow.com/questions/tagged/google-cloud-platform+ruby)
 about the client or APIs on [StackOverflow](http://stackoverflow.com).
 

data/lib/google-cloud-error_reporting.rb

@@ -18,6 +18,8 @@
 
 gem "google-cloud-core"
 require "google/cloud"
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -36,6 +38,7 @@ module Google
     #   The default scope is:
     #
     #   * `https://www.googleapis.com/auth/cloud-platform`
+    #
     # @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.
@@ -62,7 +65,6 @@ module Google
                                     client_config: client_config
     end
 
-
     ##
     # Create a new object for connecting to the Stackdriver Error Reporting
     # service. Each call creates a new connection.
@@ -84,6 +86,7 @@ module Google
     #   The default scope is:
     #
     #   * `https://www.googleapis.com/auth/cloud-platform`
+    #
     # @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.
@@ -113,3 +116,50 @@ module Google
     end
   end
 end
+
+# Add error reporting to top-level configuration
+Google::Cloud.configure do |config|
+  unless config.field? :use_error_reporting
+    config.add_field! :use_error_reporting, nil, enum: [true, false]
+  end
+  unless config.field? :service_name
+    config.add_field! :service_name, nil, match: String
+  end
+  unless config.field? :service_version
+    config.add_field! :service_version, nil, match: String
+  end
+end
+
+# Set the default error reporting configuration
+Google::Cloud.configure.add_config! :error_reporting do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["ERROR_REPORTING_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "ERROR_REPORTING_CREDENTIALS", "ERROR_REPORTING_CREDENTIALS_JSON",
+      "ERROR_REPORTING_KEYFILE", "ERROR_REPORTING_KEYFILE_JSON"
+    )
+  end
+  default_service = Google::Cloud::Config.deferred do
+    ENV["ERROR_REPORTING_SERVICE"]
+  end
+  default_version = Google::Cloud::Config.deferred do
+    ENV["ERROR_REPORTING_VERSION"]
+  end
+
+  config.add_field! :project_id, default_project, match: String, allow_nil: true
+  config.add_alias! :project, :project_id
+  config.add_field! :credentials, default_creds,
+                    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! :timeout, nil, match: Integer
+  config.add_field! :client_config, nil, match: Hash
+  config.add_field! :service_name, default_service,
+                    match: String, allow_nil: true
+  config.add_field! :service_version, default_version,
+                    match: String, allow_nil: true
+  config.add_field! :ignore_classes, nil, match: Array
+end

data/lib/google/cloud/error_reporting.rb

@@ -17,6 +17,8 @@ require "google-cloud-error_reporting"
 require "google/cloud/error_reporting/async_error_reporter"
 require "google/cloud/error_reporting/project"
 require "google/cloud/error_reporting/middleware"
+require "google/cloud/config"
+require "google/cloud/env"
 require "stackdriver/core"
 
 module Google
@@ -34,12 +36,13 @@ module Google
     # [Stackdriver Error Reporting
     # Documentation](https://cloud.google.com/error-reporting/docs/).
     #
-    # The goal of google-cloud-ruby is to provide an API that is comfortable to
-    # Rubyists. Authentication is handled by the client. You can provide the
-    # project and credential information to connect to the Stackdriver Error
-    # Reporting service, or if you are running on Google Cloud Platform this
-    # configuration is taken care of for you. You can read more about the
-    # options for connecting in the [Authentication
+    # The goal of google-cloud is to provide an API that is comfortable to
+    # Rubyists. Your authentication credentials are detected automatically in
+    # Google Cloud Platform environments such as Google Compute Engine, Google
+    # App Engine and Google Kubernetes Engine. In other environments you can
+    # configure authentication easily, either directly in your code or via
+    # environment variables. Read more about the options for connecting in the
+    # [Authentication
     # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
     # ## How to report errors
@@ -72,12 +75,6 @@ module Google
     # for more examples.
     #
     module ErrorReporting
-      # Initialize :error_reporting as a nested Configuration under
-      # Google::Cloud if haven't already
-      unless Google::Cloud.configure.option? :error_reporting
-        Google::Cloud.configure.add_options :error_reporting
-      end
-
       ##
       # @private The default Google::Cloud::ErrorReporting::Project client used
       # for the Google::Cloud::ErrorReporting.report API.
@@ -125,10 +122,13 @@ module Google
                    client_config: nil, project: nil, keyfile: nil
         project_id ||= (project || ErrorReporting::Project.default_project_id)
         project_id = project_id.to_s
-        fail ArgumentError, "project_id is missing" if project_id.empty?
+        raise ArgumentError, "project_id is missing" if project_id.empty?
+
+        scope ||= configure.scope
+        timeout ||= configure.timeout
+        client_config ||= configure.client_config
 
-        credentials ||= keyfile
-        credentials ||= ErrorReporting::Credentials.default(scope: scope)
+        credentials ||= (keyfile || default_credentials(scope: scope))
         unless credentials.is_a? Google::Auth::Credentials
           credentials = ErrorReporting::Credentials.new credentials,
                                                         scope: scope
@@ -147,6 +147,27 @@ module Google
       # client, allows the {.report} public method to reuse these
       # configured parameters.
       #
+      # The following Stackdriver ErrorReporting configuration parameters are
+      # supported:
+      #
+      # * `project_id` - (String)  Google Cloud Platform project identifier for
+      #   the Stackdriver Error Reporting service you are connecting to. (The
+      #   parameter `project` is considered deprecated, but may also be used.)
+      # * `credentials` - (String, Hash, Google::Auth::Credentials) The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {ErrorReporting::Credentials})
+      #   (The parameter `keyfile` is considered deprecated, but may also be
+      #   used.)
+      # * `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.
+      # * `service_name` - (String) Name for the application.
+      # * `service_version` - (String) Version identifier for the application.
+      # * `ignore_classes` - (Array<Exception>) Array of exception types that
+      #   should not be reported.
+      #
       # See the [Configuration
       # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/stackdriver/guides/instrumentation_configuration)
       # for full configuration parameters.
@@ -157,7 +178,7 @@ module Google
       #
       #   Google::Cloud::ErrorReporting.configure do |config|
       #     config.project_id = "my-project"
-      #     config.keyfile = "/path/to/keyfile.json"
+      #     config.credentials = "/path/to/keyfile.json"
       #     config.service_name = "my-service"
       #     config.service_version = "v8"
       #   end
@@ -169,7 +190,7 @@ module Google
       #     Google::Cloud::ErrorReporting.report exception
       #   end
       #
-      # @return [Stackdriver::Core::Configuration] The configuration object
+      # @return [Google::Cloud::Config] The configuration object
       #   the Google::Cloud::ErrorReporting module uses.
       #
       def self.configure
@@ -226,10 +247,8 @@ module Google
       def self.report exception, service_name: nil, service_version: nil
         return if Google::Cloud.configure.use_error_reporting == false
 
-        service_name ||= configure.service_name ||
-                         Project.default_service_name
-        service_version ||= configure.service_version ||
-                            Project.default_service_version
+        service_name ||= Project.default_service_name
+        service_version ||= Project.default_service_version
 
         error_event = ErrorEvent.from_exception(exception).tap do |event|
           event.service_name = service_name
@@ -245,13 +264,11 @@ module Google
       # @private Create a private client to
       def self.default_client
         unless @@default_client
-          project_id = configure.project_id ||
-                       Google::Cloud.configure.project_id
-          keyfile = configure.keyfile ||
-                    Google::Cloud.configure.keyfile
+          project_id = Project.default_project_id
+          credentials = default_credentials
 
           @@default_client = AsyncErrorReporter.new(
-            new(project: project_id, keyfile: keyfile)
+            new(project_id: project_id, credentials: credentials)
           )
         end
 
@@ -259,6 +276,16 @@ module Google
       end
 
       private_class_method :default_client
+
+      ##
+      # @private Default credentials.
+      def self.default_credentials scope: nil
+        Google::Cloud.configure.error_reporting.credentials ||
+          Google::Cloud.configure.credentials ||
+          ErrorReporting::Credentials.default(scope: scope)
+      end
+
+      private_class_method :default_credentials
     end
   end
 end

data/lib/google/cloud/error_reporting/async_error_reporter.rb

@@ -81,7 +81,7 @@ module Google
           return if error_event.nil?
           begin
             error_reporting.report error_event
-          rescue => e
+          rescue StandardError => e
             warn error_event.message if error_event.message
             warn ["#{e.class}: #{e.message}", e.backtrace].join("\n\t")
             @last_exception = e

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

@@ -38,19 +38,19 @@ module Google
       #   error_reporting.project_id #=> "my-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"]
-        PATH_ENV_VARS = %w(ERROR_REPORTING_CREDENTIALS
+        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
+        PATH_ENV_VARS = %w[ERROR_REPORTING_CREDENTIALS
                            GOOGLE_CLOUD_CREDENTIALS
                            ERROR_REPORTING_KEYFILE
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(ERROR_REPORTING_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[ERROR_REPORTING_CREDENTIALS_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            ERROR_REPORTING_KEYFILE_JSON
                            GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON)
+                           GCLOUD_KEYFILE_JSON].freeze
         DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"]
+          ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

data/lib/google/cloud/error_reporting/middleware.rb

@@ -54,7 +54,7 @@ module Google
             error_reporting ||
             ErrorReporting::AsyncErrorReporter.new(
               ErrorReporting.new(project: configuration.project_id,
-                                 keyfile: configuration.keyfile)
+                                 credentials: configuration.credentials)
             )
 
           # Set module default client to reuse the same client. Update module
@@ -154,16 +154,20 @@ module Google
         # already.
         #
         def load_config **kwargs
-          configuration.project_id = kwargs[:project_id] ||
-                                     configuration.project_id
-          configuration.keyfile = kwargs[:keyfile] ||
-                                  configuration.keyfile
-          configuration.service_name = kwargs[:service_name] ||
-                                       configuration.service_name
-          configuration.service_version = kwargs[:service_version] ||
-                                          configuration.service_version
-          configuration.ignore_classes = kwargs[:ignore_classes] ||
-                                         configuration.ignore_classes
+          project_id = kwargs[:project] || kwargs[:project_id]
+          configuration.project_id = project_id unless project_id.nil?
+
+          creds = kwargs[:credentials] || kwargs[:keyfile]
+          configuration.credentials = creds unless creds.nil?
+
+          service_name = kwargs[:service_name]
+          configuration.service_name = service_name unless service_name.nil?
+
+          service_vers = kwargs[:service_version]
+          configuration.service_version = service_vers unless service_vers.nil?
+
+          ignores = kwargs[:ignore_classes]
+          configuration.ignore_classes = ignores unless ignores.nil?
 
           init_default_config
         end
@@ -171,13 +175,13 @@ module Google
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= \
+          configuration.project_id ||= begin
             (Cloud.configure.project_id ||
              ErrorReporting::Project.default_project_id)
-          configuration.keyfile ||= Cloud.configure.keyfile
+          end
+          configuration.credentials ||= Cloud.configure.credentials
           configuration.service_name ||=
             ErrorReporting::Project.default_service_name
-
           configuration.service_version ||=
             ErrorReporting::Project.default_service_version
           configuration.ignore_classes = Array(configuration.ignore_classes)

data/lib/google/cloud/error_reporting/project.rb

@@ -14,7 +14,6 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/env"
 require "google/cloud/error_reporting/service"
 require "google/cloud/error_reporting/credentials"
 require "google/cloud/error_reporting/error_event"
@@ -44,41 +43,42 @@ module Google
       #
       class Project
         ##
-        # Find default project_id from `ERROR_REPORTING_RPOJECT`,
-        # `GOOGLE_CLOUD_PROJECT`, `GCLOUD_PROJECT` environment varaibles, or
-        # query from GCE meta service.
+        # Find default project_id from the configuration, environment
+        # varaibles, or query from GCE meta service.
         #
         # @return [String] default valid GCP project_id
         #
         def self.default_project_id
-          ENV["ERROR_REPORTING_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
+          Google::Cloud.configure.error_reporting.project_id ||
+            Google::Cloud.configure.project_id ||
             Google::Cloud.env.project_id
         end
         class << self
-          alias_method :default_project, :default_project_id
+          alias default_project default_project_id
         end
 
         ##
-        # Find default service_name from `ERROR_REPORTING_SERVICE`,
-        # `GAE_SERVICE` environment Variables, or just "ruby".
+        # Find default service_name from the configuration, environment
+        # varaibles, or query from GCE meta service, or just "ruby".
         #
         # @return [String] default GCP service_name
         #
         def self.default_service_name
-          ENV["ERROR_REPORTING_SERVICE"] ||
+          Google::Cloud.configure.error_reporting.service_name ||
+            Google::Cloud.configure.service_name ||
             Google::Cloud.env.app_engine_service_id ||
             "ruby"
         end
 
         ##
-        # Find default service_version from `ERROR_REPORTING_VERSION` or
-        # `GAE_VERSION` environment varaibles.
+        # Find default service_version from the configuration, environment
+        # varaibles, or query from GCE meta service.
         #
         # @return [String] default GCP service_version
         #
         def self.default_service_version
-          ENV["ERROR_REPORTING_VERSION"] ||
+          Google::Cloud.configure.error_reporting.service_version ||
+            Google::Cloud.configure.service_version ||
             Google::Cloud.env.app_engine_service_version
         end
 
@@ -108,7 +108,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
+        alias project project_id
 
         ##
         # Report a {Google::Cloud::ErrorReporting::ErrorEvent} to Stackdriver

data/lib/google/cloud/error_reporting/rails.rb

@@ -90,7 +90,7 @@ module Google
           # Verify credentials and set use_error_reporting to false if
           # credentials are invalid
           unless valid_credentials? ErrorReporting.configure.project_id,
-                                    ErrorReporting.configure.keyfile
+                                    ErrorReporting.configure.credentials
             Cloud.configure.use_error_reporting = false
             return
           end
@@ -100,6 +100,8 @@ module Google
           Google::Cloud.configure.use_error_reporting ||= Rails.env.production?
         end
 
+        # rubocop:disable all
+
         ##
         # @private Merge Rails configuration into Error Reporting
         # instrumentation configuration.
@@ -109,14 +111,22 @@ module Google
 
           Cloud.configure.use_error_reporting ||= gcp_config.use_error_reporting
           ErrorReporting.configure do |config|
-            config.project_id ||= er_config.project_id || gcp_config.project_id
-            config.keyfile ||= er_config.keyfile || gcp_config.keyfile
-            config.service_name ||= er_config.service_name
-            config.service_version ||= er_config.service_version
+            config.project_id ||= config.project
+            config.project_id ||= er_config.project_id || er_config.project
+            config.project_id ||= gcp_config.project_id || gcp_config.project
+            config.credentials ||= config.keyfile
+            config.credentials ||= er_config.credentials || er_config.keyfile
+            config.credentials ||= gcp_config.credentials || gcp_config.keyfile
+            config.service_name ||= \
+              (er_config.service_name || gcp_config.service_name)
+            config.service_version ||= \
+              (er_config.service_version || gcp_config.service_version)
             config.ignore_classes ||= er_config.ignore_classes
           end
         end
 
+        # rubocop:enable all
+
         ##
         # Fallback to default config values if config parameters not provided.
         def self.init_default_config
@@ -138,7 +148,7 @@ module Google
               # if credentials is not a Credentials object, create one
               ErrorReporting::Credentials.new credentials
             end
-          rescue => e
+          rescue StandardError => e
             STDOUT.puts "Note: Google::Cloud::ErrorReporting is disabled " \
               "because it failed to authorize with the service. (#{e.message})"
             return false

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

@@ -71,7 +71,7 @@ module Google
         #
         def report error_event
           if error_event.message.nil? || error_event.message.empty?
-            fail ArgumentError, "Cannot report empty message"
+            raise ArgumentError, "Cannot report empty message"
           end
 
           error_event_grpc = error_event.to_grpc

data/lib/google/cloud/error_reporting/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module ErrorReporting
-      VERSION = "0.29.0".freeze
+      VERSION = "0.30.0".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-error_reporting
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: stackdriver-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Stackdriver Error Reporting