google-cloud-debugger 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28eb0ba3938e8fdf591b9ffa1c53f66fe21005e096f27194f984c951c8c59544
-  data.tar.gz: 3726320cdb33ef63c2d096a6096f52c9ebad9cf018759e743c2d8ceec76c0893
+  metadata.gz: 9003d275442e4a4c3899688e66577856a6642fb4bb6463918e0c223ee81a5b15
+  data.tar.gz: 3f00c92ab295af42cf1ba08255a447c74bb61f32d71eda4625d96fda86b483cd
 SHA512:
-  metadata.gz: 2e59a8c15c75555308c0ceaa6b2f191650b3ca87091ccae50c0595ca206e7ad64f925539bc39fa9e687c0055d6de664c07220db73b6e85ac60de02ce5b3a5b52
-  data.tar.gz: c5f87c78fade091d092d6348d3d47a5f6da2f11355c26e15f84e40d93d0e026b99f10124bf7c8f2cb263329e248a7beb7328646187a556ee137796a9305e8c84
+  metadata.gz: 0f49a670cbed7af70e6f10ea70a9fba1bff60962d94b93742500c3a1dee04ffcb5fbd266541e23b3f000328a7e41cce66666798fb1f0c79a23158af7ee114a80
+  data.tar.gz: ce38de51d533e8265736dd0501d93bf4ed37d6f06116385350d45e3efc55f3dd37b04da23ab41919ec87d09d28b940ea6d4a1bad7fd1b952ac9892061250af29

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 0.33.2 / 2019-02-08
+
+* Fix conversion code for ErrorEvent and Debugee.
+  * Prepare for changes in JSON serialization coming in
+    google-protobuf 3.7.
+
 ### 0.33.1 / 2019-02-07
 
 * Update concurrent-ruby dependency
@@ -17,7 +23,7 @@
     This value was added in googleauth 0.7.0.
   * Loosen googleauth dependency
     Allow for new releases up to 0.10.
-    The googleauth devs have committed to maintanining the current API
+    The googleauth devs have committed to maintaining the current API
     and will not make backwards compatible changes before 0.10.
 
 ### 0.32.6 / 2018-11-15

data/lib/google/cloud/debugger/debuggee.rb

@@ -113,35 +113,33 @@ module Google
         # Convert this debuggee into a gRPC
         # Google::Devtools::Clouddebugger::V2::Debuggee struct.
         def to_grpc
-          debuggee_args = build_request_arg
-
-          Google::Devtools::Clouddebugger::V2::Debuggee.decode_json \
-            debuggee_args.to_json
+          source_context = source_context_from_json_file "source-context.json"
+          Google::Devtools::Clouddebugger::V2::Debuggee.new(
+            id: id.to_s,
+            project: project_id_for_request_arg.to_s,
+            description: description.to_s,
+            labels: labels,
+            agent_version: agent_version.to_s
+          ).tap do |d|
+            if source_context
+              d.source_contexts << source_context
+              d.ext_source_contexts << ext_source_context_grpc(source_context)
+            end
+            d.uniquifier = compute_uniquifier d
+          end
         end
 
         private
 
-        ##
-        # @private Build the parameters for this debuggee
-        def build_request_arg
-          debuggee_args = {
-            project: project_id_for_request_arg,
-            description: description,
-            labels: labels,
-            agent_version: agent_version
-          }
-
-          debuggee_args[:id] = id if id
-
-          source_context = read_app_json_file "source-context.json"
-          if source_context
-            debuggee_args[:source_contexts] = [source_context]
-            debuggee_args[:ext_source_contexts] = [{ context: source_context }]
-          end
-
-          debuggee_args[:uniquifier] = compute_uniquifier debuggee_args
+        def source_context_from_json_file file_path
+          json = File.read file_path
+          Devtools::Source::V1::SourceContext.decode_json json
+        rescue StandardError
+          nil
+        end
 
-          debuggee_args
+        def ext_source_context_grpc source_context
+          Devtools::Source::V1::SourceContext.new context: source_context
         end
 
         ##
@@ -197,14 +195,14 @@ module Google
         ##
         # @private Generate a debuggee uniquifier from source context
         # information or application source code
-        def compute_uniquifier debuggee_args
+        def compute_uniquifier partial_debuggee
           return @computed_uniquifier if @computed_uniquifier
 
           sha = Digest::SHA1.new
-          sha << debuggee_args.to_s
+          sha << partial_debuggee.to_s
 
-          unless debuggee_args.key?(:source_contexts) ||
-                 debuggee_args.key?(:ext_source_contexts)
+          if partial_debuggee.source_contexts.empty? &&
+             partial_debuggee.ext_source_contexts.empty?
             AppUniquifierGenerator.generate_app_uniquifier sha
           end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-debugger
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Heng Xiong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller