strelka-newrelic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTljNGIxOWQxNDg4MDYxMWViN2UxNDQwYmFiMmQ5Yjc1Y2VlMGNmZg==
+    MzhkMjlkYzVmY2Y2MTBlNGQyYWM1NmM4OWVmNTgzMTQ3ZGNlMzAxOQ==
   data.tar.gz: !binary |-
-    ODE5MWNmYjdkNTNhMTkxZjcyMzczYjhhZmM4ZDlmOWJjZTBkZjNhYg==
+    NzIxMzMzNWMwMmZiMzIyZTMyOThiN2MwYjYyNTI1Y2VjMjFiYTdhYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2EyNDM4YWY4MTY2MWE0YjcyNTNkNWNlYWMzOTllNWY3OWRhZjY2MWQ4YmJk
-    NzVhMTIyZjZiYTI1OGUwZmMyMjhjMDlhNDhhODk2NjhjOTVkYTgyZTk2ZTBh
-    YzVkMWUxNjhhYWJkMGVlODNiYTFlZWY2NWM3ZDBiNjBjZmZlOGU=
+    ODk3NjIwNDBhNmM1OGQ1ZDk3ZDE3OGY4MzIzZWI5MzY0M2E3MTFiMDFiNDZi
+    MjE0ZjFjODg5NGM4NjIwOTVmMDE5YWQ5ZmZmYTNjMWM0MGFkNjUwYTJiOWYy
+    ZGM3NmQwYjkzYjM0ODFmNjMzMDlmZWQ5OGRhOWJiYzE0NjNhMWE=
   data.tar.gz: !binary |-
-    Y2VkNjM3ZGVhYWFiZjlkN2NhNWI1YmM2NjlkYmY1ODc2NmI4YWU1MGFhMjgx
-    MzRkMmQyNjFjNWJkMTFjNGMxYmYxZDViOTJjY2Y1OTlkYzUzOThkNjJlOGIx
-    NTk0YTliZmFjMjM1NGZkNjBjZjFmMDJlOGYwOTk4ZmYyMjJhYTQ=
+    MTQxOThjZmU0YzRiNTk5OWM0MTJiNzBjNDM4ZDhmOGZiNTY4ZTU4OTM0ZmZk
+    ZjE5Njg5YzYzZmQ2NDM4ZGZkZGQ1MzkwNzkwYjBjYjkzYTEyZjU3YjA1Mzkz
+    ZmJiNTc2ZDNhNTFhODM1OWFiN2EzYWUxMWUyNDkyZDE5M2E5NWM=

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.0.3 [2013-04-01] Michael Granger <ged@FaerieMUD.org>
+
+Enhancement:
+- Use the request notes for browser-timing headers.
+
+
 == v0.0.2 [2013-04-01] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/strelka/app/newrelic.rb

@@ -35,10 +35,10 @@ module Strelka::App::NewRelic
 
 
 	# Library version constant
-	VERSION = '0.0.2'
+	VERSION = '0.0.3'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 95dd2b5fc474 $
+	REVISION = %q$Revision: 92021b97f0c5 $
 
 
 
@@ -90,6 +90,9 @@ module Strelka::App::NewRelic
 		response = nil
 		self.log.debug "[:newrelic] Instrumenting with NewRelic."
 
+		request.notes[:rum_header] = NewRelic::Agent.browser_timing_header
+		request.notes[:rum_footer] = NewRelic::Agent.browser_timing_footer
+
 		txname = if !request.notes[:routing][:route].empty?
 				note = request.notes[:routing][:route]
 				self.log.debug "Making route name out of the route notes: %p" % [ note ]
@@ -105,18 +108,10 @@ module Strelka::App::NewRelic
 			request:  request,
 			category: 'Controller/Strelka',
 		}
-		response = self.perform_action_with_newrelic_trace( options ) do
+		return self.perform_action_with_newrelic_trace( options ) do
 			super
 		end
 
-		self.log.debug "Response is: %p" % [ response ]
-		if response && response.respond_to?( :notes ) && response.notes
-			response.notes[:rum_header] = NewRelic::Agent.browser_timing_header
-			response.notes[:rum_footer] = NewRelic::Agent.browser_timing_footer
-			self.log.debug "  response notes: %p" % [ response.notes ]
-		end
-
-		return response
 	rescue => err
 		NewRelic::Agent.notice_error( err.message )
 		raise

data/spec/strelka/app/newrelic_spec.rb

@@ -155,10 +155,12 @@ describe Strelka::App::NewRelic do
 				response.notes[:rum_footer].should =~ /NREUMQ/
 			end
 
-			it "only tries to add browser timing JS to the response if it's got notes" do
+			it "sets browser timings even with a template response" do
 				request = @request_factory.get( '/template' )
 				response = @app.new.start_newrelic_agent.handle( request )
 				response.status.should == HTTP::OK
+				response.notes[:rum_header].should =~ /NREUMQ/
+				response.notes[:rum_footer].should =~ /NREUMQ/
 			end
 
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Granger