appmonitor 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6debb44002babbb29bde93485cbd0cad0a85f31
-  data.tar.gz: 03221a29f484f97d17d82fb1ac94de839437fc57
+  metadata.gz: 0dd40358d6f66af203f178ea0015941d205fc45f
+  data.tar.gz: 9d5a8056b8643c47fda4a2faa4a7c6e817d0569d
 SHA512:
-  metadata.gz: d7154004a16f786a5823accb95dab8e3f27e97777267623255176e7022e7ff818f0bd65e840caf066f413ef0b32a1085570b0bcb2c172252bb294af92e83b876
-  data.tar.gz: ef493748f89fbfd480d33553755e2d2aaca05cd49651eb0f692ce40280acb9d8201d2be33e585e503f9fb2635360ab69daa576705faeca9d987b4895f335d711
+  metadata.gz: de08cf7955df61d62878eaf82cb45b9da2f7b3de52e3123267da896335cd12aa96beb3cc416ee061d7d2e23f4b19484764c0daa18c1039ec4c98a5b0008e5b94
+  data.tar.gz: f580182251cb784cd7fc87ff710a5d413d31f6a3df8748d65b93e0f6050e0bec97167b501d2c8982bfa6643d450692c7f6dc6d3bc50a57e4cf2a2360bf0fa8b7

data/lib/appmonitor/event_notification.rb

@@ -19,7 +19,7 @@ module AppMonitor
       rake_called_name = options[:rake_command_line].split(":", 2)
       rake_namespace = rake_called_name.first
       {method: options[:rake_command_line], time: Time.now.to_i.to_s, message: exception.message.inspect, stack_trace:
-          exception.backtrace.join("\n"), klass: rake_namespace, environment: Rails.env || ''}
+      exception.backtrace.join("\n"), klass: rake_namespace, environment: Rails.env || ''}
     end
 
   end

data/lib/appmonitor/event_notifier.rb

@@ -3,7 +3,6 @@ require 'net/http'
 require 'active_support/core_ext'
 require 'action_dispatch'
 require 'appmonitor/event_notification'
-require 'appmonitor/github_api'
 
 module AppMonitor
   class EventNotifier
@@ -14,14 +13,10 @@ module AppMonitor
       @app = app
       configure
       @config[:ignore_exceptions] ||= self.class.default_ignore_exceptions
-      @github = GithubApi.new(token: @config[:github_oauth_token], repo: @config[:github_repo_url]) if @config[:github_oauth_token] && @config[:github_repo_url]
-
     end
 
     def configure(opts = {})
       @config = {
-          github_oauth_token: '',
-          github_repo_url: '',
           api_key: '',
           project_id: '',
           monitoring: {development: '', staging: '', production: ''}
@@ -67,21 +62,19 @@ module AppMonitor
     end
 
     def send_exception(exception)
-      type = 'Error'
       unless ignored_exception(@config[:ignore_exceptions], exception)
         event = EventNotification.build_exception_hash(exception, @request)
-        @event = event.merge(type: type)
-        notify_on_event(type)
+        @event = event.to_json
+        notify_on_event("Error")
       end
     end
 
     def send_rake_event(exception, options = {})
-      type = 'RakeError'
       configure
-      unless (ignored_exception(@config[:ignore_exceptions], exception) || !@config[:monitoring]["#{Rails.env.to_s.downcase}"])
+      unless (ignored_exception(@config[:ignore_exceptions], exception) ||  !@config[:monitoring]["#{Rails.env.to_s.downcase}"])
         event = EventNotification.build_rake_event(exception, options)
-        @event = event.merge(type: type)
-        notify_on_event(type)
+        @event = event.to_json
+        notify_on_event("RakeError")
       end
     end
 
@@ -91,20 +84,6 @@ module AppMonitor
     end
 
     def notify_on_event(type)
-      response = send_request(type)
-      Rails.logger.debug ("Appmonitor: Event has been sent")
-
-      unless response.kind_of? Net::HTTPSuccess
-        Rails.logger.warn('Appmonitor WARNING: Something went wrong, please check your config')
-        Rails.logger.warn("AppMonitor WARNING: Response ''#{response.code}: #{response.message}''")
-        puts 'Appmonitor WARNING: Something went wrong, please check your config'
-        puts "AppMonitor WARNING: Response #{response.inspect}"
-      end
-
-      send_to_github if @github
-    end
-
-    def send_request(type)
       uri = URI.parse(API_MESSAGE_URL)
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = false
@@ -113,13 +92,19 @@ module AppMonitor
                                                             'appm_projectId' => @config[:project_id],
                                                             'appm_type' => type}
       )
-      request.body = @event.to_json
-      https.request(request)
 
-    end
+      request.body = @event
+      response = https.request(request)
 
-    def send_to_github
-      @github.handle_event(@event)
+      Rails.logger.debug ("Appmonitor: Event has been sent")
+      puts 'Appmonitor: Event has been sent'
+
+      unless response.kind_of? Net::HTTPSuccess
+        Rails.logger.warn('Appmonitor WARNING: Something went wrong, please check your config')
+        Rails.logger.warn("AppMonitor WARNING: Response ''#{response.code}: #{response.message}''")
+        puts 'Appmonitor WARNING: Something went wrong, please check your config'
+        puts "AppMonitor WARNING: Response #{response.inspect}"
+      end
     end
 
   end

