atatus 1.3.0 → 1.4.0

data/lib/atatus/internal_error.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/logging.rb

@@ -1,6 +1,21 @@
-# frozen_string_literal: true
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-require 'logger'
+# frozen_string_literal: true
 
 module Atatus
   # @api private

data/lib/atatus/metadata.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/metadata/process_info.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/metadata/service_info.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -13,16 +30,17 @@ module Atatus
 
         attr_reader :name, :version
       end
+
       class Agent < Versioned; end
       class Framework < Versioned; end
       class Language < Versioned; end
       class Runtime < Versioned; end
 
-      # rubocop:disable Metrics/MethodLength
       def initialize(config)
         @config = config
 
         @name = @config.service_name
+        @node_name = @config.service_node_name
         @environment = @config.environment
         @agent = Agent.new(name: 'ruby', version: VERSION)
         @framework = Framework.new(
@@ -33,14 +51,12 @@ module Atatus
         @runtime = lookup_runtime
         @version = @config.service_version || Util.git_sha
       end
-      # rubocop:enable Metrics/MethodLength
 
-      attr_reader :name, :environment, :agent, :framework, :language, :runtime,
-        :version
+      attr_reader :name, :node_name, :environment, :agent, :framework, :language,
+        :runtime, :version
 
       private
 
-      # rubocop:disable Metrics/MethodLength
       def lookup_runtime
         case RUBY_ENGINE
         when 'ruby'
@@ -55,7 +71,6 @@ module Atatus
           )
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/atatus/metadata/system_info.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -7,7 +24,7 @@ module Atatus
       def initialize(config)
         @config = config
 
-        @hostname = @config.hostname || `hostname`.chomp
+        @hostname = @config.hostname || self.class.system_hostname
         @architecture = gem_platform.cpu
         @platform = gem_platform.os
 
@@ -21,11 +38,13 @@ module Atatus
 
       attr_reader :hostname, :architecture, :platform, :container, :kubernetes, :hwinfo, :osinfo
 
-      private
-
       def gem_platform
         @gem_platform ||= Gem::Platform.local
       end
+
+      def self.system_hostname
+        @system_hostname ||= `hostname`.chomp
+      end
     end
   end
 end

data/lib/atatus/metadata/system_info/container_info.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -34,7 +51,6 @@ module Atatus
             end
         end
 
-        # rubocop:disable Metrics/MethodLength
         def kubernetes
           @kubernetes =
             begin
@@ -51,7 +67,6 @@ module Atatus
               kubernetes
             end
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 
@@ -66,12 +81,18 @@ module Atatus
             ENV.fetch('KUBERNETES_POD_UID', kubernetes_pod_uid)
         end
 
-        CONTAINER_ID_REGEX = /^[0-9A-Fa-f]{64}$/.freeze
-        KUBEPODS_REGEX = %r{(?:^/kubepods/[^/]+/pod([^/]+)$)|(?:^/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice$)}.freeze # rubocop:disable Metrics/LineLength
+        CONTAINER_ID_REGEXES = [
+          %r{^[[:xdigit:]]{64}$},
+          %r{^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4,}$}
+        ]
+        KUBEPODS_REGEXES = [
+          %r{(?:^/kubepods[^\s]*/pod([^/]+)$)},
+          %r{(?:^/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice$)}
+        ]
         SYSTEMD_SCOPE_SUFFIX = '.scope'
 
-        # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+        # rubocop:disable Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/CyclomaticComplexity
         def read_from_cgroup!
           return unless File.exist?(cgroup_path)
           IO.readlines(cgroup_path).each do |line|
@@ -103,18 +124,36 @@ module Atatus
               end
             end
 
-            if (kubepods_match = KUBEPODS_REGEX.match(directory))
+            if (kubepods_match = match_kubepods(directory))
               pod_id = kubepods_match[1] || kubepods_match[2]
 
               self.container_id = container_id
               self.kubernetes_pod_uid = pod_id
-            elsif CONTAINER_ID_REGEX.match(container_id)
+            elsif match_container(container_id)
               self.container_id = container_id
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
+
+        def match_kubepods(directory)
+          KUBEPODS_REGEXES.each do |r|
+            next unless (match = r.match(directory))
+            return match
+          end
+
+          nil
+        end
+
+        def match_container(container_id)
+          CONTAINER_ID_REGEXES.each do |r|
+            next unless (match = r.match(container_id))
+            return match
+          end
+
+          nil
+        end
       end
     end
   end

