google-cloud-trace 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07562091331ce0fc0545ba69eb4dd28c878416fd1db5f3a6f0134b2070b548b
-  data.tar.gz: 2274912890a1bb15293e2121c3ce4e1e694a430919c0290624cf929683522895
+  metadata.gz: 8d80aa4d6a48ec1f93a09807e5fb1625deb0697515eb9835026f31e62df940bb
+  data.tar.gz: bfe0c8868cbc08c22db777e89f6d0adb76b27e85556a25e4b953d5b91224986d
 SHA512:
-  metadata.gz: 42f181e09853565ae566548c08dfc69f88c727cfbec9b77663c21889d8c6ded86eff582471c31cceba816d47f0ba6f326773408c7ec87671949bf137c1d2f470
-  data.tar.gz: 706749ea6b9625ea23243e16540666d8e4e1855ceb832f45c7dfd7069cde78b9fbab5f76ec9846ed598e7bda3468224172271db7c77fbe95f91501f3f5944fb4
+  metadata.gz: e29839ff82637001a33196a308c28c7d8b0446691a81ef19287d6cf81c81c18434ee861e87374d12ebb42e72396284e743cb79c26fba34be275e66121330549f
+  data.tar.gz: 5e9520928f53bf8c734e253579f1f27e36427442efbbaf449fb2c01a2d41a5a15bb4f24e631b9308816671ca68c8eca6e52f5fccf7862442ca5311e0b91aafdd

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 0.41.0 / 2021-03-11
+
+#### Features
+
+* Drop support for Ruby 2.4 and add support for Ruby 3.0
+
 ### 0.40.0 / 2020-07-23
 
 This is a major update that removes the "low-level" client interface code, and

data/CONTRIBUTING.md

@@ -24,7 +24,7 @@ be able to accept your pull requests.
 In order to use the google-cloud-trace console and run the project's tests,
 there is a small amount of setup:
 
