google-cloud-logging 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cabe641ea9b231603ff1ec5dd90876723acbb111fa200a293fd661ef2cb9c1d
-  data.tar.gz: 4b828ba6797ba1465a594deca80e4eff19f8d020a1471057b46a521df787a13b
+  metadata.gz: 3f0f56c213ee74340b1ad45478f47ccc2dd6679dab718127bfa4e47e5ba63a37
+  data.tar.gz: 06d6bf7c11816f05517a7e9b2016d45baebc6dd938c50ab4c4763730481d03c0
 SHA512:
-  metadata.gz: dcea1515ca1c9ec282d9db850646bc2279db32c59b6214d84a8656e9605ded07f0213f57f3e4884170fb43b5486110425f890cfff32da30604f6f342f524352a
-  data.tar.gz: 0f1f1586220415cd0ce7aa654f07dc779a5efebb22fbf79bbac1bea942c49a35dac0d814d7a20a21341fecc411108d467be41a5fd15cfcc99ed5aa08ad3996df
+  metadata.gz: 8b14c0195cb3290431e10b9554d31778eecbd2380694adcf2bc6911848c6d6aff7122906960abcd15f6749c3f49c08d61900c80cdf505641275ce837438f2e9f
+  data.tar.gz: ecffe6908619f5b2c6d9baa0f5ed785c4ccc129c58f3f5e23c31564b1cb513f28307d3de32c97daa18d74c45c83f89938ec6f6687f2aa30ddd03a26ee01e3e64

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 1.5.6 / 2018-10-03
+
+* Use concurrent-ruby and ThreadLocalVar in Logger.
+  * Remove Monitor and synchronize blocks.
+  * Logger#thread_ids now only returns the current thread.
+
 ### 1.5.5 / 2018-09-20
 
 * Make Logger thread-safe.

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

@@ -14,8 +14,8 @@
 
 
 require "logger"
-require "monitor"
 require "thread"
+require "concurrent"
 
 module Google
   module Cloud
@@ -53,8 +53,6 @@ module Google
       #   logger.info payload
       #
       class Logger
-        include MonitorMixin
-
         ##
         # A RequestInfo represents data about the request being handled by the
         # current thread. It is used to configure logs coming from that thread.
@@ -122,12 +120,15 @@ module Google
         # Stackdriver trace ID is a shared request identifier across all
         # Stackdriver services.
         #
+        # This method is deprecated and returns a Hash containing only the
+        # current Thread ID/trace_id now.
+        #
         # @deprecated Use request_info
         #
         def trace_ids
-          synchronize do
-            @request_info_map.inject({}) { |r, (k, v)| r[k] = v.trace_id }
-          end
+          current_request_info = request_info
+          return {} if current_request_info.nil?
+          { current_thread_id => current_request_info.trace_id }
         end
 
         ##
@@ -172,7 +173,7 @@ module Google
           @resource = resource
           @labels = labels || {}
           @level = 0 # DEBUG is the default behavior
-          @request_info_map = {}
+          @request_info_var = Concurrent::ThreadLocalVar.new
           @closed = false
           # Unused, but present for API compatibility
           @formatter = ::Logger::Formatter.new
@@ -182,8 +183,6 @@ module Google
           # The writer is usually a Project or AsyncWriter.
           logging = @writer.respond_to?(:logging) ? @writer.logging : @writer
           @project = logging.project if logging.respond_to? :project
-
-          super() # to init MonitorMixin
         end
 
         ##
@@ -461,14 +460,7 @@ module Google
         def add_request_info info: nil, env: nil, trace_id: nil, log_name: nil
           info ||= RequestInfo.new trace_id, log_name, env
 
-          synchronize do
-            @request_info_map[current_thread_id] = info
-
-            # Start removing old entries if hash gets too large.
-            # This should never happen, because middleware should automatically
-            # remove entries when a request is finished
-            @request_info_map.shift while @request_info_map.size > 10_000
-          end
+          @request_info_var.value = info
 
           info
         end
@@ -480,7 +472,7 @@ module Google
         #     or `nil` if there is no data set.
         #
         def request_info
-          synchronize { @request_info_map[current_thread_id] }
+          @request_info_var.value
         end
 
         ##
@@ -489,7 +481,7 @@ module Google
         # @return [RequestInfo] The info that's being deleted
         #
         def delete_request_info
-          synchronize { @request_info_map.delete current_thread_id }
+          @request_info_var.value = nil
         end
 
         ##

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "1.5.5".freeze
+      VERSION = "1.5.6".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement