google-cloud-trace 0.34.5 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011a5cfab97710af36f316d619b812a1c41755cfe6e7da689cc99245d9f87d5a
-  data.tar.gz: ab8c456a3e59572fde4c5c55c5d7b3fba0b08c5cbef93c0c7da548cab693b7e3
+  metadata.gz: 1b28e9c176fadada6b27fe995e7f4052a37c56cdbd8577734cc27941b3995aaf
+  data.tar.gz: 59b09025d3b1a4aada7afcc29117c6a971ae99f1f4d0dde91fed5338a1308f00
 SHA512:
-  metadata.gz: 583dc40bedd3e8881c5a686d4e6494fb5b7dbdd4f09f30888262d5236cb860bd0ab83d5366f5669fdc4a7ae07431fd07ee74e468572f90aff99c84a9aeb3c767
-  data.tar.gz: '006180a50fbe58cc62795057dc6523905d617d29c5be6e65a29f94381372f6aeb0593f136bbe97d375cc5fca3216a08df15a1a15d3a9c7712dcc62ed4f35a9c4'
+  metadata.gz: 48bd85a3d9e6cfdfe1bf3ecab47374475ebb0277c01cf48f251752e8df772215e2d67bfda3dc10bb1fadbe26ff2c2ed774091ddb3a8f593ac906416561a2b357
+  data.tar.gz: 7eae5d1c328748bb591b29838c6f58ff94058249aaf1ea40b679a9be67b4389e98606b0e88f2486aff9967b6714bea04785b7d60a223dd7885a0a971b84ab0b8

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
 
+### 0.35.0 / 2019-08-23
+
+#### Features
+
+* Support overriding of service endpoint
+
+#### Documentation
+
+* Update documentation
+
 ### 0.34.5 / 2019-07-31
 
 * Fix max threads setting in thread pools

data/INSTRUMENTATION.md

@@ -16,7 +16,7 @@ you want to run on a non Google Cloud environment or you want to customize  the
 default behavior.
 
 See the [Configuration
-Guide](https://googleapis.dev/ruby/stackdriver/INSTRUMENTATION_CONFIGURATION/latest)
+Guide](https://googleapis.dev/ruby/stackdriver/latest/file.INSTRUMENTATION_CONFIGURATION.html)
 for full configuration parameters.
 
 ## Rails Integration
@@ -29,7 +29,7 @@ require "google/cloud/trace/rails"
 ```
 
 Alternatively, check out the
-[stackdriver](https://googleapis.dev/ruby/stackdriver/latest/file.README.html)
+[stackdriver](https://googleapis.dev/ruby/stackdriver/latest)
 gem, which enables this Railtie by default.
 
 ## Rack Integration

data/lib/google-cloud-trace.rb

@@ -137,6 +137,7 @@ Google::Cloud.configure.add_config! :trace do |config|
   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! :endpoint, nil, match: String
   config.add_field! :capture_stack, nil, enum: [true, false]
   config.add_field! :sampler, nil
   config.add_field! :span_id_generator, nil, match: Proc

data/lib/google/cloud/trace.rb

@@ -68,6 +68,10 @@ module Google
       #   * `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.
+      # @param [String] endpoint Override of the endpoint host name. Optional.
+      #   If the param is nil, uses the default endpoint.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -85,17 +89,15 @@ module Google
       #   end
       #
       def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
-                   client_config: nil, project: nil, keyfile: nil
+                   client_config: nil, endpoint: nil, project: nil, keyfile: nil
         project_id    ||= (project || default_project_id)
         scope         ||= configure.scope
         timeout       ||= configure.timeout
         client_config ||= configure.client_config
+        endpoint      ||= configure.endpoint
         credentials   ||= (keyfile || default_credentials(scope: scope))
 
-        unless credentials.is_a? Google::Auth::Credentials
-          credentials = Trace::Credentials.new credentials, scope: scope
-        end
-
+        credentials = resolve_credentials credentials, scope
         if credentials.respond_to? :project_id
           project_id ||= credentials.project_id
         end
@@ -104,8 +106,8 @@ module Google
 
         Trace::Project.new(
           Trace::Service.new(
-            project_id, credentials, timeout: timeout,
-                                     client_config: client_config
+            project_id, credentials,
+            host: endpoint, timeout: timeout, client_config: client_config
           )
         )
       end
@@ -128,6 +130,8 @@ module Google
       # * `timeout` - (Integer) Default timeout to use in requests.
       # * `client_config` - (Hash) A hash of values to override the default
       #   behavior of the API client.
+      # * `endpoint` - (String) Override of the endpoint host name, or `nil`
+      #   to use the default endpoint.
       # * `capture_stack` - (Boolean) Whether to capture stack traces for each
       #   span. Default: `false`
       # * `sampler` - (Proc) A sampler Proc makes the decision whether to record
@@ -173,6 +177,15 @@ module Google
           Trace::Credentials.default(scope: scope)
       end
 
+      ##
+      # @private Resolve credentials
+      def self.resolve_credentials credentials, scope
+        unless credentials.is_a? Google::Auth::Credentials
+          credentials = Trace::Credentials.new credentials, scope: scope
+        end
+        credentials
+      end
+
       ##
       # Set the current trace span being measured for the current thread, or
       # the current trace if no span is currently open. This may be used with

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

@@ -17,6 +17,7 @@ require "google/cloud/errors"
 require "google/cloud/trace/version"
 require "google/cloud/trace/v1"
 require "google/gax/errors"
+require "uri"
 
 module Google
   module Cloud
@@ -27,29 +28,17 @@ module Google
       # @private
       #
       class Service
-        ##
-        # @private
-        attr_accessor :project
-
-        ##
-        # @private
-        attr_accessor :credentials
-
-        ##
-        # @private
-        attr_accessor :timeout
-
-        ##
-        # @private
-        attr_accessor :client_config
+        attr_accessor :project, :credentials, :timeout, :client_config, :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil
+        def initialize project, credentials, timeout: nil, client_config: nil,
+                       host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
           @client_config = client_config || {}
+          @host = host || V1::TraceServiceClient::SERVICE_ADDRESS
         end
 
         def lowlevel_client
@@ -65,6 +54,8 @@ module Google
                 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
               )
@@ -143,6 +134,16 @@ module Google
 
         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

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Trace
-      VERSION = "0.34.5".freeze
+      VERSION = "0.35.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.34.5
+  version: 0.35.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core