From ae12bc877682be72b6b341ba48b82cdfdc9fb171 Mon Sep 17 00:00:00 2001 From: babelberry Date: Fri, 5 Sep 2014 16:31:09 +0100 Subject: [PATCH 1/3] added New Relic --- Gemfile | 3 +- Gemfile.lock | 2 + Procfile | 1 + config.ru => config/config.ru | 0 config/newrelic.yml | 224 ++++++++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 Procfile rename config.ru => config/config.ru (100%) create mode 100644 config/newrelic.yml diff --git a/Gemfile b/Gemfile index a567bdc..aba5337 100755 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,5 @@ gem 'sinatra' gem 'rspec' gem 'capybara' -gem 'cucumber-sinatra' \ No newline at end of file +gem 'cucumber-sinatra' +gem 'newrelic_rpm' diff --git a/Gemfile.lock b/Gemfile.lock index fc4244a..8445c9f 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ GEM highline (1.6.21) mime-types (2.3) mini_portile (0.6.0) + newrelic_rpm (3.9.3.241) nokogiri (1.6.3.1) mini_portile (= 0.6.0) rack (1.5.2) @@ -51,5 +52,6 @@ PLATFORMS DEPENDENCIES capybara cucumber-sinatra + newrelic_rpm rspec sinatra diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..d8766eb --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +: diff --git a/config.ru b/config/config.ru similarity index 100% rename from config.ru rename to config/config.ru diff --git a/config/newrelic.yml b/config/newrelic.yml new file mode 100644 index 0000000..e761d7a --- /dev/null +++ b/config/newrelic.yml @@ -0,0 +1,224 @@ +# +# This file configures the New Relic Agent. New Relic monitors Ruby, Java, +# .NET, PHP, Python and Node applications with deep visibility and low +# overhead. For more information, visit www.newrelic.com. +# +# Generated September 05, 2014 +# +# This configuration file is custom generated for app29252053@heroku.com + + +# Here are the settings that are common to all environments +common: &default_settings + # ============================== LICENSE KEY =============================== + + # You must specify the license key associated with your New Relic + # account. This key binds your Agent's data to your account in the + # New Relic service. + license_key: 'f66a0b46ad7344a2d2f5dfff72b85c0c3f5bbc53' + + # Agent Enabled (Ruby/Rails Only) + # Use this setting to force the agent to run or not run. + # Default is 'auto' which means the agent will install and run only + # if a valid dispatcher such as Mongrel is running. This prevents + # it from running with Rake or the console. Set to false to + # completely turn the agent off regardless of the other settings. + # Valid values are true, false and auto. + # + # agent_enabled: auto + + # Application Name Set this to be the name of your application as + # you'd like it show up in New Relic. The service will then auto-map + # instances of your application into an "application" on your + # dashboard page. If you want to map this instance into multiple + # apps, like "AJAX Requests" and "All UI" then specify a semicolon + # separated list of up to three distinct names, or a yaml list. + # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e., + # Production, Staging, etc) + # + # Example: + # + # app_name: + # - Ajax Service + # - All Services + # + # Caution: If you change this name, a new application will appear in the New + # Relic user interface with the new name, and data will stop reporting to the + # app with the old name. + # + # See https://newrelic.com/docs/site/renaming-applications for more details + # on renaming your New Relic applications. + # + app_name: My Application + + # When "true", the agent collects performance data about your + # application and reports this data to the New Relic service at + # newrelic.com. This global switch is normally overridden for each + # environment below. (formerly called 'enabled') + monitor_mode: true + + # Developer mode should be off in every environment but + # development as it has very high overhead in memory. + developer_mode: false + + # The newrelic agent generates its own log file to keep its logging + # information separate from that of your application. Specify its + # log level here. + log_level: info + + # Optionally set the path to the log file This is expanded from the + # root directory (may be relative or absolute, e.g. 'log/' or + # '/var/log/') The agent will attempt to create this directory if it + # does not exist. + # log_file_path: 'log' + + # Optionally set the name of the log file, defaults to 'newrelic_agent.log' + # log_file_name: 'newrelic_agent.log' + + # The newrelic agent communicates with the service via https by default. This + # prevents eavesdropping on the performance metrics transmitted by the agent. + # The encryption required by SSL introduces a nominal amount of CPU overhead, + # which is performed asynchronously in a background thread. If you'd prefer + # to send your metrics over http uncomment the following line. + # ssl: false + + #============================== Browser Monitoring =============================== + # New Relic Real User Monitoring gives you insight into the performance real users are + # experiencing with your website. This is accomplished by measuring the time it takes for + # your users' browsers to download and render your web pages by injecting a small amount + # of JavaScript code into the header and footer of each page. + browser_monitoring: + # By default the agent automatically injects the monitoring JavaScript + # into web pages. Set this attribute to false to turn off this behavior. + auto_instrument: true + + # Proxy settings for connecting to the New Relic server. + # + # If a proxy is used, the host setting is required. Other settings + # are optional. Default port is 8080. + # + # proxy_host: hostname + # proxy_port: 8080 + # proxy_user: + # proxy_pass: + + # The agent can optionally log all data it sends to New Relic servers to a + # separate log file for human inspection and auditing purposes. To enable this + # feature, change 'enabled' below to true. + # See: https://newrelic.com/docs/ruby/audit-log + audit_log: + enabled: false + + # Tells transaction tracer and error collector (when enabled) + # whether or not to capture HTTP params. When true, frameworks can + # exclude HTTP parameters from being captured. + # Rails: the RoR filter_parameter_logging excludes parameters + # Java: create a config setting called "ignored_params" and set it to + # a comma separated list of HTTP parameter names. + # ex: ignored_params: credit_card, ssn, password + capture_params: false + + # Transaction tracer captures deep information about slow + # transactions and sends this to the New Relic service once a + # minute. Included in the transaction is the exact call sequence of + # the transactions including any SQL statements issued. + transaction_tracer: + + # Transaction tracer is enabled by default. Set this to false to + # turn it off. This feature is only available at the Professional + # and above product levels. + enabled: true + + # Threshold in seconds for when to collect a transaction + # trace. When the response time of a controller action exceeds + # this threshold, a transaction trace will be recorded and sent to + # New Relic. Valid values are any float value, or (default) "apdex_f", + # which will use the threshold for an dissatisfying Apdex + # controller action - four times the Apdex T value. + transaction_threshold: apdex_f + + # When transaction tracer is on, SQL statements can optionally be + # recorded. The recorder has three modes, "off" which sends no + # SQL, "raw" which sends the SQL statement in its original form, + # and "obfuscated", which strips out numeric and string literals. + record_sql: obfuscated + + # Threshold in seconds for when to collect stack trace for a SQL + # call. In other words, when SQL statements exceed this threshold, + # then capture and send to New Relic the current stack trace. This is + # helpful for pinpointing where long SQL calls originate from. + stack_trace_threshold: 0.500 + + # Determines whether the agent will capture query plans for slow + # SQL queries. Only supported in mysql and postgres. Should be + # set to false when using other adapters. + # explain_enabled: true + + # Threshold for query execution time below which query plans will + # not be captured. Relevant only when `explain_enabled` is true. + # explain_threshold: 0.5 + + # Error collector captures information about uncaught exceptions and + # sends them to New Relic for viewing + error_collector: + + # Error collector is enabled by default. Set this to false to turn + # it off. This feature is only available at the Professional and above + # product levels. + enabled: true + + # To stop specific errors from reporting to New Relic, set this property + # to comma-separated values. Default is to ignore routing errors, + # which are how 404's get triggered. + ignore_errors: "ActionController::RoutingError,Sinatra::NotFound" + + # If you're interested in capturing memcache keys as though they + # were SQL uncomment this flag. Note that this does increase + # overhead slightly on every memcached call, and can have security + # implications if your memcached keys are sensitive + # capture_memcache_keys: true + +# Application Environments +# ------------------------------------------ +# Environment-specific settings are in this section. +# For Rails applications, RAILS_ENV is used to determine the environment. +# For Java applications, pass -Dnewrelic.environment to set +# the environment. + +# NOTE if your application has other named environments, you should +# provide newrelic configuration settings for these environments here. + +development: + <<: *default_settings + # Turn on communication to New Relic service in development mode + monitor_mode: true + app_name: My Application (Development) + + # Rails Only - when running in Developer Mode, the New Relic Agent will + # present performance information on the last 100 transactions you have + # executed since starting the mongrel. + # NOTE: There is substantial overhead when running in developer mode. + # Do not use for production or load testing. + developer_mode: true + +test: + <<: *default_settings + # It almost never makes sense to turn on the agent when running + # unit, functional or integration tests or the like. + monitor_mode: false + +# Turn on the agent in production for 24x7 monitoring. NewRelic +# testing shows an average performance impact of < 5 ms per +# transaction, you can leave this on all the time without +# incurring any user-visible performance degradation. +production: + <<: *default_settings + monitor_mode: true + +# Many applications have a staging environment which behaves +# identically to production. Support for that environment is provided +# here. By default, the staging environment has the agent turned on. +staging: + <<: *default_settings + monitor_mode: true + app_name: My Application (Staging) From 51c734b2ffb380964ae7e07b5f0ee266c1b00a7c Mon Sep 17 00:00:00 2001 From: babelberry Date: Fri, 5 Sep 2014 17:02:00 +0100 Subject: [PATCH 2/3] modified config --- Procfile | 1 - config/config.ru => config.ru | 5 ++- public/css/style.css | 67 +++++++++++++++++++++++++++++++++++ server.rb | 1 + views/layout.erb | 1 + 5 files changed, 73 insertions(+), 2 deletions(-) delete mode 100644 Procfile rename config/config.ru => config.ru (50%) create mode 100644 public/css/style.css diff --git a/Procfile b/Procfile deleted file mode 100644 index d8766eb..0000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -: diff --git a/config/config.ru b/config.ru similarity index 50% rename from config/config.ru rename to config.ru index 0f2a26d..5208cd8 100755 --- a/config/config.ru +++ b/config.ru @@ -1,4 +1,7 @@ require 'rubygems' require File.join(File.dirname(__FILE__), 'server.rb') +configure :production do + require 'newrelic_rpm' +end -run NinjaBearCowboy \ No newline at end of file +run NinjaBearCowboy diff --git a/public/css/style.css b/public/css/style.css new file mode 100644 index 0000000..269ef74 --- /dev/null +++ b/public/css/style.css @@ -0,0 +1,67 @@ +body { + font-family: arial, helvetica, sans-serif; + font-size: 14px; + color: black; + background-color: #ffc; + margin: 20px; + padding: 0; +} + +/* This is a comment, by the way */ + +p { + line-height: 21px; +} + +h1 { + color: #ffc; + background-color: #900; + font-size: 2em; + margin: 0; + margin-bottom: 7px; + padding: 4px; + font-style: italic; + text-align: center; + letter-spacing: 0.5em; + border-bottom-style: solid; + border-bottom-width: 0.5em; + border-bottom-color: #c00; +} + +h2 { + color: white; + background-color: #090; + font-size: 1.5em; + margin: 0; + padding: 2px; + padding-left: 14px; +} + +h3 { + color: #999; + font-size: 1.25em; +} + +img { + border-style: dashed; + border-width: 2px; + border-color: #ccc; +} + +a { + text-decoration: none; +} + +strong { + font-style: italic; + text-transform: uppercase; +} + +li { + color: #900; + font-style: italic; +} + +table { + background-color: #ccc; +} \ No newline at end of file diff --git a/server.rb b/server.rb index ca54834..8250d4b 100755 --- a/server.rb +++ b/server.rb @@ -3,6 +3,7 @@ require './lib/game' class NinjaBearCowboy < Sinatra::Base + get '/' do erb :index end diff --git a/views/layout.erb b/views/layout.erb index 01d070d..95df2b0 100755 --- a/views/layout.erb +++ b/views/layout.erb @@ -1,4 +1,5 @@ + <%= yield %> From 94e058e7c18c84440b9b6daac01be22c04a32a07 Mon Sep 17 00:00:00 2001 From: babelberry Date: Fri, 5 Sep 2014 17:14:06 +0100 Subject: [PATCH 3/3] NewRelic config modifications --- config.ru | 4 +- config/newrelic.yml | 224 -------------------------------------------- server.rb | 3 + 3 files changed, 4 insertions(+), 227 deletions(-) delete mode 100644 config/newrelic.yml diff --git a/config.ru b/config.ru index 5208cd8..9df70ce 100755 --- a/config.ru +++ b/config.ru @@ -1,7 +1,5 @@ require 'rubygems' require File.join(File.dirname(__FILE__), 'server.rb') -configure :production do - require 'newrelic_rpm' -end + run NinjaBearCowboy diff --git a/config/newrelic.yml b/config/newrelic.yml deleted file mode 100644 index e761d7a..0000000 --- a/config/newrelic.yml +++ /dev/null @@ -1,224 +0,0 @@ -# -# This file configures the New Relic Agent. New Relic monitors Ruby, Java, -# .NET, PHP, Python and Node applications with deep visibility and low -# overhead. For more information, visit www.newrelic.com. -# -# Generated September 05, 2014 -# -# This configuration file is custom generated for app29252053@heroku.com - - -# Here are the settings that are common to all environments -common: &default_settings - # ============================== LICENSE KEY =============================== - - # You must specify the license key associated with your New Relic - # account. This key binds your Agent's data to your account in the - # New Relic service. - license_key: 'f66a0b46ad7344a2d2f5dfff72b85c0c3f5bbc53' - - # Agent Enabled (Ruby/Rails Only) - # Use this setting to force the agent to run or not run. - # Default is 'auto' which means the agent will install and run only - # if a valid dispatcher such as Mongrel is running. This prevents - # it from running with Rake or the console. Set to false to - # completely turn the agent off regardless of the other settings. - # Valid values are true, false and auto. - # - # agent_enabled: auto - - # Application Name Set this to be the name of your application as - # you'd like it show up in New Relic. The service will then auto-map - # instances of your application into an "application" on your - # dashboard page. If you want to map this instance into multiple - # apps, like "AJAX Requests" and "All UI" then specify a semicolon - # separated list of up to three distinct names, or a yaml list. - # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e., - # Production, Staging, etc) - # - # Example: - # - # app_name: - # - Ajax Service - # - All Services - # - # Caution: If you change this name, a new application will appear in the New - # Relic user interface with the new name, and data will stop reporting to the - # app with the old name. - # - # See https://newrelic.com/docs/site/renaming-applications for more details - # on renaming your New Relic applications. - # - app_name: My Application - - # When "true", the agent collects performance data about your - # application and reports this data to the New Relic service at - # newrelic.com. This global switch is normally overridden for each - # environment below. (formerly called 'enabled') - monitor_mode: true - - # Developer mode should be off in every environment but - # development as it has very high overhead in memory. - developer_mode: false - - # The newrelic agent generates its own log file to keep its logging - # information separate from that of your application. Specify its - # log level here. - log_level: info - - # Optionally set the path to the log file This is expanded from the - # root directory (may be relative or absolute, e.g. 'log/' or - # '/var/log/') The agent will attempt to create this directory if it - # does not exist. - # log_file_path: 'log' - - # Optionally set the name of the log file, defaults to 'newrelic_agent.log' - # log_file_name: 'newrelic_agent.log' - - # The newrelic agent communicates with the service via https by default. This - # prevents eavesdropping on the performance metrics transmitted by the agent. - # The encryption required by SSL introduces a nominal amount of CPU overhead, - # which is performed asynchronously in a background thread. If you'd prefer - # to send your metrics over http uncomment the following line. - # ssl: false - - #============================== Browser Monitoring =============================== - # New Relic Real User Monitoring gives you insight into the performance real users are - # experiencing with your website. This is accomplished by measuring the time it takes for - # your users' browsers to download and render your web pages by injecting a small amount - # of JavaScript code into the header and footer of each page. - browser_monitoring: - # By default the agent automatically injects the monitoring JavaScript - # into web pages. Set this attribute to false to turn off this behavior. - auto_instrument: true - - # Proxy settings for connecting to the New Relic server. - # - # If a proxy is used, the host setting is required. Other settings - # are optional. Default port is 8080. - # - # proxy_host: hostname - # proxy_port: 8080 - # proxy_user: - # proxy_pass: - - # The agent can optionally log all data it sends to New Relic servers to a - # separate log file for human inspection and auditing purposes. To enable this - # feature, change 'enabled' below to true. - # See: https://newrelic.com/docs/ruby/audit-log - audit_log: - enabled: false - - # Tells transaction tracer and error collector (when enabled) - # whether or not to capture HTTP params. When true, frameworks can - # exclude HTTP parameters from being captured. - # Rails: the RoR filter_parameter_logging excludes parameters - # Java: create a config setting called "ignored_params" and set it to - # a comma separated list of HTTP parameter names. - # ex: ignored_params: credit_card, ssn, password - capture_params: false - - # Transaction tracer captures deep information about slow - # transactions and sends this to the New Relic service once a - # minute. Included in the transaction is the exact call sequence of - # the transactions including any SQL statements issued. - transaction_tracer: - - # Transaction tracer is enabled by default. Set this to false to - # turn it off. This feature is only available at the Professional - # and above product levels. - enabled: true - - # Threshold in seconds for when to collect a transaction - # trace. When the response time of a controller action exceeds - # this threshold, a transaction trace will be recorded and sent to - # New Relic. Valid values are any float value, or (default) "apdex_f", - # which will use the threshold for an dissatisfying Apdex - # controller action - four times the Apdex T value. - transaction_threshold: apdex_f - - # When transaction tracer is on, SQL statements can optionally be - # recorded. The recorder has three modes, "off" which sends no - # SQL, "raw" which sends the SQL statement in its original form, - # and "obfuscated", which strips out numeric and string literals. - record_sql: obfuscated - - # Threshold in seconds for when to collect stack trace for a SQL - # call. In other words, when SQL statements exceed this threshold, - # then capture and send to New Relic the current stack trace. This is - # helpful for pinpointing where long SQL calls originate from. - stack_trace_threshold: 0.500 - - # Determines whether the agent will capture query plans for slow - # SQL queries. Only supported in mysql and postgres. Should be - # set to false when using other adapters. - # explain_enabled: true - - # Threshold for query execution time below which query plans will - # not be captured. Relevant only when `explain_enabled` is true. - # explain_threshold: 0.5 - - # Error collector captures information about uncaught exceptions and - # sends them to New Relic for viewing - error_collector: - - # Error collector is enabled by default. Set this to false to turn - # it off. This feature is only available at the Professional and above - # product levels. - enabled: true - - # To stop specific errors from reporting to New Relic, set this property - # to comma-separated values. Default is to ignore routing errors, - # which are how 404's get triggered. - ignore_errors: "ActionController::RoutingError,Sinatra::NotFound" - - # If you're interested in capturing memcache keys as though they - # were SQL uncomment this flag. Note that this does increase - # overhead slightly on every memcached call, and can have security - # implications if your memcached keys are sensitive - # capture_memcache_keys: true - -# Application Environments -# ------------------------------------------ -# Environment-specific settings are in this section. -# For Rails applications, RAILS_ENV is used to determine the environment. -# For Java applications, pass -Dnewrelic.environment to set -# the environment. - -# NOTE if your application has other named environments, you should -# provide newrelic configuration settings for these environments here. - -development: - <<: *default_settings - # Turn on communication to New Relic service in development mode - monitor_mode: true - app_name: My Application (Development) - - # Rails Only - when running in Developer Mode, the New Relic Agent will - # present performance information on the last 100 transactions you have - # executed since starting the mongrel. - # NOTE: There is substantial overhead when running in developer mode. - # Do not use for production or load testing. - developer_mode: true - -test: - <<: *default_settings - # It almost never makes sense to turn on the agent when running - # unit, functional or integration tests or the like. - monitor_mode: false - -# Turn on the agent in production for 24x7 monitoring. NewRelic -# testing shows an average performance impact of < 5 ms per -# transaction, you can leave this on all the time without -# incurring any user-visible performance degradation. -production: - <<: *default_settings - monitor_mode: true - -# Many applications have a staging environment which behaves -# identically to production. Support for that environment is provided -# here. By default, the staging environment has the agent turned on. -staging: - <<: *default_settings - monitor_mode: true - app_name: My Application (Staging) diff --git a/server.rb b/server.rb index 8250d4b..a368324 100755 --- a/server.rb +++ b/server.rb @@ -1,6 +1,9 @@ require 'sinatra/base' require './lib/player' require './lib/game' +configure :production do + require 'newrelic_rpm' +end class NinjaBearCowboy < Sinatra::Base