appsignal 2.10.6-java → 2.10.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23c94e39736d7badf2c1e56201711658e73d5147a98fe8e11d1f11a37603820
-  data.tar.gz: 8a3dec4738fc2d40640a1fd7d648ed96ac088a58485a73551f5fd0d553b78a51
+  metadata.gz: 645a4ec88a4246ec1e45109ae9c8f5727f95500472707ab16785e3ccbbc93a34
+  data.tar.gz: 750530a66bf499dd130a52987a7df7428ce55a0bb7d034fceb9603850ff4648d
 SHA512:
-  metadata.gz: 84d216441baee99a4453aee0828ab2bd465b2469d2c9a8638122c05757ac3c8e2ec2cb528a7db9ad7c6dccc48cca8d3360354acb8a2028fc1bb398a8c1d1b912
-  data.tar.gz: 55026560b2a759998585721a333fd812285d747dfee6f27570facde862b36c7d5a60dc501417c3f090e396a867d4a2a71195d58e352c90955dfe916ccc9c8d9d
+  metadata.gz: d1f3152cb80c32dc0ae8485d2352b6a63af135dc14dc12ba9f7089a2ab3f84d39379d77304d02a9d3b87a0f1650692bd585b058fa0ba696f2a31ac75207a386f
+  data.tar.gz: 11ff3543333791541973623f246e015f8f186a8941a0260d5025e1e2201d9ab657ef78ada39ef3a7998f11258f423157743b726d3d4e62c94777977659b4853a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.10.7
+- Revert fix for compatibility with the `http_logger` gem. PR #604.
+  For more information, see issue #603 about our reasoning and discussion.
+
 ## 2.10.6
 - Check if queued payloads are for correct app and not expired
 

data/lib/appsignal/hooks/net_http.rb

@@ -13,20 +13,15 @@ module Appsignal
       end
 
       def install
-        if Appsignal::System.ruby_2_or_up?
-          require "appsignal/integrations/net_http"
-          Net::HTTP.send(:prepend, Appsignal::Integrations::NetHttpIntegration)
-        else
-          Net::HTTP.class_eval do
-            alias request_without_appsignal request
+        Net::HTTP.class_eval do
+          alias request_without_appsignal request
 
-            def request(request, body = nil, &block)
-              Appsignal.instrument(
-                "request.net_http",
-                "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-              ) do
-                request_without_appsignal(request, body, &block)
-              end
+          def request(request, body = nil, &block)
+            Appsignal.instrument(
+              "request.net_http",
+              "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
+            ) do
+              request_without_appsignal(request, body, &block)
             end
           end
         end

data/lib/appsignal/system.rb

@@ -76,14 +76,8 @@ module Appsignal
       ldd_version && ldd_version[0]
     end
 
-    # @api private
     def self.jruby?
       RUBY_PLATFORM == "java"
     end
-
-    # @api private
-    def self.ruby_2_or_up?
-      versionify(RUBY_VERSION) >= versionify("2.0")
-    end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.10.6".freeze
+  VERSION = "2.10.7".freeze
 end

data/spec/lib/appsignal/system_spec.rb

@@ -93,40 +93,4 @@ describe Appsignal::System do
       end
     end
   end
-
-  describe ".ruby_2_or_up?" do
-    around do |example|
-      original_ruby_version = RUBY_VERSION
-      Object.send(:remove_const, "RUBY_VERSION")
-      Object.const_set("RUBY_VERSION", ruby_version)
-      example.run
-      Object.send(:remove_const, "RUBY_VERSION")
-      Object.const_set("RUBY_VERSION", original_ruby_version)
-    end
-    subject { described_class.ruby_2_or_up? }
-
-    context "when on Ruby 1.9" do
-      let(:ruby_version) { "1.9.3-p533" }
-
-      it "returns false" do
-        is_expected.to be(false)
-      end
-    end
-
-    context "when on Ruby 2.0" do
-      let(:ruby_version) { "2.0.0" }
-
-      it "returns true" do
-        is_expected.to be(true)
-      end
-    end
-
-    context "when on Ruby 2.x" do
-      let(:ruby_version) { "2.1.0" }
-
-      it "returns true" do
-        is_expected.to be(true)
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.10.7
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -241,7 +241,6 @@ files:
 - lib/appsignal/integrations/delayed_job_plugin.rb
 - lib/appsignal/integrations/grape.rb
 - lib/appsignal/integrations/mongo_ruby_driver.rb
-- lib/appsignal/integrations/net_http.rb
 - lib/appsignal/integrations/object.rb
 - lib/appsignal/integrations/padrino.rb
 - lib/appsignal/integrations/que.rb

data/lib/appsignal/integrations/net_http.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  module Integrations
-    module NetHttpIntegration
-      def request(request, body = nil, &block)
-        Appsignal.instrument(
-          "request.net_http",
-          "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-        ) do
-          super
-        end
-      end
-    end
-  end
-end