data/lib/atatus/metadata/system_info/hw_info.rb

@@ -66,7 +66,7 @@ module Atatus
         end
 
         LINUX_CPUINFO_PATH = '/proc/cpuinfo'.freeze
-        PROCESSOR_COUNT_REGEX = /^processor\s*:/.freeze
+        PROCESSOR_COUNT_REGEX = /processor\s+:\s+([0-9.]+)/.freeze
         MODEL_NAME_REGEX = /model name.+:(.+)/.freeze
         CPU_MHZ_REGEX = /cpu MHz\s+:\s+([0-9.]+)/.freeze
 

data/lib/atatus/metrics.rb

@@ -1,14 +1,27 @@
-# frozen_string_literal: true
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-require 'atatus/metricset'
+# frozen_string_literal: true
 
 module Atatus
   # @api private
   module Metrics
-    MUTEX = Mutex.new
-
     def self.new(config, &block)
-      Collector.new(config, &block)
+      Registry.new(config, &block)
     end
 
     def self.platform
@@ -16,24 +29,17 @@ module Atatus
     end
 
     # @api private
-    class Collector
+    class Registry
       include Logging
 
       TIMEOUT_INTERVAL = 5 # seconds
 
-      def initialize(config, labels: nil, &block)
+      def initialize(config, &block)
         @config = config
-        @labels = labels
-        @samplers = [CpuMem, VM].map do |kls|
-          debug "Adding metrics collector '#{kls}'"
-          kls.new(config)
-        end
         @callback = block
       end
 
-      attr_reader :config, :samplers, :callback, :labels
-
-      # rubocop:disable Metrics/MethodLength
+      attr_reader :config, :sets, :callback
       def start
         unless config.collect_metrics?
           debug 'Skipping metrics'
@@ -42,6 +48,18 @@ module Atatus
 
         debug 'Starting metrics'
 
+        # Only set the @sets once, in case we stop
+        # and start again.
+        @sets ||= {
+          system: CpuMemSet,
+          # vm: VMSet,
+          breakdown: BreakdownSet,
+          transaction: TransactionSet
+        }.each_with_object({}) do |(key, kls), sets|
+          debug "Adding metrics collector '#{kls}'"
+          sets[key] = kls.new(config)
+        end
+
         @timer_task = Concurrent::TimerTask.execute(
           run_now: true,
           execution_interval: config.metrics_interval,
@@ -60,7 +78,6 @@ module Atatus
 
         @running = true
       end
-      # rubocop:enable Metrics/MethodLength
 
       def stop
         return unless running?
@@ -75,24 +92,49 @@ module Atatus
         !!@running
       end
 
-      def collect_and_send
-        metricset = Metricset.new(labels: labels, **collect)
-        return if metricset.empty?
+      def handle_forking!
+        # Note that ideally we would be able to check if the @timer_task died
+        # and restart it. You can't simply check @timer_task.running? because
+        # it will only return the state of the TimerTask, not whether the
+        # internal thread used to manage the execution interval has died.
+        # This is a limitation of the Concurrent::TimerTask object.
+        # Therefore, our only option when forked is to stop and start.
+        # ~estolfo
+        stop
+        start
+      end
 
-        callback.call(metricset)
+      def get(key)
+        sets.fetch(key)
+      end
+
+      def collect_and_send
+        return unless @config.recording?
+        metricsets = collect
+        metricsets.compact!
+        metricsets.each do |m|
+          callback.call(m)
+        end
       end
 
       def collect
-        MUTEX.synchronize do
-          samplers.each_with_object({}) do |sampler, samples|
-            next unless (sample = sampler.collect)
-            samples.merge!(sample)
-          end
+        sets.each_value.each_with_object([]) do |set, arr|
+          samples = set.collect
+          next unless samples
+          arr.concat(samples)
         end
       end
     end
   end
 end
 
-require 'atatus/metrics/cpu_mem'
-require 'atatus/metrics/vm'
+require 'atatus/metricset'
+
+require 'atatus/metrics/metric'
+require 'atatus/metrics/set'
+
+require 'atatus/metrics/cpu_mem_set'
+require 'atatus/metrics/vm_set'
+require 'atatus/metrics/span_scoped_set'
+require 'atatus/metrics/transaction_set'
+require 'atatus/metrics/breakdown_set'