google-cloud-trace 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f583302c7f227c7286b69a817b865126bb46f4e81db80032758a17cbd29bbb
-  data.tar.gz: cdba7500b430fadb4aca52ab717a0604aa2217f1fa5afc7341f5f0f070d015cf
+  metadata.gz: bbe89b5a4aa636dcf475f45b2b41df253c2d1427d481db8ab2cfda9643a12fee
+  data.tar.gz: 292766346502eb6508d029dd5e495439cc470ee01b472e4262a81a4dd6a39254
 SHA512:
-  metadata.gz: 82a08cfe8604df23297959ce11f140dd316cfa3b692ed27d7b4ff1c7a2854836a38f67e7b835082f6ba1dc27ff78e8b03093487414c4d347b8e1501a2b347bf9
-  data.tar.gz: 8519a7df8948dc32b16540f0ee1f2e2d0d92d61af90081e824e14f6a1fc499960d9c15b90fc056c2107763119b972129080db4d0dc7adbb6ef39517a7dc89c05
+  metadata.gz: 6d355e9fe1200109bdc9713956fb23b819ecf593a2f539bd431feaea61c588eaeb61296a6571bef78b4f1f7e7ec741047d277f57a0dd308cf0c0406331f46311
+  data.tar.gz: 91568ca426efe1becad8debc38ffce4f7ef0f6f94d27dbbf104daefc72f5df6797b48f8246c91b4225662261283df586fb76443b4d4921f69a7c66b3a40f7aad

data/.yardopts

@@ -1,7 +1,8 @@
 --no-private
 --title=Stackdriver Trace
---exclude lib/google/devtools/cloudtrace/v1
+--exclude _pb\.rb$
 --markup markdown
+--markup-provider redcarpet
 
 ./lib/**/*.rb
 -

data/README.md

@@ -207,14 +207,14 @@ end
 
 ## Supported Ruby Versions
 
-This library is supported on Ruby 2.0+.
-
-However, Ruby 2.3 or later is strongly recommended, as earlier releases have
-reached or are nearing end-of-life. After June 1, 2018, Google will provide
-official support only for Ruby versions that are considered current and
-supported by Ruby Core (that is, Ruby versions that are either in normal
-maintenance or in security maintenance).
-See https://www.ruby-lang.org/en/downloads/branches/ for further details.
+This library is supported on Ruby 2.3+.
+
+Google provides official support for Ruby versions that are actively supported
+by Ruby Core—that is, Ruby versions that are either in normal maintenance or
+in security maintenance, and not end of life. Currently, this means Ruby 2.3
+and later. Older versions of Ruby _may_ still work, but are unsupported and not
+recommended. See https://www.ruby-lang.org/en/downloads/branches/ for details
+about the Ruby support schedule.
 
 ## Versioning
 

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

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-require "googleauth"
+require "google/cloud/trace/v1/credentials"
 
 module Google
   module Cloud
@@ -37,20 +37,7 @@ module Google
       #
       #   trace.project_id #=> "my-project"
       #
-      class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
-        PATH_ENV_VARS = %w[TRACE_CREDENTIALS
-                           TRACE_KEYFILE
-                           GOOGLE_CLOUD_CREDENTIALS
-                           GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE].freeze
-        JSON_ENV_VARS = %w[TRACE_CREDENTIALS_JSON
-                           TRACE_KEYFILE_JSON
-                           GOOGLE_CLOUD_CREDENTIALS_JSON
-                           GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON].freeze
-        DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"].freeze
+      class Credentials < Google::Cloud::Trace::V1::Credentials
       end
     end
   end

data/lib/google/cloud/trace/v1/credentials.rb

