Skip to content

Commit 5877adb

Browse files
jaygel179Elpedio Adoptante Jr
andauthored
Ruby API - Remove protobuf from ruby api - use jsoni (#33)
* Ruby API - Remove protobuf from ruby api - use jsoni Changes: - remove protobuf - use json instead * fix issue with checking error and getting of time * fix issue with logs with exception Co-authored-by: Elpedio Adoptante Jr <eadoptante@stackify.com>
1 parent 5cad945 commit 5877adb

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

lib/stackify/error.rb

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def error_type
4040

4141
def to_h
4242
env = Stackify::EnvDetails.instance
43-
{
43+
data = {
4444
'OccurredEpochMillis' => Time.now.to_f*1000,
4545
'Error' => {
4646
'InnerError' => @exception.try(:cause),
@@ -52,11 +52,20 @@ def to_h
5252
'SourceMethod' => source_method,
5353
},
5454
'EnvironmentDetail' => env.auth_info,
55-
'WebRequestDetail' => env.request_details.try{ |d| d.fetch('webrequest_details', '') },
56-
'ServerVariables' => env.request_details.try{ |d| d.fetch('server_variables', '') },
5755
'CustomerName' => 'Customer',
5856
'UserName' => @context.fetch('user', '')
5957
}
58+
web_request_details = env.request_details.try{ |d| d.fetch('webrequest_details', '') }
59+
if web_request_details.nil?
60+
data['WebRequestDetail'] = web_request_details
61+
end
62+
63+
server_variables = env.request_details.try{ |d| d.fetch('server_variables', '') }
64+
if server_variables.nil?
65+
data['ServerVariables'] = server_variables
66+
end
67+
68+
data
6069
end
6170

6271
end

lib/stackify/utils/backtrace.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ module Stackify::Backtrace
33
ALL_TEXT_FROM_START_TO_FIRST_COLON_REGEXP = /\A([^:]+)/
44
NUMBER_BETWEEN_TWO_COLONS_REGEXP = /:(\d+):/
55
TEXT_AFTER_IN_BEFORE_END_REGEXP = /in\s`(\S+)'\z/
6+
TEXT_AFTER_IN_BEFORE_END_REGEXP_ = /in\s(\S+)'\z/
67

78
def self.line_number backtrace_str
89
backtrace_str[NUMBER_BETWEEN_TWO_COLONS_REGEXP, 1]
910
end
1011

1112
def self.method_name backtrace_str
1213
return nil unless backtrace_str
13-
backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP, 1]
14+
backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP, 1] || backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP_, 1]
1415
end
1516

1617
def self.file_name backtrace_str

0 commit comments

Comments
 (0)