appsignal 2.1.2 → 2.2.0.beta.1

data/spec/lib/appsignal/utils/query_params_sanitizer_spec.rb

@@ -43,7 +43,7 @@ describe Appsignal::Utils::QueryParamsSanitizer do
       end
 
       context "when value is an array" do
-        let(:value) { ["foo", "bar"] }
+        let(:value) { %w(foo bar) }
 
         it "should only return the first level of the object" do
           expect(subject).to eq("?")
@@ -51,7 +51,7 @@ describe Appsignal::Utils::QueryParamsSanitizer do
 
         it "should not modify source value" do
           subject
-          expect(value).to eq(["foo", "bar"])
+          expect(value).to eq(%w(foo bar))
         end
       end
 
@@ -115,7 +115,7 @@ describe Appsignal::Utils::QueryParamsSanitizer do
       end
 
       context "when value is an array" do
-        let(:value) { ["foo", "bar"] }
+        let(:value) { %w(foo bar) }
 
         it "should sanitize all hash values with a single questionmark" do
           expect(subject).to eq(["?"])

data/spec/lib/appsignal/utils_spec.rb

@@ -8,7 +8,11 @@ describe Appsignal::Utils do
       let(:body) do
         {
           "the" => "payload",
-          "int" => 1,
+          "int" => 1, # Fixnum
+          "int61" => 1 << 61, # Fixnum
+          "int62" => 1 << 62, # Bignum, this one still works
+          "int63" => 1 << 63, # Bignum, turnover point for C, too big for long
+          "int64" => 1 << 64, # Bignum
           "float" => 1.0,
           1 => true,
           nil => "test",
@@ -20,21 +24,60 @@ describe Appsignal::Utils do
 
       it { is_expected.to eq Appsignal::Utils.data_generate(body) }
       it { is_expected.to_not eq Appsignal::Utils.data_generate({}) }
-      it { is_expected.to_not eq "a string" }
 
       describe "#to_s" do
-        it do
-          expect(subject.to_s).to eq %({"":"test","1":true,"bar":null,"baz":{"arr":[1,2],"foo":"bʊr"},"float":1.0,"foo":[1,2,"three",{"foo":"bar"}],"int":1,"the":"payload"})
+        it "returns a serialized hash" do
+          expect(subject.to_s).to eq %({"":"test",) +
+            %("1":true,) +
+            %("bar":null,) +
+            %("baz":{"arr":[1,2],"foo":"bʊr"},) +
+            %("float":1.0,) +
+            %("foo":[1,2,"three",{"foo":"bar"}],) +
+            %("int":1,) +
+            %("int61":#{1 << 61},) +
+            %("int62":#{1 << 62},) +
+            %("int63":"bigint:#{1 << 63}",) +
+            %("int64":"bigint:#{1 << 64}",) +
+            %("the":"payload"})
         end
       end
     end
 
     context "with a valid array body" do
       let(:body) do
-        [1, "string", 10, { "foo" => "bʊr" }]
+        [
+          nil,
+          true,
+          false,
+          "string",
+          1, # Fixnum
+          1.0, # Float
+          1 << 61, # Fixnum
+          1 << 62, # Bignum, this one still works
+          1 << 63, # Bignum, turnover point for C, too big for long
+          1 << 64, # Bignum
+          { "arr" => [1, 2, "three"], "foo" => "bʊr" }
+        ]
       end
 
-      it { expect(subject.to_s).to eq %([1,\"string\",10,{\"foo\":\"bʊr\"}]) }
+      it { is_expected.to eq Appsignal::Utils.data_generate(body) }
+      it { is_expected.to_not eq Appsignal::Utils.data_generate({}) }
+
+      describe "#to_s" do
+        it "returns a serialized array" do
+          expect(subject.to_s).to eq %([null,) +
+            %(true,) +
+            %(false,) +
+            %(\"string\",) +
+            %(1,) +
+            %(1.0,) +
+            %(#{1 << 61},) +
+            %(#{1 << 62},) +
+            %("bigint:#{1 << 63}",) +
+            %("bigint:#{1 << 64}",) +
+            %({\"arr\":[1,2,\"three\"],\"foo\":\"bʊr\"}])
+        end
+      end
     end
 
     context "with a body that contains strings with invalid utf-8 content" do

data/spec/lib/appsignal_spec.rb

@@ -283,6 +283,14 @@ describe Appsignal do
       end
     end
 
+    describe ".set_namespace" do
+      it "should do nothing" do
+        expect do
+          Appsignal.set_namespace("custom")
+        end.to_not raise_error
+      end
+    end
+
     describe ".tag_request" do
       it "should do nothing" do
         expect do
@@ -554,7 +562,6 @@ describe Appsignal do
           :log_path => log_path
         )
       end
-      around { |example| recognize_as_container(:none) { example.run } }
       after { FileUtils.rm_rf(log_path) }
 
       context "when the log path is writable" do
@@ -582,7 +589,7 @@ describe Appsignal do
         context "when the log file is not writable" do
           before do
             FileUtils.touch log_file
-            FileUtils.chmod 0444, log_file
+            FileUtils.chmod 0o444, log_file
 
             capture_stdout(out_stream) do
               Appsignal.start_logger
@@ -609,8 +616,8 @@ describe Appsignal do
 
       context "when the log path and fallback path are not writable" do
         before do
-          FileUtils.chmod 0444, log_path
-          FileUtils.chmod 0444, Appsignal::Config::SYSTEM_TMP_DIR
+          FileUtils.chmod 0o444, log_path
+          FileUtils.chmod 0o444, Appsignal::Config::SYSTEM_TMP_DIR
 
           capture_stdout(out_stream) do
             Appsignal.start_logger
@@ -618,7 +625,7 @@ describe Appsignal do
           end
         end
         after do
-          FileUtils.chmod 0755, Appsignal::Config::SYSTEM_TMP_DIR
+          FileUtils.chmod 0o755, Appsignal::Config::SYSTEM_TMP_DIR
         end
 
         it "logs to stdout" do
@@ -792,6 +799,54 @@ describe Appsignal do
       end
     end
 
+    describe ".set_action" do
+      before { allow(Appsignal::Transaction).to receive(:current).and_return(transaction) }
+
+      it "should set the namespace to the current transaction" do
+        expect(transaction).to receive(:set_action).with("custom")
+
+        Appsignal.set_action("custom")
+      end
+
+      it "should do nothing if there is no current transaction" do
+        allow(Appsignal::Transaction).to receive(:current).and_return(nil)
+
+        expect(transaction).to_not receive(:set_action)
+
+        Appsignal.set_action("custom")
+      end
+
+      it "should do nothing if the error is nil" do
+        expect(transaction).to_not receive(:set_action)
+
+        Appsignal.set_action(nil)
+      end
+    end
+
+    describe ".set_namespace" do
+      before { allow(Appsignal::Transaction).to receive(:current).and_return(transaction) }
+
+      it "should set the namespace to the current transaction" do
+        expect(transaction).to receive(:set_namespace).with("custom")
+
+        Appsignal.set_namespace("custom")
+      end
+
+      it "should do nothing if there is no current transaction" do
+        allow(Appsignal::Transaction).to receive(:current).and_return(nil)
+
+        expect(transaction).to_not receive(:set_namespace)
+
+        Appsignal.set_namespace("custom")
+      end
+
+      it "should do nothing if the error is nil" do
+        expect(transaction).to_not receive(:set_namespace)
+
+        Appsignal.set_namespace(nil)
+      end
+    end
+
     describe ".instrument" do
       before do
         expect(Appsignal::Transaction).to receive(:current).at_least(:once).and_return(transaction)

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ APPSIGNAL_SPEC_DIR = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(APPSIGNAL_SPEC_DIR, "support/stubs"))
 
 Bundler.require :default
+require "cgi"
 require "rack"
 require "rspec"
 require "pry"
@@ -66,9 +67,9 @@ RSpec.configure do |config|
     ENV["PADRINO_ENV"] ||= "test"
 
     # Clean environment
-    ENV.keys.select { |key| key.start_with?("APPSIGNAL_") }.each do |key|
-      ENV.delete(key)
-    end
+    appsignal_key_prefixes = %w(APPSIGNAL_ _APPSIGNAL_)
+    env_keys = ENV.keys.select { |key| key.start_with?(*appsignal_key_prefixes) }
+    env_keys.each { |key| ENV.delete(key) }
   end
 
   config.after do

data/spec/support/helpers/api_request_helper.rb

@@ -9,13 +9,10 @@ module ApiRequestHelper
         :gem_version => Appsignal::VERSION
       },
       :headers => {
-        "Content-Encoding" => "gzip",
         "Content-Type" => "application/json; charset=UTF-8"
       }
     }
-    if body.is_a? Hash
-      body = Appsignal::Utils::Gzip.compress(Appsignal::Utils::JSON.generate(body))
-    end
+    body = Appsignal::Utils::JSON.generate(body) if body.is_a? Hash
     options[:body] = body if body
     stub_request(:post, "#{config[:endpoint]}/1/#{path}").with(options)
   end

data/spec/support/helpers/dependency_helper.rb

@@ -17,6 +17,10 @@ module DependencyHelper
     dependency_present? "resque"
   end
 
+  def redis_present?
+    dependency_present? "redis"
+  end
+
   def active_job_present?
     dependency_present? "activejob"
   end

data/spec/support/helpers/system_helpers.rb

@@ -1,24 +1,8 @@
 module SystemHelpers
   def recognize_as_heroku
     ENV["DYNO"] = "dyno1"
-    value = recognize_as_container :lxc do
-      yield
-    end
-    ENV.delete "DYNO"
-    value
-  end
-
-  def recognize_as_container(file)
-    org_cgroup_file = Appsignal::System::Container::CGROUP_FILE
-    Appsignal::System::Container.send :remove_const, :CGROUP_FILE
-    Appsignal::System::Container.send :const_set, :CGROUP_FILE,
-      File.join(DirectoryHelper.fixtures_dir, "containers", "cgroups", file.to_s)
-
     value = yield
-
-    Appsignal::System::Container.send :remove_const, :CGROUP_FILE
-    Appsignal::System::Container.send :const_set, :CGROUP_FILE, org_cgroup_file
-
+    ENV.delete "DYNO"
     value
   end
 end

data/spec/support/helpers/time_helpers.rb

@@ -1,6 +1,6 @@
 module TimeHelpers
   def fixed_time
-    @fixed_time ||= Time.utc(2014, 01, 15, 11, 0, 0).to_f
+    @fixed_time ||= Time.utc(2014, 1, 15, 11, 0, 0).to_f
   end
 
   def advance_frozen_time(time, addition)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -123,6 +123,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.46.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official appsignal.com gem
 email:
 - support@appsignal.com
@@ -137,6 +151,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -288,11 +303,9 @@ files:
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/rack/streaming_listener_spec.rb
-- spec/lib/appsignal/system/container_spec.rb
 - spec/lib/appsignal/system_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
-- spec/lib/appsignal/utils/gzip_spec.rb
 - spec/lib/appsignal/utils/params_sanitizer_spec.rb
 - spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
 - spec/lib/appsignal/utils_spec.rb
@@ -342,9 +355,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.10
@@ -408,11 +421,9 @@ test_files:
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
 - spec/lib/appsignal/rack/streaming_listener_spec.rb
-- spec/lib/appsignal/system/container_spec.rb
 - spec/lib/appsignal/system_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
-- spec/lib/appsignal/utils/gzip_spec.rb
 - spec/lib/appsignal/utils/params_sanitizer_spec.rb
 - spec/lib/appsignal/utils/query_params_sanitizer_spec.rb
 - spec/lib/appsignal/utils_spec.rb

data/spec/lib/appsignal/system/container_spec.rb

@@ -1,67 +0,0 @@
-describe Appsignal::System::Container do
-  describe ".id" do
-    subject { described_class.id }
-
-    context "when in docker" do
-      context "when running normally" do
-        around { |example| recognize_as_container(:docker) { example.run } }
-
-        it "returns id" do
-          expect(subject).to eq("0c703b75cdeaad7c933aa68b4678cc5c37a12d5ef5d7cb52c9cefe684d98e575")
-        end
-      end
-
-      context "when running with systemd" do
-        around do |example|
-          # Fabricated example. I'm unable to set up an environment that
-          # produces such a cgroups file.
-          recognize_as_container(:docker_systemd) { example.run }
-        end
-
-        it "returns id" do
-          expect(subject).to eq("09f1c4d420025670a3633edbc9b31450f1d6b2ff87b5912a10c320ad398c7215")
-        end
-      end
-    end
-
-    context "when in LXC" do
-      around { |example| recognize_as_container(:lxc) { example.run } }
-
-      it "returns id" do
-        expect(subject).to eq("1a2e485e-3947-4bb6-8c24-8774f0859648")
-      end
-    end
-
-    context "when not in container" do
-      around { |example| recognize_as_container(:none) { example.run } }
-
-      it "returns nil" do
-        expect(subject).to be_nil
-      end
-    end
-
-    context "when no permission to read cgroup file" do
-      let(:out_stream) { StringIO.new }
-      let(:no_permission_file) do
-        File.join(fixtures_dir, "containers", "cgroups", "no_permission")
-      end
-      before do
-        File.chmod 0333, no_permission_file
-        Appsignal.logger = Logger.new(out_stream)
-      end
-      around { |example| recognize_as_container(:no_permission) { example.run } }
-      after { File.chmod 0644, no_permission_file }
-
-      it "returns nil" do
-        expect(subject).to be_nil
-      end
-
-      it "logs the error" do
-        subject
-        expect(out_stream.string).to include \
-          "Unable to read '#{no_permission_file}' to determine cgroup",
-          "Permission denied"
-      end
-    end
-  end
-end

data/spec/lib/appsignal/utils/gzip_spec.rb

@@ -1,10 +0,0 @@
-describe Appsignal::Utils::Gzip do
-  describe ".compress" do
-    let(:value) { "foo" }
-    subject { described_class.compress(value).force_encoding("UTF-8") }
-
-    it "returns a gziped value" do
-      expect(subject).to eq("x\u0001K\xCB\xCF\a\u0000\u0002\x82\u0001E")
-    end
-  end
-end