-1. Install Ruby. google-cloud-trace requires Ruby 2.4+. You may choose to
+1. Install Ruby. google-cloud-trace requires Ruby 2.5+. You may choose to
    manage your Ruby and gem installations with [RVM](https://rvm.io/),
    [rbenv](https://github.com/rbenv/rbenv), or
    [chruby](https://github.com/postmodern/chruby).
@@ -45,7 +45,7 @@ there is a small amount of setup:
 
    ```sh
    $ cd google-cloud-trace/
-   $ bundle exec rake bundleupdate
+   $ bundle install
    ```
 
 ## Console

data/LOGGING.md

@@ -3,7 +3,7 @@
 To enable logging for this library, set the logger for the underlying
 [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library. The logger
 that you set may be a Ruby stdlib
-[`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as
+[`Logger`](https://ruby-doc.org/stdlib/libdoc/logger/rdoc/Logger.html) as
 shown below, or a
 [`Google::Cloud::Logging::Logger`](https://googleapis.dev/ruby/google-cloud-logging/latest)
 that will write logs to [Stackdriver

data/lib/google/cloud/trace/async_reporter.rb

@@ -36,7 +36,7 @@ module Google
 
         ##
         # @private Creates a new AsyncReporter instance.
-        def initialize service, max_count: 1000, max_bytes: 4000000,
+        def initialize service, max_count: 1000, max_bytes: 4_000_000,
                        max_queue: 100, interval: 5, threads: 10
           # init MonitorMixin
           super()
@@ -111,7 +111,7 @@ module Google
             @stopped = true
             patch_batch!
             @cond.broadcast
-            @thread_pool.shutdown if @thread_pool
+            @thread_pool&.shutdown
           end
 
           self
@@ -219,7 +219,7 @@ module Google
                 @cond.wait
               else
                 # still waiting for the interval to publish the batch...
-                @cond.wait(@batch.publish_wait)
+                @cond.wait @batch.publish_wait
               end
             end
           end
@@ -295,7 +295,8 @@ module Google
         ##
         # @private
         class Batch
-          attr_reader :created_at, :traces
+          attr_reader :created_at
+          attr_reader :traces
 
           def initialize reporter
             @reporter = reporter
@@ -337,7 +338,7 @@ module Google
 
           def publish_wait
             publish_wait = publish_at - Time.now
-            return 0 if publish_wait < 0
+            return 0 if publish_wait.negative?
             publish_wait
           end
 

data/lib/google/cloud/trace/errors.rb

@@ -32,7 +32,7 @@ module Google
         attr_reader :traces
 
         def initialize message, traces = nil
-          super(message)
+          super message
           @traces = traces if traces
         end
       end
@@ -50,7 +50,7 @@ module Google
         attr_reader :traces
 
         def initialize message, traces = nil
-          super(message)
+          super message
           @traces = traces if traces
         end
       end

data/lib/google/cloud/trace/faraday_middleware.rb

@@ -39,10 +39,9 @@ module Google
         #   faraday.adapter  Faraday.default_adapter  # use Net::HTTP adapter
         # end
         # ```
-
-        def initialize app, enable_cross_project_tracing: false
-          super(app)
-          @enable_cross_project_tracing = enable_cross_project_tracing || false
+        def initialize app, opts = {}
+          @enable_cross_project_tracing = opts[:enable_cross_project_tracing] || false
+          super app
         end
 
         ##
@@ -114,9 +113,8 @@ module Google
         ##
         # @private Add X-Cloud-Trace-Context for request header
         def add_trace_context_header env
-          if (trace_ctx = Stackdriver::Core::TraceContext.get)
-            env[:request_headers]["X-Cloud-Trace-Context"] = trace_ctx.to_string
-          end
+          trace_ctx = Stackdriver::Core::TraceContext.get
+          env[:request_headers]["X-Cloud-Trace-Context"] = trace_ctx.to_string if trace_ctx
         end
       end
     end

data/lib/google/cloud/trace/label_key.rb

@@ -118,7 +118,7 @@ module Google
           json_frames = []
           collecting_frames = !truncate_stack
           stack_frames.each do |frame|
-            collecting_frames ||= truncate_stack.call(frame)
+            collecting_frames ||= truncate_stack.call frame
             next unless collecting_frames
             next unless !filter_stack || filter_stack.call(frame)
             json_frames <<

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

@@ -154,7 +154,7 @@ module Google
         def initialize app, service: nil, **kwargs
           @app = app
 
-          load_config kwargs
+          load_config(**kwargs)
 
           if service
             @service = service
@@ -203,7 +203,7 @@ module Google
         # @return [Stackdriver::Core::TraceContext] The trace context.
         #
         def get_trace_context env
-          Stackdriver::Core::TraceContext.parse_rack_env(env) do |tc|
+          Stackdriver::Core::TraceContext.parse_rack_env env do |tc|
             if tc.sampled?.nil?
               sampler = configuration.sampler ||
                         Google::Cloud::Trace::TimeSampler.default
@@ -240,12 +240,11 @@ module Google
         # @param [Hash] env The Rack environment.
         #
         def send_trace trace, env
-          if @service && trace.trace_context.sampled?
-            begin
-              @service.patch_traces trace
-            rescue StandardError => ex
-              handle_error ex, logger: env["rack.logger"]
-            end
+          return unless @service && trace.trace_context.sampled?
+          begin
+            @service.patch_traces trace
+          rescue StandardError => e
+            handle_error e, logger: env["rack.logger"]
           end
         end
 

data/lib/google/cloud/trace/notifications.rb

@@ -71,7 +71,7 @@ module Google
                             label_namespace: DEFAULT_LABEL_NAMESPACE,
                             capture_stack: false
           require "active_support/notifications"
-          ActiveSupport::Notifications.subscribe(type) do |*args|
+          ActiveSupport::Notifications.subscribe type do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
             handle_notification_event event, max_length, label_namespace,
                                       capture_stack
@@ -83,19 +83,18 @@ module Google
         def self.handle_notification_event event, maxlen, label_namespace,
                                            capture_stack
           cur_span = Google::Cloud::Trace.get
-          if cur_span && event.time && event.end
-            labels = payload_to_labels event, maxlen, label_namespace
-            if capture_stack
-              Google::Cloud::Trace::LabelKey.set_stack_trace \
-                labels,
-                skip_frames: 2,
-                truncate_stack: REMOVE_NOTIFICATION_FRAMEWORK
-            end
-            cur_span.create_span event.name,
-                                 start_time: event.time,
-                                 end_time: event.end,
-                                 labels: labels
+          return unless cur_span && event.time && event.end
+          labels = payload_to_labels event, maxlen, label_namespace
+          if capture_stack
+            Google::Cloud::Trace::LabelKey.set_stack_trace \
+              labels,
+              skip_frames: 2,
+              truncate_stack: REMOVE_NOTIFICATION_FRAMEWORK
           end
+          cur_span.create_span event.name,
+                               start_time: event.time,
+                               end_time: event.end,
+                               labels: labels
         end
 
         ##
@@ -104,7 +103,7 @@ module Google
           labels = {}
           event.payload.each do |k, v|
             if v.is_a? ::String
-              v = v[0, maxlen - 3] + "..." if maxlen && v.size > maxlen
+              v = "#{v[0, maxlen - 3]}..." if maxlen && v.size > maxlen
               labels["#{label_namespace}#{k}"] = v.to_s
             end
           end

data/lib/google/cloud/trace/patches/active_call_with_trace.rb

@@ -41,5 +41,5 @@ module GRPC
   end
 
   # Patch GRPC::ActiveCall#request_response method
-  ::GRPC::ActiveCall.send(:prepend, ActiveCallWithTrace)
+  ::GRPC::ActiveCall.prepend ActiveCallWithTrace
 end

data/lib/google/cloud/trace/patches/call_with_trace.rb

@@ -84,6 +84,6 @@ module GRPC
     end
 
     # Patch GRPC::Core::Call#run_batch method
-    ::GRPC::Core::Call.send(:prepend, CallWithTrace)
+    ::GRPC::Core::Call.prepend CallWithTrace
   end
 end

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

@@ -191,13 +191,13 @@ module Google
               Trace::Credentials.new credentials
             end
           rescue Exception => e
-            STDOUT.puts "Note: Google::Cloud::Trace is disabled because " \
+            $stdout.puts "Note: Google::Cloud::Trace is disabled because " \
               "it failed to authorize with the service. (#{e.message})"
             return false
           end
 
           if project_id.to_s.empty?
-            STDOUT.puts "Note: Google::Cloud::Trace is disabled because " \
+            $stdout.puts "Note: Google::Cloud::Trace is disabled because " \
               "the project ID could not be determined."
             return false
           end

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

@@ -27,7 +27,10 @@ module Google
       # @private
       #
       class Service
-        attr_accessor :project, :credentials, :timeout, :host
+        attr_accessor :project
+        attr_accessor :credentials
+        attr_accessor :timeout
+        attr_accessor :host
 
         ##
         # Creates a new Service instance.

data/lib/google/cloud/trace/span.rb

@@ -323,7 +323,7 @@ module Google
           ensure_exists!
           unless start_time
             self.start_time = ::Time.now.utc
-            parent.ensure_started if parent
+            parent&.ensure_started
           end
           self
         end
@@ -350,8 +350,8 @@ module Google
         def delete
           ensure_exists!
           @children.each(&:delete)
-          parent.remove_child(self) if parent
-          trace.remove_span(self)
+          parent&.remove_child self
+          trace.remove_span self
           @trace = nil
           @parent = nil
           self
@@ -428,7 +428,7 @@ module Google
         def ensure_no_cycle! new_parent
           ptr = new_parent
           until ptr.nil?
-            raise "Move would result in a cycle" if ptr.equal?(self)
+            raise "Move would result in a cycle" if ptr.equal? self
             ptr = ptr.parent
           end
         end

data/lib/google/cloud/trace/trace_record.rb

@@ -56,8 +56,7 @@ module Google
           @trace_context = trace_context || Stackdriver::Core::TraceContext.new
           @root_spans = []
           @spans_by_id = {}
-          @span_id_generator =
-            span_id_generator || ::Proc.new { rand(1..0xffffffffffffffff) }
+          @span_id_generator = span_id_generator || proc { rand(1..0xffffffffffffffff) }
         end
 
         ##

data/lib/google/cloud/trace/utils.rb

@@ -32,7 +32,7 @@ module Google
 
           # sometimes this gets called with time as a float or
           # int. Coerce into a time object, and move on.
-          time = Time.at(time) if time.is_a? Numeric
+          time = Time.at time if time.is_a? Numeric
 
           raise ArgumentError unless time.is_a? Time
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Trace
-      VERSION = "0.40.0".freeze
+      VERSION = "0.41.0".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-trace
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -312,14 +312,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: Application Instrumentation and API Client library for Stackdriver Trace