@@ -0,0 +1,38 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "googleauth"
+
+module Google
+  module Cloud
+    module Trace
+      module V1
+        class Credentials < Google::Auth::Credentials
+          SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
+          PATH_ENV_VARS = %w(TRACE_CREDENTIALS
+                             TRACE_KEYFILE
+                             GOOGLE_CLOUD_CREDENTIALS
+                             GOOGLE_CLOUD_KEYFILE
+                             GCLOUD_KEYFILE)
+          JSON_ENV_VARS = %w(TRACE_CREDENTIALS_JSON
+                             TRACE_KEYFILE_JSON
+                             GOOGLE_CLOUD_CREDENTIALS_JSON
+                             GOOGLE_CLOUD_KEYFILE_JSON
+                             GCLOUD_KEYFILE_JSON)
+          DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/trace/v1/doc/google/devtools/cloudtrace/v1/trace.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,17 +15,6 @@
 module Google
   module Devtools
     module Cloudtrace
-      ##
-      # # Stackdriver Trace API Contents
-      #
-      # | Class | Description |
-      # | ----- | ----------- |
-      # | [TraceServiceClient][] | Send and retrieve trace data from Stackdriver Trace. Data is generated and available by default for all App Engine applications. Data from other applications can be written to Stackdriver Trace for display, reporting, and analysis. |
-      # | [Data Types][] | Data types for Google::Cloud::Trace::V1 |
-      #
-      # [TraceServiceClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-trace/latest/google/devtools/cloudtrace/v1/traceserviceclient
-      # [Data Types]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-trace/latest/google/devtools/cloudtrace/v1/datatypes
-      #
       module V1
         # A trace describes how long it takes for an application to perform an
         # operation. It consists of a set of spans, each of which represent a single
@@ -66,7 +55,7 @@ module Google
         #   @return [String]
         #     Name of the span. Must be less than 128 bytes. The span name is sanitized
         #     and displayed in the Stackdriver Trace tool in the
-        #     {% dynamic print site_values.console_name %}.
+        #     Google Cloud Platform Console.
         #     The name may be a method name or some other per-call site name.
         #     For the same executable and the same call point, a best practice is
         #     to use a consistent name, which makes it easier to correlate
@@ -106,9 +95,11 @@ module Google
         #     * +/http/client_region+
         #     * +/http/host+
         #     * +/http/method+
+        #     * +/http/path+
         #     * +/http/redirected_url+
         #     * +/http/request/size+
         #     * +/http/response/size+
+        #     * +/http/route+
         #     * +/http/status_code+
         #     * +/http/url+
         #     * +/http/user_agent+

data/lib/google/cloud/trace/v1/doc/google/protobuf/empty.rb

@@ -0,0 +1,28 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Protobuf
+    # A generic empty message that you can re-use to avoid defining duplicated
+    # empty messages in your APIs. A typical example is to use it as the request
+    # or the response type of an API method. For instance:
+    #
+    #     service Foo {
+    #       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+    #     }
+    #
+    # The JSON representation for +Empty+ is empty JSON object +{}+.
+    class Empty; end
+  end
+end

data/lib/google/cloud/trace/v1/doc/google/protobuf/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/trace/v1/trace_service_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 # and updates to that file get reflected here through a refresh process.
 # For the short term, the refresh process will only be runnable by Google
 # engineers.
-#
-# The only allowed edits are to method and file documentation. A 3-way
-# merge preserves those additions if the generated source changes.
 
 require "json"
 require "pathname"
@@ -28,7 +25,7 @@ require "pathname"
 require "google/gax"
 
 require "google/devtools/cloudtrace/v1/trace_pb"
-require "google/cloud/trace/credentials"
+require "google/cloud/trace/v1/credentials"
 
 module Google
   module Cloud
@@ -51,6 +48,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           PAGE_DESCRIPTORS = {
@@ -70,6 +70,7 @@ module Google
             "https://www.googleapis.com/auth/trace.readonly"
           ].freeze
 
+
           # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
           #   Provides the means for authenticating requests made by the client. This parameter can
           #   be many types.
@@ -94,16 +95,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
-              service_path: SERVICE_ADDRESS,
-              port: DEFAULT_SERVICE_PORT,
-              channel: nil,
-              chan_creds: nil,
-              updater_proc: nil,
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -112,21 +115,10 @@ module Google
             require "google/gax/grpc"
             require "google/devtools/cloudtrace/v1/trace_services_pb"
 
