Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 305 deletions

diff --git a/lib/gitlab/code_navigation_path.rb b/lib/gitlab/code_navigation_path.rb
index c4f9407f7f0..57aeb6c4fb2 100644
--- a/lib/gitlab/code_navigation_path.rb
+++ b/lib/gitlab/code_navigation_path.rb
@@ -5,7 +5,6 @@ module Gitlab
     include Gitlab::Utils::StrongMemoize
     include Gitlab::Routing
 
-    CODE_NAVIGATION_JOB_NAME = 'code_navigation'
     LATEST_COMMITS_LIMIT = 10
 
     def initialize(project, commit_sha)
@@ -17,7 +16,7 @@ module Gitlab
       return if Feature.disabled?(:code_navigation, project)
       return unless build
 
-      raw_project_job_artifacts_path(project, build, path: "lsif/#{path}.json")
+      raw_project_job_artifacts_path(project, build, path: "lsif/#{path}.json", file_type: :lsif)
     end
 
     private
@@ -29,10 +28,11 @@ module Gitlab
         latest_commits_shas =
           project.repository.commits(commit_sha, limit: LATEST_COMMITS_LIMIT).map(&:sha)
 
-        artifact = ::Ci::JobArtifact
-          .for_sha(latest_commits_shas, project.id)
-          .for_job_name(CODE_NAVIGATION_JOB_NAME)
-          .last
+        artifact =
+          ::Ci::JobArtifact
+            .with_file_types(['lsif'])
+            .for_sha(latest_commits_shas, project.id)
+            .last
 
         artifact&.job
       end
diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
deleted file mode 100644
index 1f252572461..00000000000
--- a/lib/gitlab/metrics/influx_db.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Metrics
-    module InfluxDb
-      extend ActiveSupport::Concern
-      include Gitlab::Metrics::Methods
-
-      EXECUTION_MEASUREMENT_BUCKETS = [0.001, 0.01, 0.1, 1].freeze
-
-      MUTEX = Mutex.new
-      private_constant :MUTEX
-
-      class_methods do
-        def influx_metrics_enabled?
-          settings[:enabled] || false
-        end
-
-        # Prometheus histogram buckets used for arbitrary code measurements
-
-        def settings
-          @settings ||= begin
-            current_settings = Gitlab::CurrentSettings.current_application_settings
-
-            {
-              enabled: current_settings[:metrics_enabled],
-              pool_size: current_settings[:metrics_pool_size],
-              timeout: current_settings[:metrics_timeout],
-              method_call_threshold: current_settings[:metrics_method_call_threshold],
-              host: current_settings[:metrics_host],
-              port: current_settings[:metrics_port],
-              sample_interval: current_settings[:metrics_sample_interval] || 15,
-              packet_size: current_settings[:metrics_packet_size] || 1
-          }
-          end
-        end
-
-        def mri?
-          RUBY_ENGINE == 'ruby'
-        end
-
-        def method_call_threshold
-          # This is memoized since this method is called for every instrumented
-          # method. Loading data from an external cache on every method call slows
-          # things down too much.
-          # in milliseconds
-          @method_call_threshold ||= settings[:method_call_threshold]
-        end
-
-        def submit_metrics(metrics)
-          prepared = prepare_metrics(metrics)
-
-          pool&.with do |connection|
-            prepared.each_slice(settings[:packet_size]) do |slice|
-              connection.write_points(slice)
-            rescue StandardError
-            end
-          end
-        rescue Errno::EADDRNOTAVAIL, SocketError => ex
-          Gitlab::EnvironmentLogger.error('Cannot resolve InfluxDB address. GitLab Performance Monitoring will not work.')
-          Gitlab::EnvironmentLogger.error(ex)
-        end
-
-        def prepare_metrics(metrics)
-          metrics.map do |hash|
-            new_hash = hash.symbolize_keys
-
-            new_hash[:tags].each do |key, value|
-              if value.blank?
-                new_hash[:tags].delete(key)
-              else
-                new_hash[:tags][key] = escape_value(value)
-              end
-            end
-
-            new_hash
-          end
-        end
-
-        def escape_value(value)
-          value.to_s.gsub('=', '\\=')
-        end
-
-        # Measures the execution time of a block.
-        #
-        # Example:
-        #
-        #     Gitlab::Metrics.measure(:find_by_username_duration) do
-        #       UserFinder.new(some_username).find_by_username
-        #     end
-        #
-        # name - The name of the field to store the execution time in.
-        #
-        # Returns the value yielded by the supplied block.
-        def measure(name)
-          trans = current_transaction
-
-          return yield unless trans
-
-          real_start = Time.now.to_f
-          cpu_start = System.cpu_time
-
-          retval = yield
-
-          cpu_stop = System.cpu_time
-          real_stop = Time.now.to_f
-
-          real_time = (real_stop - real_start)
-          cpu_time = cpu_stop - cpu_start
-
-          real_duration_seconds = fetch_histogram("gitlab_#{name}_real_duration_seconds".to_sym) do
-            docstring "Measure #{name}"
-            base_labels Transaction::BASE_LABELS
-            buckets EXECUTION_MEASUREMENT_BUCKETS
-          end
-
-          real_duration_seconds.observe(trans.labels, real_time)
-
-          cpu_duration_seconds = fetch_histogram("gitlab_#{name}_cpu_duration_seconds".to_sym) do
-            docstring "Measure #{name}"
-            base_labels Transaction::BASE_LABELS
-            buckets EXECUTION_MEASUREMENT_BUCKETS
-            with_feature "prometheus_metrics_measure_#{name}_cpu_duration"
-          end
-          cpu_duration_seconds.observe(trans.labels, cpu_time)
-
-          # InfluxDB stores the _real_time and _cpu_time time values as milliseconds
-          trans.increment("#{name}_real_time", real_time.in_milliseconds, false)
-          trans.increment("#{name}_cpu_time", cpu_time.in_milliseconds, false)
-          trans.increment("#{name}_call_count", 1, false)
-
-          retval
-        end
-
-        # Sets the action of the current transaction (if any)
-        #
-        # action - The name of the action.
-        def action=(action)
-          trans = current_transaction
-
-          trans&.action = action
-        end
-
-        # Tracks an event.
-        #
-        # See `Gitlab::Metrics::Transaction#add_event` for more details.
-        def add_event(*args)
-          current_transaction&.add_event(*args)
-        end
-
-        # Returns the prefix to use for the name of a series.
-        def series_prefix
-          @series_prefix ||= Gitlab::Runtime.sidekiq? ? 'sidekiq_' : 'rails_'
-        end
-
-        # Allow access from other metrics related middlewares
-        def current_transaction
-          Transaction.current
-        end
-
-        # When enabled this should be set before being used as the usual pattern
-        # "@foo ||= bar" is _not_ thread-safe.
-        def pool
-          if influx_metrics_enabled?
-            if @pool.nil?
-              MUTEX.synchronize do
-                @pool ||= ConnectionPool.new(size: settings[:pool_size], timeout: settings[:timeout]) do
-                  host = settings[:host]
-                  port = settings[:port]
-
-                  InfluxDB::Client
-                    .new(udp: { host: host, port: port })
-                end
-              end
-            end
-
-            @pool
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index d0c63a862c2..fbeda3b75e0 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -49,19 +49,6 @@ module Gitlab
         retval
       end
 
