Merge branch 'master' into add/entity_ingestion_attempts_priority

.env_deployment_sample

@@ -27,4 +27,3 @@ POSTGRES_USER=jupiter
 
 # Nginx environment variables
 HOSTNAME=localhost
-SKYLIGHT_AUTHENTICATION=secretauthenticationtoken

CHANGELOG.md

@@ -13,6 +13,11 @@ New entries in this file should aim to provide a meaningful amount of informatio
 - Push collections and communities to preservation on save along with a rake task to do so [#255](https://github.com/ualbertalib/pushmi_pullyu/issues/255)
 - Added minitest-retry gem to retry flapping tests that are able to pass through retries [#3044](https://github.com/ualbertalib/jupiter/pull/3044)
 - Add attempt count for entity ingestion on depositable model. Related to [pushmi_pullyu#297](https://github.com/ualbertalib/pushmi_pullyu/issues/297)
+
+### Removed
+- Skylight performance monitoring.  Will need to remove this secret from ansible playbook secrets as well. [#3023](https://github.com/ualbertalib/jupiter/issues/3023)
+- Remove brakeman's ruby EOL check [PR#3051](https://github.com/ualbertalib/jupiter/pull/3051)
+
 ## [2.4.3] - 2022-12-14
 
 ### Security

Gemfile

@@ -64,8 +64,6 @@ gem 'uuidtools'
 gem 'voight_kampff' # bot detection
 gem 'wicked' # Multi-step wizard
 
-# Performance monitoring
-gem 'skylight', '~> 4.3'
 # resolve production errors in minutes
 gem 'rollbar'
 

Gemfile.lock

@@ -329,7 +329,7 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minitest (5.16.3)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
@@ -381,7 +381,7 @@ GEM
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.1)
+    racc (1.6.2)
     rack (2.2.4)
     rack-protection (2.2.0)
       rack
@@ -486,7 +486,7 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sanitize (6.0.0)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sawyer (0.9.2)
@@ -532,10 +532,6 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    skylight (4.3.2)
-      skylight-core (= 4.3.2)
-    skylight-core (4.3.2)
-      activesupport (>= 4.2.0)
     smart_properties (1.17.0)
     sparql (3.2.1)
       builder (~> 3.2)
@@ -678,7 +674,6 @@ DEPENDENCIES
   sidekiq-unique-jobs (~> 7.1)
   simple_form
   simplecov
-  skylight (~> 4.3)
   spring
   spring-watcher-listen (~> 2.1.0)
   strong_migrations (~> 1.4.0)

app/models/jupiter_core/search.rb

@@ -86,14 +86,12 @@ def self.perform_solr_query(q:, qf: '', fq: '', facet: false, facet_fields: [],
                                 restrict_to_model: restrict_to_model, rows: rows,
                                 start: start, sort: sort, fulltext_fields: fulltext_fields)
 
-    response = ActiveSupport::Notifications.instrument(JUPITER_SOLR_NOTIFICATION,
-                                                       name: 'solr select',
-                                                       query: params) do
+    response = begin
       JupiterCore::SolrServices::Client.instance.connection.get('select', params: params)
-      rescue RSolr::Error::Http => e
-        raise JupiterCore::SolrBadRequestError if e.response[:status] == 400
+    rescue RSolr::Error::Http => e
+      raise JupiterCore::SolrBadRequestError if e.response[:status] == 400
 
-        raise
+      raise
     end
 
     raise SearchFailed unless response['responseHeader']['status'] == 0

config/application.rb

@@ -39,9 +39,6 @@ class Application < Rails::Application
     # Set ActiveJob adapter
     config.active_job.queue_adapter = :sidekiq
 
-    # Run skylight in Staging for performance metric monitoring pre-launch
-    config.skylight.environments << 'staging'
-
     config.redis_key_prefix = "jupiter.#{Rails.env}."
 
     config.action_dispatch.tld_length = Rails.application.secrets.tld_length.to_i

config/secrets.yml

@@ -154,5 +154,3 @@ production:
   fcrepo_url: <%= ENV['FCREPO_URL'] %>
   fcrepo_base_path: /prod
   solr_url: <%= ENV['SOLR_URL'] %>
-
-  skylight_authentication: <%= ENV['SKYLIGHT_AUTHENTICATION'] %>

package.json

@@ -28,7 +28,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "stylelint": "^13.13.1",
     "stylelint-config-standard": "^22.0.0",
     "webpack-dev-server": "^4.11.1"