plain_apm 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae5b33c61e3205e05e0321b6e2189f458095998d466c5f8f3494902eb279f26
-  data.tar.gz: 0e46fdbd9c5a3e7c6a41c4e75767046a03811c7d6c0af8688f72e14b5dce1a4e
+  metadata.gz: e496879797c3c3bedfeea9f641b9f113bae2104b6a3c69bb67fdd6cfd8734af6
+  data.tar.gz: 484e1217d8d459ccf6c3619da23730c2126094136648a6c8fe15f5dbb63962b1
 SHA512:
-  metadata.gz: 10f006bfd8ef860ca46a4af5656f99665c0de125d41d611a07678364650e50de6ca0b45cb34f2962a6344f6425ec8cf47af93c512bad50c2f712eca0bd3a9f65
-  data.tar.gz: 8f6d46f2e471fe8f5a917ececcee37db2f0c6e056e62f0320eb17797424ec86a73a43b942b54fd2e619becfdd0725705f8af3d3a299e8a5c6aab4ea1499de3b7
+  metadata.gz: '052286dd61178482ed0c794f0486d28d21914bb250a77b86ec408599a25d6b6198baa844f34678ec6094ad84f3d3ec37ff2a5761ec89286527d19676ed1b7ef5'
+  data.tar.gz: 51b7cbc86ff0c6c8595ffde40361713f41e206d0d73f63ef0bb8270454a3a62af16e5851a789c2c9c2367cb8ade92e36324d9acaca64bd1784cf81fe486ddf15

data/lib/plain_apm/agent.rb

@@ -2,6 +2,7 @@
 
 require "singleton"
 require "json"
+require "socket"
 
 module PlainApm
   class Agent
@@ -30,6 +31,7 @@ module PlainApm
       event.merge!(
         "version" => PlainApm::VERSION,
         "collected_at" => Time.now.utc.to_f,
+        "hostname" => Socket.gethostname,
         "pid" => Process.pid,
         "thread_id" => Thread.current.object_id.to_s,
       )

data/lib/plain_apm/config.rb

@@ -7,19 +7,37 @@ module PlainApm
     attr_accessor :endpoint, :app_key, :enabled
 
     def initialize
-      @enabled = enabled?
+      @enabled = enabled? && key_present?
       @endpoint = ENV["PLAIN_APM_ENDPOINT"] || DEFAULT_EVENT_ENDPOINT
-      @app_key = ENV["PLAIN_APM_APP_KEY"] || warn("Missing PLAIN_APM_APP_KEY environment variable, plain_apm agent won't start.")
+      @app_key = ENV["PLAIN_APM_APP_KEY"]
+
+      if enabled? && !key_present?
+        warn("Missing PLAIN_APM_APP_KEY environment variable, plain_apm agent won't start.")
+      end
     end
 
     private
 
     def enabled?
-      force = ENV["PLAIN_APM_ENABLED"] == "1"
-      key_present = ENV["PLAIN_APM_APP_KEY"] != ""
-      production = (ENV["RAILS_ENV"] || ENV["RACK_ENV"]) == "production"
+      (production? || force_enabled?) && !force_disabled?
+    end
+
+    def key_present?
+      ENV["PLAIN_APM_APP_KEY"] != ""
+    end
+
+    def production?
+      (ENV["RAILS_ENV"] || ENV["RACK_ENV"]) == "production"
+    end
+
+    # Allow to start in e.g. development.
+    def force_enabled?
+      ENV["PLAIN_APM_ENABLED"] == "1"
+    end
 
-      key_present && (production || force)
+    # Do not instrument
+    def force_disabled?
+      ENV["PLAIN_APM_DISABLED"] == "1"
     end
   end
 end

data/lib/plain_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainApm
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest