Revert "Fix order of magnitude in CPU consumption reported by cf app"

This reverts commit f48b915.
cloudfoundry-attic · Jun 14, 2016 · 87acf5f · 87acf5f
1 parent f48b915
commit 87acf5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/dea/stat_collector.rb b/lib/dea/stat_collector.rb
@@ -48,7 +48,7 @@ def compute_cpu_usage(usage, now)
         elapsed = @cpu_samples[1][:timestamp_ns] - @cpu_samples[0][:timestamp_ns]
 
         if elapsed > 0
-          @computed_pcpu = (used * 100).to_f / (elapsed*100)
+          @computed_pcpu = (used * 100).to_f / elapsed
         end
       end
     end

diff --git a/spec/unit/stat_collector_spec.rb b/spec/unit/stat_collector_spec.rb
@@ -152,7 +152,7 @@
         time_between_stats = (Dea::StatCollector::INTERVAL * NANOSECONDS_PER_SECOND)
 
         expect(@emitter.messages['application-id'].length).to eq(2)
-        expect(@emitter.messages['application-id'][1][:cpuPercentage]).to eq((10_000_000_000 - 5_000_000) / time_between_stats)
+        expect(@emitter.messages['application-id'][1][:cpuPercentage]).to eq((10_000_000_000 - 5_000_000) * 100 / time_between_stats)
       end
 
       it 'updates the statistic variables' do
@@ -163,7 +163,7 @@
         collector.emit_metrics(time + Dea::StatCollector::INTERVAL)
 
         time_between_stats = (Dea::StatCollector::INTERVAL * NANOSECONDS_PER_SECOND)
-        expected_pcpu = (10_000_000_000 - 5_000_000) / time_between_stats
+        expected_pcpu = (10_000_000_000 - 5_000_000) * 100 / time_between_stats
 
         expect(collector.computed_pcpu).to eq(expected_pcpu)
         expect(collector.used_memory_in_bytes).to eq(1000)
@@ -190,7 +190,7 @@
           collector.emit_metrics(time + Dea::StatCollector::INTERVAL)
 
           time_between_stats = (Dea::StatCollector::INTERVAL * NANOSECONDS_PER_SECOND)
-          expected_pcpu = (10_000_000_000 - 5_000_000) / time_between_stats
+          expected_pcpu = (10_000_000_000 - 5_000_000) * 100 / time_between_stats
 
           expect(@emitter.messages['application-id'].length).to eq(2)
           expect(@emitter.messages['application-id'][1][:cpuPercentage]).to eq(expected_pcpu)