-            if channel || chan_creds || updater_proc
-              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
-                "on 2017/09/08"
-              credentials ||= channel
-              credentials ||= chan_creds
-              credentials ||= updater_proc
-            end
-            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
-              warn "`service_path` and `port` parameters are deprecated and will be removed"
-            end
-
-            credentials ||= Google::Cloud::Trace::Credentials.default
+            credentials ||= Google::Cloud::Trace::V1::Credentials.default
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Trace::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Trace::V1::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -141,13 +133,16 @@ module Google
               updater_proc = credentials.updater_proc
             end
 
+            package_version = Gem.loaded_specs['google-cloud-trace'].version.version
+
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/#{package_version} gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "trace_service_client_config.json"
             )
@@ -160,9 +155,14 @@ module Google
                 timeout,
                 page_descriptors: PAGE_DESCRIPTORS,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
+
+            # Allow overriding the service path/port in subclasses.
+            service_path = self.class::SERVICE_ADDRESS
+            port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @trace_service_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -170,25 +170,113 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Devtools::Cloudtrace::V1::TraceService::Stub.method(:new)
             )
 
-            @list_traces = Google::Gax.create_api_call(
-              @trace_service_stub.method(:list_traces),
-              defaults["list_traces"]
+            @patch_traces = Google::Gax.create_api_call(
+              @trace_service_stub.method(:patch_traces),
+              defaults["patch_traces"],
+              exception_transformer: exception_transformer
             )
             @get_trace = Google::Gax.create_api_call(
               @trace_service_stub.method(:get_trace),
-              defaults["get_trace"]
+              defaults["get_trace"],
+              exception_transformer: exception_transformer
             )
-            @patch_traces = Google::Gax.create_api_call(
-              @trace_service_stub.method(:patch_traces),
-              defaults["patch_traces"]
+            @list_traces = Google::Gax.create_api_call(
+              @trace_service_stub.method(:list_traces),
+              defaults["list_traces"],
+              exception_transformer: exception_transformer
             )
           end
 
           # Service calls
 
+          # Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+          # of a trace that you send matches that of an existing trace, any fields
+          # in the existing trace and its spans are overwritten by the provided values,
+          # and any new fields provided are merged with the existing trace data. If the
+          # ID does not match, a new trace is created.
+          #
+          # @param project_id [String]
+          #   ID of the Cloud project where the trace data is stored.
+          # @param traces [Google::Devtools::Cloudtrace::V1::Traces | Hash]
+          #   The body of the message.
+          #   A hash of the same form as `Google::Devtools::Cloudtrace::V1::Traces`
+          #   can also be provided.
+          # @param options [Google::Gax::CallOptions]
+          #   Overrides the default settings for this call, e.g, timeout,
+          #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result []
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
+          # @raise [Google::Gax::GaxError] if the RPC is aborted.
+          # @example
+          #   require "google/cloud/trace"
+          #
+          #   trace_service_client = Google::Cloud::Trace.new(version: :v1)
+          #
+          #   # TODO: Initialize +project_id+:
+          #   project_id = ''
+          #
+          #   # TODO: Initialize +traces+:
+          #   traces = {}
+          #   trace_service_client.patch_traces(project_id, traces)
+
+          def patch_traces \
+              project_id,
+              traces,
+              options: nil,
+              &block
+            req = {
+              project_id: project_id,
+              traces: traces
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V1::PatchTracesRequest)
+            @patch_traces.call(req, options, &block)
+            nil
+          end
+
+          # Gets a single trace by its ID.
+          #
+          # @param project_id [String]
+          #   ID of the Cloud project where the trace data is stored.
+          # @param trace_id [String]
+          #   ID of the trace to return.
+          # @param options [Google::Gax::CallOptions]
+          #   Overrides the default settings for this call, e.g, timeout,
+          #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Devtools::Cloudtrace::V1::Trace]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
+          # @return [Google::Devtools::Cloudtrace::V1::Trace]
+          # @raise [Google::Gax::GaxError] if the RPC is aborted.
+          # @example
+          #   require "google/cloud/trace"
+          #
+          #   trace_service_client = Google::Cloud::Trace.new(version: :v1)
+          #
+          #   # TODO: Initialize +project_id+:
+          #   project_id = ''
+          #
+          #   # TODO: Initialize +trace_id+:
+          #   trace_id = ''
+          #   response = trace_service_client.get_trace(project_id, trace_id)
+
+          def get_trace \
+              project_id,
+              trace_id,
+              options: nil,
+              &block
+            req = {
+              project_id: project_id,
+              trace_id: trace_id
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V1::GetTraceRequest)
+            @get_trace.call(req, options, &block)
+          end
+
           # Returns of a list of traces that match the specified filter conditions.
           #
           # @param project_id [String]
@@ -197,11 +285,9 @@ module Google
           #   Type of data returned for traces in the list. Optional. Default is
           #   +MINIMAL+.
           # @param page_size [Integer]
-          #   The maximum number of resources contained in the underlying API
-          #   response. If page streaming is performed per-resource, this
-          #   parameter does not affect the return value. If page streaming is
-          #   performed per-page, this determines the maximum number of
-          #   resources in a page.
+          #   Maximum number of traces to return. If not specified or <= 0, the
+          #   implementation selects a reasonable value.  The implementation may
+          #   return fewer traces than the requested page size. Optional.
           # @param start_time [Google::Protobuf::Timestamp | Hash]
           #   Start of the time interval (inclusive) during which the trace data was
           #   collected from the application.
@@ -260,6 +346,9 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Gax::PagedEnumerable<Google::Devtools::Cloudtrace::V1::Trace>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Devtools::Cloudtrace::V1::Trace>]
           #   An enumerable of Google::Devtools::Cloudtrace::V1::Trace instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -267,9 +356,11 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/trace/v1"
+          #   require "google/cloud/trace"
           #
-          #   trace_service_client = Google::Cloud::Trace::V1.new
+          #   trace_service_client = Google::Cloud::Trace.new(version: :v1)
+          #
+          #   # TODO: Initialize +project_id+:
           #   project_id = ''
           #
           #   # Iterate over all results.
@@ -293,7 +384,8 @@ module Google
               end_time: nil,
               filter: nil,
               order_by: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               project_id: project_id,
               view: view,
@@ -304,75 +396,7 @@ module Google
               order_by: order_by
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V1::ListTracesRequest)
-            @list_traces.call(req, options)
-          end
-
-          # Gets a single trace by its ID.
-          #
-          # @param project_id [String]
-          #   ID of the Cloud project where the trace data is stored.
-          # @param trace_id [String]
-          #   ID of the trace to return.
-          # @param options [Google::Gax::CallOptions]
-          #   Overrides the default settings for this call, e.g, timeout,
-          #   retries, etc.
-          # @return [Google::Devtools::Cloudtrace::V1::Trace]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/trace/v1"
-          #
-          #   trace_service_client = Google::Cloud::Trace::V1.new
-          #   project_id = ''
-          #   trace_id = ''
-          #   response = trace_service_client.get_trace(project_id, trace_id)
-
-          def get_trace \
-              project_id,
-              trace_id,
-              options: nil
-            req = {
-              project_id: project_id,
-              trace_id: trace_id
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V1::GetTraceRequest)
-            @get_trace.call(req, options)
-          end
-
-          # Sends new traces to Stackdriver Trace or updates existing traces. If the ID
-          # of a trace that you send matches that of an existing trace, any fields
-          # in the existing trace and its spans are overwritten by the provided values,
-          # and any new fields provided are merged with the existing trace data. If the
-          # ID does not match, a new trace is created.
-          #
-          # @param project_id [String]
-          #   ID of the Cloud project where the trace data is stored.
-          # @param traces [Google::Devtools::Cloudtrace::V1::Traces | Hash]
-          #   The body of the message.
-          #   A hash of the same form as `Google::Devtools::Cloudtrace::V1::Traces`
-          #   can also be provided.
-          # @param options [Google::Gax::CallOptions]
-          #   Overrides the default settings for this call, e.g, timeout,
-          #   retries, etc.
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/trace/v1"
-          #
-          #   trace_service_client = Google::Cloud::Trace::V1.new
-          #   project_id = ''
-          #   traces = {}
-          #   trace_service_client.patch_traces(project_id, traces)
-
-          def patch_traces \
-              project_id,
-              traces,
-              options: nil
-            req = {
-              project_id: project_id,
-              traces: traces
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V1::PatchTracesRequest)
-            @patch_traces.call(req, options)
-            nil
+            @list_traces.call(req, options, &block)
           end
         end
       end