data/lib/appmonitor/rake_patch.rb

@@ -13,7 +13,7 @@ module AppMonitor
     def display_error_message_with_notifications(ex)
       display_error_message_without_notifications(ex)
       en = AppMonitor::EventNotifier.new(nil)
-      en.send_rake_event(ex, :rake_command_line => reconstruct_command_line)
+      en.send_rake_event(ex,:rake_command_line => reconstruct_command_line)
     end
 
     def reconstruct_command_line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Team Gappers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,21 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: AppMonitor agent for ruby language. We provide GIthub Integration - issues.
+description: AppMonitor agent for ruby language
 email: gappers-tip-fiit@googlegroups.com
 executables: []
 extensions: []
@@ -61,8 +47,6 @@ files:
 - lib/appmonitor.rb
 - lib/appmonitor/event_notification.rb
 - lib/appmonitor/event_notifier.rb
-- lib/appmonitor/github/issue.rb
-- lib/appmonitor/github_api.rb
 - lib/appmonitor/rake_patch.rb
 homepage: http://rubygems.org/gems/appmonitor
 licenses:
@@ -89,3 +73,4 @@ signing_key:
 specification_version: 4
 summary: AppMonitor agent for ruby language
 test_files: []
+has_rdoc: 

data/lib/appmonitor/github/issue.rb

@@ -1,58 +0,0 @@
-module AppMonitor
-  module Github
-    class Issue
-
-      RUBY_OBJECT_REGEX = /\#\<.*\>/
-
-      def initialize(event)
-        @event=event
-      end
-
-      def title
-        "#{@event[:klass]}/#{@event[:method]}: #{@event[:message]}"
-      end
-
-      def type
-        @event[:type]
-      end
-
-      def error_request_details
-        content = "**URL**: #{@event[:url]}\n"
-        content << "**Parameters**: #{@event[:params]}\n"
-        content << "**IP address**: #{@event[:ip_address]}\n"
-        content << "**Session:** #{@event[:session]}\n"
-      end
-
-      def body
-        content = "### First occurrence of this #{@event[:type]}\n"
-        content << "**Action:** #{@event[:klass]}/#{@event[:method]}\n"
-        content << "**Message**: #{@event[:message]}\n"
-        content << "**Environment:** #{@event[:environment]}\n"
-        content << "**Timestamp:** #{@event[:time]}\n"
-        content << "**Human time:** #{Time.at(@event[:time].to_i).strftime("Occurred on %d/%m/%Y at %H:%M:%S")}\n"
-        if type == 'Error'
-          content << error_request_details
-        end
-        content << "**Stacktrace:** \n```ruby\n#{@event[:stack_trace]}\n```"
-      end
-
-      def additional_occurrence_comment
-        content = "### Another occurrence of this #{@event[:type]}\n"
-        content << "**Environment:** #{@event[:environment]}\n"
-        content << "**Timestamp:** #{@event[:time]}\n"
-        content << "**Human time:** #{Time.at(@event[:time].to_i).strftime("Occurred on %d/%m/%Y at %H:%M:%S")}\n"
-        if type == 'Error'
-          content << error_request_details
-        end
-        content
-      end
-
-      def self.compare_issues(existing, new)
-        existing_title = existing.title.gsub(RUBY_OBJECT_REGEX, '')
-        new_title = new.title.gsub(RUBY_OBJECT_REGEX, '')
-        existing_title == new_title
-      end
-
-    end
-  end
-end

data/lib/appmonitor/github_api.rb

@@ -1,54 +0,0 @@
-require 'octokit'
-require 'appmonitor/github/issue'
-
-module AppMonitor
-  class GithubApi
-    attr_accessor :client, :repo
-
-    GITHUB_API_ISSUED_CLOSED_STATE = 'closed'
-
-    def initialize(args)
-      @client = Octokit::Client.new(:access_token => args[:token])
-      @repo = args[:repo]
-    end
-
-    def issues
-      @client.issues(@repo, state: 'all')
-    end
-
-    def handle_event(event)
-      begin
-        @issue = AppMonitor::Github::Issue.new(event)
-        existing_issue = find_issue(issues)
-        if existing_issue
-          reopen_issue(existing_issue[:number])
-        else
-          create_issue
-        end
-      rescue Octokit::Unauthorized
-        Rails.logger.warn('Appmonitor WARNING: Wrong Github credentials')
-        puts ('Appmonitor WARNING: Wrong Github credentials')
-      end
-    end
-
-    def find_issue(issues)
-      issues.select { |x| AppMonitor::Github::Issue.compare_issues(x, @issue) }.first
-    end
-
-    def create_issue
-
-      @client.create_issue(@repo, @issue.title, @issue.body, labels: ['bug', @issue.type])
-
-    end
-
-    def reopen_issue(number)
-      @client.reopen_issue(@repo, number)
-      add_comment_to_an_issue(number, @issue.additional_occurrence_comment)
-    end
-
-    def add_comment_to_an_issue(number, comment)
-      @client.add_comment(@repo, number, comment)
-    end
-
-  end
-end