Skip to content

Commit

Permalink
SRCH-4972 Upgrade ruby version for asis to 3.3 (#268)
Browse files Browse the repository at this point in the history
  • Loading branch information
krbhavith authored Jul 31, 2024
1 parent a70466e commit d76c2a1
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 36 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ workflows:
parameters:
ruby_version:
- 3.1.4
- 3.3.4
elasticsearch_version:
- 7.17.7
# not yet compatible with Elasticsearch 8
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.1.4
ARG RUBY_VERSION=3.3.4
FROM public.ecr.aws/docker/library/ruby:$RUBY_VERSION-slim as base

WORKDIR /rails
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.4
FROM ruby:3.3.4
WORKDIR /usr/src/app
EXPOSE 3300

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,4 @@ DEPENDENCIES
whenever (~> 0.9.4)

BUNDLED WITH
2.4.7
2.5.9
13 changes: 6 additions & 7 deletions config/newrelic.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#
# This file configures the New Relic Agent. New Relic monitors Ruby, Java,
# .NET, PHP, Python, Node, and Go applications with deep visibility and low
# overhead. For more information, visit www.newrelic.com.
Expand All @@ -10,22 +9,22 @@

common: &default_settings
# Required license key associated with your New Relic account.
license_key: <%= ENV['NEWRELIC_LICENSE_KEY'] || Rails.application.secrets.newrelic[:license_key] %>
license_key: <%= ENV['NEWRELIC_LICENSE_KEY'] %>

# Your application name. Renaming here affects where data displays in New
# Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
app_name: <%= ENV['NEWRELIC_APP_NAME'] || Rails.application.secrets.newrelic[:app_name] %>
app_name: <%= ENV['NEWRELIC_APP_NAME'] %>

# FedRAMP-complaint endpoint
# FedRAMP-compliant endpoint
# https://docs.newrelic.com/docs/security/security-privacy/compliance/fedramp-compliant-endpoints/
host: <%= ENV['NEWRELIC_HOST'] || Rails.application.secrets.newrelic[:host] %>
host: <%= ENV['NEWRELIC_HOST'] %>

# To disable the agent regardless of other settings, uncomment the following:
# agent_enabled: false

# Logging level for log/newrelic_agent.log; options are error, warn, info, or
# debug.
log_level: <%= ENV['NEWRELIC_LOG_LEVEL'] || Rails.application.secrets.newrelic[:log_level] || 'info' %>
log_level: <%= ENV['NEWRELIC_LOG_LEVEL'] %>

# All of the following configuration options are optional. Review them, and
# uncomment or edit them if they appear relevant to your application needs.
Expand Down Expand Up @@ -501,7 +500,7 @@ common: &default_settings
# elasticsearch.obfuscate_queries: true

# When true, the agent transmits data about your app to the New Relic collector.
monitor_mode: <%= ENV['NEWRELIC_ENABLED'] || Rails.application.secrets.newrelic[:enabled] || 'false' %>
monitor_mode: <%= ENV['NEWRELIC_ENABLED'] %>

# If true, uses Module#prepend rather than alias_method for Active Record
# instrumentation.
Expand Down
26 changes: 0 additions & 26 deletions config/secrets.yml

This file was deleted.

0 comments on commit d76c2a1

Please sign in to comment.