-      # Returns a Metric instance of the current method call.
-      def to_metric
-        Metric.new(
-          Instrumentation.series,
-          {
-            duration: real_time.in_milliseconds.to_i,
-            cpu_duration: cpu_time.in_milliseconds.to_i,
-            call_count: call_count
-          },
-          method: @name
-        )
-      end
-
       # Returns true if the total runtime of this method exceeds the method call
       # threshold.
       def above_threshold?
diff --git a/lib/gitlab/metrics/metric.rb b/lib/gitlab/metrics/metric.rb
deleted file mode 100644
index 30f181542be..00000000000
--- a/lib/gitlab/metrics/metric.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Metrics
-    # Class for storing details of a single metric (label, value, etc).
-    class Metric
-      JITTER_RANGE = (0.000001..0.001).freeze
-
-      attr_reader :series, :values, :tags, :type
-
-      # series - The name of the series (as a String) to store the metric in.
-      # values - A Hash containing the values to store.
-      # tags   - A Hash containing extra tags to add to the metrics.
-      def initialize(series, values, tags = {}, type = :metric)
-        @values = values
-        @series = series
-        @tags   = tags
-        @type   = type
-      end
-
-      def event?
-        type == :event
-      end
-
-      # Returns a Hash in a format that can be directly written to InfluxDB.
-      def to_hash
-        # InfluxDB overwrites an existing point if a new point has the same
-        # series, tag set, and timestamp. In a highly concurrent environment
-        # this means that using the number of seconds since the Unix epoch is
-        # inevitably going to collide with another timestamp. For example, two
-        # Rails requests processed by different processes may end up generating
-        # metrics using the _exact_ same timestamp (in seconds).
-        #
-        # Due to the way InfluxDB is set up there's no solution to this problem,
-        # all we can do is lower the amount of collisions. We do this by using
-        # System.real_time which returns the nanoseconds as a Float providing
-        # greater accuracy. We then add a small random value that is large
-        # enough to distinguish most timestamps but small enough to not alter
-        # the timestamp significantly.
-        #
-        # See https://gitlab.com/gitlab-com/operations/issues/175 for more
-        # information.
-        time = System.real_time(:nanosecond) + rand(JITTER_RANGE)
-
-        {
-          series:    @series,
-          tags:      @tags,
-          values:    @values,
-          timestamp: time.to_i
-        }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/metrics/samplers/influx_sampler.rb b/lib/gitlab/metrics/samplers/influx_sampler.rb
deleted file mode 100644
index b9eee3a15be..00000000000
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Metrics
-    module Samplers
-      # Class that sends certain metrics to InfluxDB at a specific interval.
-      #
-      # This class is used to gather statistics that can't be directly associated
-      # with a transaction such as system memory usage, garbage collection
-      # statistics, etc.
-      class InfluxSampler < BaseSampler
-        # interval - The sampling interval in seconds.
-        def initialize(interval = ::Gitlab::Metrics.settings[:sample_interval])
-          super(interval)
-          @last_step = nil
-
-          @metrics = []
-        end
-
-        def sample
-          sample_memory_usage
-          sample_file_descriptors
-
-          flush
-        ensure
-          @metrics.clear
-        end
-
-        def flush
-          ::Gitlab::Metrics.submit_metrics(@metrics.map(&:to_hash))
-        end
-
-        def sample_memory_usage
-          add_metric('memory_usage', value: System.memory_usage_rss)
-        end
-
-        def sample_file_descriptors
-          add_metric('file_descriptors', value: System.file_descriptor_count)
-        end
-
-        def add_metric(series, values, tags = {})
-          prefix = Gitlab::Runtime.sidekiq? ? 'sidekiq_' : 'rails_'
-
-          @metrics << Metric.new("#{prefix}#{series}", values, tags)
-        end
-      end
-    end
-  end
-end