data/lib/google/cloud/trace/v1/trace_service_client_config.json

@@ -17,32 +17,23 @@
           "rpc_timeout_multiplier": 1.5,
           "max_rpc_timeout_millis": 30000,
           "total_timeout_millis": 45000
-        },
-        "write_sink": {
-          "initial_retry_delay_millis": 100,
-          "retry_delay_multiplier": 1.2,
-          "max_retry_delay_millis": 1000,
-          "initial_rpc_timeout_millis": 30000,
-          "rpc_timeout_multiplier": 1.5,
-          "max_rpc_timeout_millis": 60000,
-          "total_timeout_millis": 120000
         }
       },
       "methods": {
-        "ListTraces": {
-          "timeout_millis": 60000,
+        "PatchTraces": {
+          "timeout_millis": 30000,
           "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
         "GetTrace": {
-          "timeout_millis": 60000,
+          "timeout_millis": 30000,
           "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
-        "PatchTraces": {
+        "ListTraces": {
           "timeout_millis": 30000,
-          "retry_codes_name": "non_idempotent",
-          "retry_params_name": "write_sink"
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
         }
       }
     }

data/lib/google/cloud/trace/v2/credentials.rb

@@ -0,0 +1,38 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "googleauth"
+
+module Google
+  module Cloud
+    module Trace
+      module V2
+        class Credentials < Google::Auth::Credentials
+          SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
+          PATH_ENV_VARS = %w(TRACE_CREDENTIALS
+                             TRACE_KEYFILE
+                             GOOGLE_CLOUD_CREDENTIALS
+                             GOOGLE_CLOUD_KEYFILE
+                             GCLOUD_KEYFILE)
+          JSON_ENV_VARS = %w(TRACE_CREDENTIALS_JSON
+                             TRACE_KEYFILE_JSON
+                             GOOGLE_CLOUD_CREDENTIALS_JSON
+                             GOOGLE_CLOUD_KEYFILE_JSON
+                             GCLOUD_KEYFILE_JSON)
+          DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/trace/v2/doc/google/devtools/cloudtrace/v2/trace.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ module Google
         #   @return [Google::Devtools::Cloudtrace::V2::TruncatableString]
         #     A description of the span's operation (up to 128 bytes).
         #     Stackdriver Trace displays the description in the
-        #     {% dynamic print site_values.console_name %}.
+        #     Google Cloud Platform Console.
         #     For example, the display name can be a qualified method name or a file name
         #     and a line number where the operation is called. A best practice is to use
         #     the same display name within an application and at the same call point.

data/lib/google/cloud/trace/v2/doc/google/devtools/cloudtrace/v2/tracing.rb

@@ -0,0 +1,32 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Devtools
+    module Cloudtrace
+      module V2
+        # The request message for the +BatchWriteSpans+ method.
+        # @!attribute [rw] name
+        #   @return [String]
+        #     Required. The name of the project where the spans belong. The format is
+        #     +projects/[PROJECT_ID]+.
+        # @!attribute [rw] spans
+        #   @return [Array<Google::Devtools::Cloudtrace::V2::Span>]
+        #     A list of new spans. The span names must not match existing
+        #     spans, or the results are undefined.
+        class BatchWriteSpansRequest; end
+      end
+    end
+  end
+end

data/lib/google/cloud/trace/v2/doc/google/protobuf/any.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/trace/v2/doc/google/protobuf/empty.rb

@@ -0,0 +1,28 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Protobuf
+    # A generic empty message that you can re-use to avoid defining duplicated
+    # empty messages in your APIs. A typical example is to use it as the request
+    # or the response type of an API method. For instance:
+    #
+    #     service Foo {
+    #       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+    #     }
+    #
+    # The JSON representation for +Empty+ is empty JSON object +{}+.
+    class Empty; end
+  end
+end

data/lib/google/cloud/trace/v2/doc/google/protobuf/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/trace/v2/doc/google/protobuf/wrappers.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/trace/v2/doc/google/rpc/status.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/trace/v2/trace_service_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 # and updates to that file get reflected here through a refresh process.
 # For the short term, the refresh process will only be runnable by Google
 # engineers.
-#
-# The only allowed edits are to method and file documentation. A 3-way
-# merge preserves those additions if the generated source changes.
 
 require "json"
 require "pathname"
@@ -28,7 +25,7 @@ require "pathname"
 require "google/gax"
 
 require "google/devtools/cloudtrace/v2/tracing_pb"
-require "google/cloud/trace/credentials"
+require "google/cloud/trace/v2/credentials"
 
 module Google
   module Cloud
@@ -51,6 +48,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           # The scopes needed to make gRPC calls to all of the methods defined in
@@ -119,11 +119,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -132,10 +139,10 @@ module Google
             require "google/gax/grpc"
             require "google/devtools/cloudtrace/v2/tracing_services_pb"
 
-            credentials ||= Google::Cloud::Trace::Credentials.default
+            credentials ||= Google::Cloud::Trace::V2::Credentials.default
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Trace::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Trace::V2::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -159,6 +166,7 @@ module Google
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "trace_service_client_config.json"
             )
@@ -170,13 +178,14 @@ module Google
                 Google::Gax::Grpc::STATUS_CODE_NAMES,
                 timeout,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
 
             # Allow overriding the service path/port in subclasses.
             service_path = self.class::SERVICE_ADDRESS
             port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @trace_service_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -184,16 +193,19 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Devtools::Cloudtrace::V2::TraceService::Stub.method(:new)
             )
 
             @batch_write_spans = Google::Gax.create_api_call(
               @trace_service_stub.method(:batch_write_spans),
-              defaults["batch_write_spans"]
+              defaults["batch_write_spans"],
+              exception_transformer: exception_transformer
             )
             @create_span = Google::Gax.create_api_call(
               @trace_service_stub.method(:create_span),
-              defaults["create_span"]
+              defaults["create_span"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -213,25 +225,31 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result []
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/trace/v2"
+          #   require "google/cloud/trace"
           #
-          #   trace_service_client = Google::Cloud::Trace::V2.new
+          #   trace_service_client = Google::Cloud::Trace.new(version: :v2)
           #   formatted_name = Google::Cloud::Trace::V2::TraceServiceClient.project_path("[PROJECT]")
+          #
+          #   # TODO: Initialize +spans+:
           #   spans = []
           #   trace_service_client.batch_write_spans(formatted_name, spans)
 
           def batch_write_spans \
               name,
               spans,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name,
               spans: spans
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V2::BatchWriteSpansRequest)
-            @batch_write_spans.call(req, options)
+            @batch_write_spans.call(req, options, &block)
             nil
           end
 
@@ -252,7 +270,7 @@ module Google
           # @param display_name [Google::Devtools::Cloudtrace::V2::TruncatableString | Hash]
           #   A description of the span's operation (up to 128 bytes).
           #   Stackdriver Trace displays the description in the
-          #   {% dynamic print site_values.console_name %}.
+          #   Google Cloud Platform Console.
           #   For example, the display name can be a qualified method name or a file name
           #   and a line number where the operation is called. A best practice is to use
           #   the same display name within an application and at the same call point.
@@ -311,16 +329,27 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Devtools::Cloudtrace::V2::Span]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Devtools::Cloudtrace::V2::Span]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/trace/v2"
+          #   require "google/cloud/trace"
           #
