lib/fluent/plugin/metrics_helper.rb in fluent-plugin-jfrog-metrics-0.2.12.2 vs lib/fluent/plugin/metrics_helper.rb in fluent-plugin-jfrog-metrics-0.2.12.3

@@ -28,26 +28,29 @@
           else
             "#{@jpd_url}/artifactory/api/v1/metrics"
           end
     
     @logger.info("Executing #{@metric_prefix} metrics collection from: #{url}")
+    metrics = nil
     if !@token.nil? && @token != ''
-      execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout)
+      metrics = execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout)
     elsif !@apikey.nil? && @apikey != ''
-      execute_rest_call(url, @username, @apikey, nil, false, @verify_ssl, @request_timeout)
+      metrics = execute_rest_call(url, @username, @apikey, nil, false, @verify_ssl, @request_timeout)
     end
     @logger.debug("Get metrics finished")
+    return metrics
   end
 
   def get_additional_metrics
     @logger.info("Aadditional metrics collection started")
     if (@metric_prefix == 'jfrog.artifactory' || @common_jpd == false) && !@token.nil? && @token != ''
       url = "#{@jpd_url}/observability/api/v1/metrics"
       @logger.info("Collecting additional metrics from: #{url}")
       check_endpoint(url, @token, @verify_ssl, @request_timeout) if @@obs_endpoint_exists == nil? || !@@obs_endpoint_exists
-      execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout) if @@obs_endpoint_exists
+      additional_metrics = execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout) if @@obs_endpoint_exists
     end
     @logger.info("Aadditional metrics collection finished")
+    return additional_metrics
   end
 
   def check_endpoint(url, token, verify_ssl, request_timeout)
     @logger.debug("Checking connectivity to endpoint: #{url} started")
     request = RestClient::Request.new(