google-cloud-trace 0.39.0 → 0.41.3

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

@@ -27,7 +27,7 @@ module GRPC
     # Override GRPC::ActiveCall#request_response method. Wrap the original
     # method with a trace span that will get submitted with the overall request
     # trace span tree.
-    def request_response *args
+    def request_response *args, **kwargs
       Google::Cloud::Trace.in_span SPAN_NAME do |span|
         if span && !args.empty?
           grpc_request = args[0]
@@ -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

@@ -68,7 +68,7 @@ module GRPC
       def run_batch *args
         span = Google::Cloud::Trace.get
         # Make sure we're in a "gRPC request" span
-        span = nil if span && span.name != GRPC::ActiveCallWithTrace::SPAN_NAME
+        span = nil if !span.respond_to?(:name) || span.name != GRPC::ActiveCallWithTrace::SPAN_NAME
 
         if span && !args.empty?
           message = args[0]
@@ -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/result_set.rb

@@ -158,7 +158,9 @@ module Google
         def next_page
           return nil unless results_pending?
           service.list_traces \
-            project, start_time, end_time,
+            project,
+            start_time,
+            end_time,
             filter: filter,
             order_by: order_by,
             view: view,
@@ -167,26 +169,32 @@ module Google
         end
 
         ##
-        # Create a new ResultSet given a Google::Gax::PagedEnumerable::Page,
+        # Create a new ResultSet given a Gapic::PagedEnumerable::Page,
         # and all the query parameters.
         #
         # @private
         #
-        def self.from_gax_page service, project_id,
-                               page, start_time, end_time,
-                               filter: nil,
-                               order_by: nil,
-                               view: nil,
-                               page_size: nil,
-                               page_token: nil
+        def self.from_gapic_page service,
+                                 project_id,
+                                 page,
+                                 start_time,
+                                 end_time,
+                                 filter: nil,
+                                 order_by: nil,
+                                 view: nil,
+                                 page_size: nil,
+                                 page_token: nil
           next_page_token = page.next_page_token
           next_page_token = nil unless page.next_page_token?
           results = page.map do |proto|
             Google::Cloud::Trace::TraceRecord.from_grpc proto
           end
-          new service, project_id,
-              results, next_page_token,
-              start_time, end_time,
+          new service,
+              project_id,
+              results,
+              next_page_token,
+              start_time,
+              end_time,
               filter: filter,
               order_by: order_by,
               view: view,

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

@@ -16,7 +16,6 @@
 require "google/cloud/errors"
 require "google/cloud/trace/version"
 require "google/cloud/trace/v1"
-require "google/gax/errors"
 require "uri"
 
 module Google
@@ -28,17 +27,21 @@ module Google
       # @private
       #
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config, :host
+        attr_accessor :project
+        attr_accessor :credentials
+        attr_accessor :timeout
+        attr_accessor :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil,
+        def initialize project,
+                       credentials,
+                       timeout: nil,
                        host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
-          @client_config = client_config || {}
-          @host = host || V1::TraceServiceClient::SERVICE_ADDRESS
+          @host = host
         end
 
         def lowlevel_client
@@ -50,15 +53,13 @@ module Google
               require "google/cloud/trace/patches/active_call_with_trace"
               require "google/cloud/trace/patches/call_with_trace"
 
-              V1::TraceServiceClient.new(
-                credentials: credentials,
-                timeout: timeout,
-                client_config: client_config,
-                service_address: service_address,
-                service_port: service_port,
-                lib_name: "gccl",
-                lib_version: Google::Cloud::Trace::VERSION
-              )
+              V1::TraceService::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::Trace::VERSION
+              end
             end
         end
         attr_accessor :mocked_lowlevel_client
@@ -67,55 +68,50 @@ module Google
         # Sends new traces to Stackdriver Trace or updates existing traces.
         def patch_traces traces
           traces = Array(traces)
-          traces_proto = Google::Devtools::Cloudtrace::V1::Traces.new
+          traces_proto = Google::Cloud::Trace::V1::Traces.new
           traces.each do |trace|
             traces_proto.traces.push trace.to_grpc
           end
-          execute do
-            lowlevel_client.patch_traces @project, traces_proto
-          end
+
+          lowlevel_client.patch_traces project_id: @project, traces: traces_proto
           traces
         end
 
         ##
         # Returns a trace given its ID
         def get_trace trace_id
-          trace_proto = execute do
-            lowlevel_client.get_trace @project, trace_id
-          end
+          trace_proto = lowlevel_client.get_trace project_id: @project, trace_id: trace_id
           Google::Cloud::Trace::TraceRecord.from_grpc trace_proto
         end
 
         ##
         # Searches for traces matching the given criteria.
         #
-        def list_traces project_id, start_time, end_time,
+        def list_traces project_id,
+                        start_time,
+                        end_time,
                         filter: nil,
                         order_by: nil,
                         view: nil,
                         page_size: nil,
                         page_token: nil
-          call_opts = if page_token
-                        Google::Gax::CallOptions.new page_token: page_token
-                      else
-                        Google::Gax::CallOptions.new
-                      end
           start_proto = Google::Cloud::Trace::Utils.time_to_grpc start_time
           end_proto = Google::Cloud::Trace::Utils.time_to_grpc end_time