-          #   trace_service_client = Google::Cloud::Trace::V2.new
+          #   trace_service_client = Google::Cloud::Trace.new(version: :v2)
           #   formatted_name = Google::Cloud::Trace::V2::TraceServiceClient.span_path("[PROJECT]", "[TRACE]", "[SPAN]")
+          #
+          #   # TODO: Initialize +span_id+:
           #   span_id = ''
+          #
+          #   # TODO: Initialize +display_name+:
           #   display_name = {}
+          #
+          #   # TODO: Initialize +start_time+:
           #   start_time = {}
+          #
+          #   # TODO: Initialize +end_time+:
           #   end_time = {}
           #   response = trace_service_client.create_span(formatted_name, span_id, display_name, start_time, end_time)
 
@@ -338,7 +367,8 @@ module Google
               status: nil,
               same_process_as_parent_span: nil,
               child_span_count: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name,
               span_id: span_id,
@@ -355,7 +385,7 @@ module Google
               child_span_count: child_span_count
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Devtools::Cloudtrace::V2::Span)
-            @create_span.call(req, options)
+            @create_span.call(req, options, &block)
           end
         end
       end

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

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

data/lib/google/devtools/cloudtrace/v1/trace_services_pb.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-trace
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -250,18 +264,21 @@ files:
 - 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/doc/overview.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/doc/overview.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

