appsignal 2.8.0-java → 2.8.1.alpha.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e76e94cd777606a91735f1d9cf73f421d65bd6d83f76e832043dba6fde78c39
-  data.tar.gz: d62180d4d2dbb06812e002f6efe475a231f1ee0c53a3164f693a25590c7fdbb8
+  metadata.gz: 4e56562439130f7bc27a6d828e09be1bbbf56452952d2f0e92a49d485409359d
+  data.tar.gz: 5e2cfe223920ba78464062383f628915a54db9a31eaffac36c97c540e0e8b75e
 SHA512:
-  metadata.gz: c84030acf3fcfffb953c2f1cd45c613482371e00cb567b7492a2ec75865c0ef2e947e0c535e8775bd00c2502ef53c50566e27695224bf2c1141df6a690b2fc3c
-  data.tar.gz: 1a29c452c91900b239e189347600265134efa70b73f8999bf883896b94ec4f293f82320fabadd89975cea47409e9a04cc57f10af134b748b68ecbb916752621d
+  metadata.gz: 4331a8dc31c0a84732d92df56b32ce9ec5e1a6abe44142b038168e2bf210bca4a5fdaed6247f88f5f562c974544d9f1f3e12aea28a2a151f05025ae5f99a942b
+  data.tar.gz: 3855c70e310a9b69b5201b5f3bd3ab0762c01fc084cb49fbc0fc509e764793f5e842b5a83232f9697ca9959e4e2024b63e8236a3d385b8d3bb374cb413798522

data/.travis.yml

@@ -15,6 +15,7 @@ rvm:
   - "2.3.8"
   - "2.4.5"
   - "2.5.3"
+  - "2.6.0"
   - "jruby-19mode"
 
 gemfile:
@@ -56,6 +57,10 @@ matrix:
       gemfile: "gemfiles/rails-4.0.gemfile"
     - rvm: "2.5.3"
       gemfile: "gemfiles/rails-4.1.gemfile"
+    - rvm: "2.6.0"
+      gemfile: "gemfiles/rails-4.0.gemfile"
+    - rvm: "2.6.0"
+      gemfile: "gemfiles/rails-4.1.gemfile"
 
   allow_failures:
     - rvm: "2.4.5"
@@ -70,9 +75,12 @@ env:
     - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
 
 before_install:
-  - "gem update --system"
+  - "gem update --system 2.7.8"
   - "gem update bundler"
 before_script:
   - "bundle exec rake extension:install"
+after_failure:
+  - "find . -name ext/install.log -exec cat {} \\;"
+  - "find . -name ext/mkmf.log -exec cat {} \\;"
 
 script: "bundle exec rake test"

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.8.1
+- Fix installation on Ruby 2.6 for libc and musl library builds. PR #453
+
 # 2.8.0
 - Group extension and agent tests in diagnose output. PR #437
 - Add diagnose --[no-]send-report option. PR #438

data/Rakefile

@@ -239,6 +239,7 @@ namespace :extension do
           appsignal-agent \
           appsignal.h \
           appsignal_extension.o \
+          appsignal_extension.so \
           appsignal_extension.bundle \
           install.log \
           libappsignal.* \

data/ext/extconf.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 require File.expand_path("../base.rb", __FILE__)
 
-def install
+def install # rubocop:disable Metrics/CyclomaticComplexity
   logger.info "Installing appsignal agent #{Appsignal::VERSION} for Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
   write_agent_architecture
   return unless check_architecture
@@ -16,18 +16,22 @@ def install
     unarchive(archive)
   end
 
+  is_linux_system = [
+    Appsignal::System::LINUX_TARGET,
+    Appsignal::System::MUSL_TARGET
+  ].include?(PLATFORM)
+
   logger.info "Creating makefile"
   require "mkmf"
+
+  link_libraries if is_linux_system
+
   if !have_library("appsignal", "appsignal_start", "appsignal.h")
     installation_failed "Aborting installation, libappsignal.a or appsignal.h not found"
   elsif !find_executable("appsignal-agent", EXT_PATH)
     installation_failed "Aborting installation, appsignal-agent not found"
   else
-    with_static_link = [
-      Appsignal::System::LINUX_TARGET,
-      Appsignal::System::MUSL_TARGET
-    ].include?(PLATFORM)
-    if with_static_link
+    if is_linux_system
       # Statically link libgcc and libgcc_s libraries.
       # Dependencies of the libappsignal extension library.
       # If the gem is installed on a host with build tools installed, but is
@@ -45,4 +49,34 @@ rescue => ex
   end
 end
 
+# Ruby 2.6 requires us to statically link more libraries we use in our
+# extension library than previous versions. Needed for normal Linux libc
+# and musl builds.
+def link_libraries
+  if RbConfig::CONFIG["THREAD_MODEL"] == "pthread"
+    logger.info "Linking extension against 'pthread' library"
+    # Link gem extension against pthread library
+    have_library "pthread"
+    have_required_function "pthread_create"
+  end
+
+  # Links gem extension against the `dl` library. This is needed when Ruby is
+  # not linked against `dl` itself, so link it on the gem extension.
+  logger.info "Linking extension against 'dl' library"
+  have_library "dl"
+  # Check if functions are available now from the linked library
+  %w[dlopen dlclose dlsym].each do |func|
+    have_required_function func
+  end
+end
+
+def have_required_function(func) # rubocop:disable Naming/PredicateName
+  return if have_func(func)
+
+  installation_failed "Aborting installation, missing function '#{func}'"
+  # Exit with true/0/success because the AppSignal installation should never
+  # break a build
+  exit
+end
+
 install

data/gemfiles/capistrano3.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'capistrano', '~> 3.0'
+gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.8.0".freeze
+  VERSION = "2.8.1.alpha.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1.alpha.1
 platform: java
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -378,12 +378,11 @@ 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.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com