-          paged_enum = execute do
-            lowlevel_client.list_traces project_id,
-                                        view: view,
-                                        page_size: page_size,
-                                        start_time: start_proto,
-                                        end_time: end_proto,
-                                        filter: filter,
-                                        order_by: order_by,
-                                        options: call_opts
-          end
-
-          Google::Cloud::Trace::ResultSet.from_gax_page \
-            self, project_id,
-            paged_enum.page, start_time, end_time,
+          paged_enum = lowlevel_client.list_traces  project_id: project_id,
+                                                    view: view,
+                                                    page_size: page_size,
+                                                    start_time: start_proto,
+                                                    end_time: end_proto,
+                                                    filter: filter,
+                                                    order_by: order_by,
+                                                    page_token: page_token
+
+          Google::Cloud::Trace::ResultSet.from_gapic_page \
+            self,
+            project_id,
+            paged_enum.page,
+            start_time,
+            end_time,
             filter: filter,
             order_by: order_by,
             view: view,
@@ -127,25 +123,6 @@ module Google
         def inspect
           "#{self.class}(#{@project})"
         end
-
-        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 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

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

@@ -140,7 +140,7 @@ module Google
         # Create a new Span object from a TraceSpan protobuf and insert it
         # into the given trace.
         #
-        # @param [Google::Devtools::Cloudtrace::V1::TraceSpan] span_proto The
+        # @param [Google::Cloud::Trace::V1::Tracespan] span_proto The
         #     span protobuf from the V1 gRPC Trace API.
         # @param [Google::Cloud::Trace::TraceRecord] trace The trace object
         #     to contain the span.
@@ -169,13 +169,13 @@ module Google
         #
         # @param [Integer] default_parent_id The parent span ID to use if the
         #     span has no parent in the trace tree. Optional; defaults to 0.
-        # @return [Google::Devtools::Cloudtrace::V1::TraceSpan] The generated
+        # @return [Google::Cloud::Trace::V1::TraceSpan] The generated
         #     protobuf.
         #
         def to_grpc default_parent_id = 0
           start_proto = Google::Cloud::Trace::Utils.time_to_grpc start_time
           end_proto = Google::Cloud::Trace::Utils.time_to_grpc end_time
-          Google::Devtools::Cloudtrace::V1::TraceSpan.new \
+          Google::Cloud::Trace::V1::TraceSpan.new \
             span_id: span_id.to_i,
             kind: kind.to_sym,
             name: name,
@@ -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
 
         ##
@@ -76,7 +75,7 @@ module Google
         ##
         # Create a new Trace object from a trace protobuf.
         #
-        # @param [Google::Devtools::Cloudtrace::V1::Trace] trace_proto The
+        # @param [Google::Cloud::Trace::V1::Trace] trace_proto The
         #     trace protobuf from the V1 gRPC Trace API.
         # @return [Trace, nil] A corresponding Trace object, or `nil` if the
         #     proto does not represent an existing trace object.
@@ -104,14 +103,14 @@ module Google
         # Convert this Trace object to an equivalent Trace protobuf suitable
         # for the V1 gRPC Trace API.
         #
-        # @return [Google::Devtools::Cloudtrace::V1::Trace] The generated
+        # @return [Google::Cloud::Trace::V1::Trace] The generated
         #     protobuf.
         #
         def to_grpc
           span_protos = @spans_by_id.values.map do |span|
             span.to_grpc trace_context.span_id.to_i
           end
-          Google::Devtools::Cloudtrace::V1::Trace.new \
+          Google::Cloud::Trace::V1::Trace.new \
             project_id: project_id,
             trace_id: trace_id,
             spans: span_protos

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.39.0".freeze
+      VERSION = "0.41.3".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-trace
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.41.3
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: stackdriver-core
   requirement: !ruby/object:Gem::Requirement
@@ -39,101 +39,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: google-gax
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: googleapis-common-protos-types
+  name: google-cloud-trace-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: google-cloud-trace-v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -196,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
@@ -325,30 +299,7 @@ files:
 - lib/google/cloud/trace/time_sampler.rb
 - lib/google/cloud/trace/trace_record.rb
 - lib/google/cloud/trace/utils.rb
-- lib/google/cloud/trace/v1.rb
-- lib/google/cloud/trace/v1/credentials.rb
-- lib/google/cloud/trace/v1/doc/google/devtools/cloudtrace/v1/trace.rb
-- lib/google/cloud/trace/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/trace/v1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/trace/v1/trace_service_client.rb
-- lib/google/cloud/trace/v1/trace_service_client_config.json
-- lib/google/cloud/trace/v2.rb
-- lib/google/cloud/trace/v2/credentials.rb
-- lib/google/cloud/trace/v2/doc/google/devtools/cloudtrace/v2/trace.rb
-- lib/google/cloud/trace/v2/doc/google/devtools/cloudtrace/v2/tracing.rb
-- lib/google/cloud/trace/v2/doc/google/protobuf/any.rb
-- lib/google/cloud/trace/v2/doc/google/protobuf/empty.rb
-- lib/google/cloud/trace/v2/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/trace/v2/doc/google/protobuf/wrappers.rb
-- lib/google/cloud/trace/v2/doc/google/rpc/status.rb
-- lib/google/cloud/trace/v2/trace_service_client.rb
-- lib/google/cloud/trace/v2/trace_service_client_config.json
 - lib/google/cloud/trace/version.rb
-- lib/google/devtools/cloudtrace/v1/trace_pb.rb
-- lib/google/devtools/cloudtrace/v1/trace_services_pb.rb
-- lib/google/devtools/cloudtrace/v2/trace_pb.rb
-- lib/google/devtools/cloudtrace/v2/tracing_pb.rb
-- lib/google/devtools/cloudtrace/v2/tracing_services_pb.rb
 homepage: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-trace
 licenses:
 - Apache-2.0
@@ -361,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.17
 signing_key: 
 specification_version: 4
 summary: Application Instrumentation and API Client library for Stackdriver Trace