data/lib/google/cloud/trace/v1/doc/overview.rb

@@ -1,56 +0,0 @@
-# Copyright 2017 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Google
-  module Cloud
-    # rubocop:disable LineLength
-
-    ##
-    # # Ruby Client for Stackdriver Trace API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
-    #
-    # [Stackdriver Trace API][Product Documentation]:
-    # Send and retrieve trace data from Stackdriver Trace. Data is generated and
-    # available by default for all App Engine applications. Data from other
-    # applications can be written to Stackdriver Trace for display, reporting, and
-    # analysis.
-    # - [Product Documentation][]
-    #
-    # ## Quick Start
-    # In order to use this library, you first need to go through the following
-    # steps:
-    #
-    # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-    # 2. [Enable the Stackdriver Trace API.](https://console.cloud.google.com/apis/api/cloudtrace)
-    # 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
-    #
-    # ### Installation
-    # ```
-    # $ gem install google-cloud-trace
-    # ```
-    #
-    # ### Next Steps
-    # - Read the [Stackdriver Trace API Product documentation][Product Documentation]
-    #   to learn more about the product and see How-to Guides.
-    # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
-    #   to see the full list of Cloud APIs that we cover.
-    #
-    # [Product Documentation]: https://cloud.google.com/cloudtrace
-    #
-    #
-    module Trace
-      module V1
-      end
-    end
-  end
-end

