google-cloud-logging 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2040c01767882892eec9ab8951ae42563a026a48
-  data.tar.gz: 5024c4eae693b2e0822d5928da4a305837ffcac7
+  metadata.gz: 43b8c5db09219ded373243da0ca00c843a9fc621
+  data.tar.gz: 1f7283f517b86783fa2411b7a03f93020762851f
 SHA512:
-  metadata.gz: 394d202895b1719f155846ea0b38423aabc9b8c173f39283348a12a3ec69d915a3e6e17d1193dc7dcd7f251f3560f6d78b4338a3be44eb53978319cecaebcada
-  data.tar.gz: 8274d6c0f7686057113cb07a5cf5e89cd0302b3861fc3095ee96adacc134fdd9b4b05b810a8ac982ec5389915c162e5be0f6d7de3e813290f72aafe0c9c13812
+  metadata.gz: cd23872d6e35733f0bdf08775bf74922c1be1263dff90af212be364a5a763b58b9a1b41ab3d77bbcdecfeee6b339057deebcbdec66ef8fdfb3033dd2d484ab02
+  data.tar.gz: 3fbbb4a987dd9f3012d1917bdcbe09d7f808fb15d815fd3b3c932e92f6bba78a70435766288cab945d912ce37697b507d70985601add2afeb6bd1ab0fd982e37

data/README.md

@@ -95,8 +95,6 @@ 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 change at any time and the public API should not be considered stable.
-
 ## Contributing
 
 Contributions to this library are always welcome and highly encouraged.

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

@@ -47,7 +47,7 @@ module Google
         # The log_name is a String that controls the name of the Stackdriver
         # log to write to. If it is nil, the default log_name for this Logger
         # is used.
-        RequestInfo = ::Struct.new :trace_id, :log_name
+        RequestInfo = ::Struct.new :trace_id, :log_name, :env
 
         ##
         # The Google Cloud writer object that calls to {#write_entries} are made
@@ -429,11 +429,14 @@ module Google
         #     should be logged.
         # @param [String, nil] log_name The log name to use, or nil to use
         #     this logger's default.
+        # @param [Hash, nil] env The request's Rack environment or `nil` if not
+        #     available.
         #
         def add_request_info info: nil,
+                             env: nil,
                              trace_id: nil,
                              log_name: nil
-          info ||= RequestInfo.new trace_id, log_name
+          info ||= RequestInfo.new trace_id, log_name, env
           @request_info[current_thread_id] = info
 
           # Start removing old entries if hash gets too large.
@@ -549,7 +552,9 @@ module Google
             end
           end
 
-          labels.merge(merged_labels)
+          request_env = info && request_info.env || {}
+
+          compute_labels(request_env).merge(merged_labels)
         end
 
         ##
@@ -582,6 +587,29 @@ module Google
         def current_thread_id
           Thread.current.object_id
         end
+
+        private
+
+        ##
+        # @private Compute values for labels
+        def compute_labels request_env
+          Hash[
+            labels.map do |k, value_or_proc|
+              [k, compute_label_value(request_env, value_or_proc)]
+            end
+          ]
+        end
+
+        ##
+        # @private Compute individual label value.
+        # Value can be a Proc (function of the request env) or a static value.
+        def compute_label_value request_env, value_or_proc
+          if value_or_proc.respond_to?(:call)
+            value_or_proc.call(request_env)
+          else
+            value_or_proc
+          end
+        end
       end
     end
   end

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

@@ -83,7 +83,8 @@ module Google
           env["rack.logger"] = logger
           trace_id = get_trace_id env
           log_name = get_log_name env
-          logger.add_request_info trace_id: trace_id, log_name: log_name
+          logger.add_request_info trace_id: trace_id, log_name: log_name,
+                                  env: env
           begin
             @app.call env
           ensure

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

@@ -362,7 +362,8 @@ module Google
         # @param [Google::Cloud::Logging::Resource] resource The monitored
         #   resource to be associated with written log entries.
         # @param [Hash] labels A set of user-defined data to be associated with
-        #   written log entries.
+        #   written log entries. Values can be strings or Procs which are
+        #   functions of the request environment.
         #
         # @return [Google::Cloud::Logging::Logger] a Logger object that can be
         #   used in place of a ruby standard library logger object.

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

@@ -63,6 +63,7 @@ module Google
           resource_type = Logging.configure.monitored_resource.type
           resource_labels = Logging.configure.monitored_resource.labels
           log_name = Logging.configure.log_name
+          labels = Logging.configure.labels
 
           logging = Google::Cloud::Logging.new project: project_id,
                                                keyfile: keyfile
@@ -70,7 +71,7 @@ module Google
             Logging::Middleware.build_monitored_resource resource_type,
                                                          resource_labels
 
-          app.config.logger = logging.logger log_name, resource
+          app.config.logger = logging.logger log_name, resource, labels
           app.middleware.insert_before Rails::Rack::Logger,
                                        Google::Cloud::Logging::Middleware,
                                        logger: app.config.logger
@@ -109,7 +110,7 @@ module Google
         ##
         # @private Merge Rails configuration into Logging instrumentation
         # configuration.
-        def self.merge_rails_config rails_config
+        def self.merge_rails_config rails_config # rubocop:disable AbcSize
           gcp_config = rails_config.google_cloud
           logging_config = gcp_config.logging
 
@@ -119,6 +120,7 @@ module Google
                                   gcp_config.project_id
             config.keyfile ||= logging_config.keyfile || gcp_config.keyfile
             config.log_name ||= logging_config.log_name
+            config.labels ||= logging_config.labels
             config.log_name_map ||= logging_config.log_name_map
             config.monitored_resource.type ||=
               logging_config.monitored_resource.type

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "1.2.1"
+      VERSION = "1.2.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: API Client library for Stackdriver Logging