scout_apm 1.2.0.pre12 → 1.2.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2662815011cf49ea8705e43d05c640c0f8bb3bf
-  data.tar.gz: db64b05bef1ed18f057850d3ee9e3b82c3caa5f2
+  metadata.gz: 3dd9ed781be96c9560a930cd06d77f1e16dc5850
+  data.tar.gz: 55e2e5b19b2b7cba3762acfbf7770885a7aa587e
 SHA512:
-  metadata.gz: 8cb4d0a454e78d70d5518b4f22d35e5f1c95afa73082fc9f15c684fb132ced136f01c9e8cda586ce7b2f33459fcafe03a54b1b4c0ab97a71cbd5d3449bcedbc3
-  data.tar.gz: 3717ff448998e6d3dee06bc0217f45d83fca5d23feeac61597af6b780375500c81c65d2fc34ead0a93ae31a5785f2339ddf09b4f33f4fd5d6241ea56246b8d3e
+  metadata.gz: 5fd9b980f60e9acf3afaa82ced352a3b1af769fed1daadeb08ed583789b611801c67aabbf8ed1ac2141c56194effd5d489e74d4e344a3735ecee138874c714b5
+  data.tar.gz: 7c5ba8af066c1416f9edfd44488f2309868d42d8a528ac68685e5ba39f6f82a420acc3e24b0843a37f385bfd793e019821e0eefceb9254bbfb5a228ff390ca91

data/.gitignore

@@ -4,3 +4,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+.idea

data/lib/scout_apm/config.rb

@@ -29,6 +29,10 @@ module ScoutApm
       @config_path = config_path
     end
 
+    def config_file_exists?
+      File.exist?(config_path)
+    end
+
     # Fetch a config value.
     # It first attempts to fetch an ENV var prefixed with 'SCOUT_',
     # then from the settings file.

data/lib/scout_apm/environment.rb

@@ -104,7 +104,8 @@ module ScoutApm
     end
 
     def hostname
-      @hostname ||= Agent.instance.config.value("hostname") || platform_integration.hostname
+      config_hostname = Agent.instance.config.value("hostname", !Agent.instance.config.config_file_exists?)
+      @hostname ||= config_hostname || platform_integration.hostname
     end
 
     # Returns the whole integration object

data/lib/scout_apm/store.rb

@@ -121,11 +121,7 @@ module ScoutApm
     # TODO: Figure out a way to not have this duplicate what's in Samplers, and also on server's ingest
     PASSTHROUGH_METRICS = ["CPU", "Memory", "Instance", "Controller"]
 
-    # Calculate any aggregate metrics necessary.
-    #
-    # A hash of { MetricMeta => MetricStat }
-    # This represents the aggregate metrics over the course of the minute.
-    # "ActiveRecord/all", "View/all", "HTTP/all" and similar
+    # Absorbs a single new metric into the aggregates
     def absorb(metric)
       meta, stat = metric
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0.pre12"
+  VERSION = "1.2.0.pre13"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre12
+  version: 1.2.0.pre13
 platform: ruby
 authors:
 - Derek Haynes