data/lib/google/cloud/trace/v2/doc/overview.rb

@@ -1,67 +0,0 @@
-# Copyright 2017 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Google
-  module Cloud
-    # rubocop:disable LineLength
-
-    ##
-    # # Ruby Client for Stackdriver Trace API ([Beta](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
-    #
-    # [Stackdriver Trace API][Product Documentation]:
-    # Sends application trace data to Stackdriver Trace for viewing. Trace data is
-    # collected for all App Engine applications by default. Trace data from other
-    # applications can be provided using this API.
-    # - [Product Documentation][]
-    #
-    # ## Quick Start
-    # In order to use this library, you first need to go through the following
-    # steps:
-    #
-    # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-    # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
-    # 3. [Enable the Stackdriver Trace API.](https://console.cloud.google.com/apis/api/trace)
-    # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
-    #
-    # ### Installation
-    # ```
-    # $ gem install google-cloud-trace
-    # ```
-    #
-    # ### Preview
-    # #### TraceServiceClient
-    # ```rb
-    # require "google/cloud/trace"
-    #
-    # trace_service_client = Google::Cloud::Trace.new
-    # formatted_name = Google::Cloud::Trace::V2::TraceServiceClient.project_path(project_id)
-    # spans = []
-    # trace_service_client.batch_write_spans(formatted_name, spans)
-    # ```
-    #
-    # ### Next Steps
-    # - Read the [Stackdriver Trace API Product documentation][Product Documentation]
-    #   to learn more about the product and see How-to Guides.
-    # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
-    #   to see the full list of Cloud APIs that we cover.
-    #
-    # [Product Documentation]: https://cloud.google.com/trace
-    #
-    #
-    module Trace
-      module V2
-      end
-    end
-  end
-end