cloudpi-appmetric 0.0.6 → 0.1.0

data/Gemfile.lock

@@ -0,0 +1,30 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.3)
+    rake (0.9.2.2)
+    rcov (1.0.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.8.3)
+  json
+  rcov
+  rdoc (~> 3.12)
+  shoulda

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/cloudpi-appmetric.gemspec

@@ -0,0 +1,65 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{cloudpi-appmetric}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Junsang Yang}]
+  s.date = %q{2012-06-10}
+  s.description = %q{CloudPI PaaS - Application Metric Client for ruby}
+  s.email = %q{junsang.yang@samsung.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "cloudpi-appmetric.gemspec",
+    "lib/cloudpi-appmetric.rb",
+    "test/helper.rb",
+    "test/test_cloudpi-appmetric.rb"
+  ]
+  s.homepage = %q{http://github.com/zuns00@gmail.com/cloudpi-appmetric}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{CloudPI PaaS - Application Metric Client for ruby}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<json>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+  end
+end
+

data/lib/cloudpi-appmetric.rb

@@ -67,13 +67,15 @@ class AppMetric
     @app_ip = ENV["VCAP_APP_HOST"] || '127.0.0.1'
     @app_port = ENV["VCAP_APP_PORT"] || 9999
     env_vcap_application = JSON.parse(ENV["VCAP_APPLICATION"])
+    app_id = env_vcap_application["app_id"] if env_vcap_application
     instance_id = env_vcap_application["instance_id"] if env_vcap_application
-    @app_id = instance_id || 'NO_INSTANCE_ID'
+    @app_id = app_id || ''
+    @instance_id = instance_id || ''
     @bridge_ip = bridge_ip
     @bridge_port = bridge_port
     @metric_policy = JSON.parse(metric_policy)
     @queue = CircularQueue.new(4096)
-
+    
     connect
     thread_loop
   end
@@ -94,7 +96,11 @@ class AppMetric
   end
 
   def metric_key
-    "#{@app_ip}:#{@app_port}:#{@app_id}"
+    # "IP-ADDRESS:PORT:APP-ID:INSTANCE-ID" or
+    # "IP-ADDRESS:PORT:APP-INSTANCE-ID".
+
+    # "#{@app_ip}:#{@app_port}:#{@instance_id}"
+    "#{@app_ip}:#{@app_port}:#{@app_id}:#{@instance_id}"
   end
 
   def set_metric_policy(metric_policy)
@@ -130,11 +136,11 @@ class AppMetric
     thread = Thread.new do
       loop do
         while !@queue.is_empty do
-          puts "not empty queue: #{@queue.cursor}"
+          # puts "not empty queue: #{@queue.cursor}"
           @message = @queue.first
           begin
             @conn.write("#{@message}\0")
-            puts "send msg: #{@message}"
+            # puts "send msg: #{@message}"
             @queue.pop
           rescue
             # retry to connect
@@ -146,15 +152,17 @@ class AppMetric
       end # loop
     end # thread
     
-    heartbeat_thread = Thread.new do
-      loop do
-        send_heartbeat
-        sleep(10.0)
-      end # loop
-    end # thread
+    # no need to send heartbeat, dea metric will do that..
+    
+    # heartbeat_thread = Thread.new do
+    #   loop do
+    #     send_heartbeat
+    #     sleep(10.0)
+    #   end # loop
+    # end # thread
     
     set_trap(thread)
-    set_trap(heartbeat_thread)
+    # set_trap(heartbeat_thread)
   end
 
   def set_trap(thread)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudpi-appmetric
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Junsang Yang
@@ -118,10 +118,12 @@ extra_rdoc_files:
 files: 
 - .document
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- cloudpi-appmetric.gemspec
 - lib/cloudpi-appmetric.rb
 - test/helper.rb
 - test/test_cloudpi-appmetric.rb