appoptics_apm 4.0.7 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 075662979a96c233661f6043362df2bf8febad26
-  data.tar.gz: 8dd4bd8daed4d2148311d4d375f88a7968a19b22
+  metadata.gz: 63891419b08dae57346397728f4b264cd0983e19
+  data.tar.gz: 9cbae772eb1ef1f3fa54329f747eabf35f0733ff
 SHA512:
-  metadata.gz: e74260bd8fceb642c221e69b82e81fdb5741c979de47f55d60c4a87b514ef6e78d53752a94917606d57e34543a1ff37890da7fb172906fcd4ce6721519fc32cd
-  data.tar.gz: 6666c8f48a79bcd2be93a0163b76eb8815569251d83684ccef38f2b0fae4f6e4c4299b45f144577577edb3982735120472e4423a4aecb9e7f8a6dc9546ffe663
+  metadata.gz: 4f72ed697ec06cb2f9baffc87291778a983d055d08a7ac9f8b1d48c56397fe7762ff61864f573c40333791c66ffdcbd39c6b957af5c25ab82a99c4ba6062bbfc
+  data.tar.gz: cb612f1afdd05c0e80eb82911f770dd38c2d0a3e8e35b655eff3a56563b0a955988e9bef82e4424a3c05ae933622f4054b9717e29d7808b7f53e8acc5dae5138

data/Dockerfile_alpine

@@ -32,11 +32,10 @@ RUN  git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
    && echo 'bundler' > ~/.rbenv/default-gems
 
 # install rubies to build our gem against
-RUN source  ~/.profile
-   && rbenv install 1.9.3-p551 \
+RUN source  ~/.profile \
    && rbenv install 2.3.1 \
-   && rbenv install 2.4.1
-   && rbenv install jruby-9.0.5.0
+   && rbenv install 2.4.1 \
+   # && rbenv install jruby-9.0.5.0
 
 # install swig 3.0.8
 RUN curl -SL http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz \
@@ -50,7 +49,7 @@ RUN apk add --upgrade \
       redis \
       memcached \
       postgresql \
-      openrc
+      openrc \
    && rc-service postgresql start \
    && echo "psql --command \"CREATE USER docker WITH SUPERUSER PASSWORD 'docker';\"" >> /tmp/config \
    && echo "createdb -O docker travis_ci_test" >> /tmp/config \

data/Rakefile

@@ -73,7 +73,7 @@ task :fetch_ext_deps do
   end
 
   # The c-lib version is different from the gem version
-  oboe_version = ENV['OBOE_VERSION'] || 'latest'
+  oboe_version = ENV['OBOE_VERSION'] || '2.0.9'
   oboe_src_dir = "https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/#{oboe_version}"
   ext_src_dir = File.expand_path('ext/oboe_metal/src')
 

data/docker-compose.yml

@@ -7,7 +7,7 @@ version: "2"
 # ('ruby_appoptics' and 'wait' will exit)
 #
 # to run some ruby tests:
-# > docker-compose run --service-ports ruby_appoptics /code/ruby-appoptics_apm/ruby_setup.sh 2.3.1 gemfiles/rails42.gemfile
+# > docker-compose run --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh 2.3.6 gemfiles/rails42.gemfile
 #
 ########################################################################################################
 
@@ -34,27 +34,27 @@ services:
        - MYSQL_HOST=mysql
        - APPOPTICS_MONGO_SERVER=mongo
 
-  ruby_appoptics_apm_alpine:
-     container_name: ruby_appoptics_apm_alpine
-     image: ruby_alpine
-     build:
-        context: .
-        dockerfile: ./Dockerfile_alpine
-     cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
-     mem_limit: 1G
-     volumes:
-       - .:/code/ruby-appoptics_apm
-     depends_on:
-       - wait
-     links:
-       - wait
-     environment:
-       - APPOPTICS_RABBITMQ_SERVER=rabbitmq
-       - DOCKER_MYSQL_PASS=admin
-       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-       - MYSQL_ROOT_PASSWORD=admin
-       - MYSQL_HOST=mysql
-       - APPOPTICS_MONGO_SERVER=mongo
+#  ruby_appoptics_apm_alpine:
+#     container_name: ruby_appoptics_apm_alpine
+#     image: ruby_alpine
+#     build:
+#        context: .
+#        dockerfile: ./Dockerfile_alpine
+#     cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
+#     mem_limit: 1G
+#     volumes:
+#       - .:/code/ruby-appoptics_apm
+#     depends_on:
+#       - wait
+#     links:
+#       - wait
+#     environment:
+#       - APPOPTICS_RABBITMQ_SERVER=rabbitmq
+#       - DOCKER_MYSQL_PASS=admin
+#       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+#       - MYSQL_ROOT_PASSWORD=admin
+#       - MYSQL_HOST=mysql
+#       - APPOPTICS_MONGO_SERVER=mongo
 
   rabbitmq:
     container_name: rabbitmq

data/lib/appoptics_apm.rb

@@ -46,6 +46,14 @@ begin
   end
 
   require 'appoptics_apm/config'
+
+  config_file = File.join(Dir.pwd, 'appoptics_apm_config.rb')
+  if File.exist?(config_file)
+    load(config_file)
+  elsif ENV.key?('APPOPTICS_RUBY_CONFIG')
+    load(ENV['APPOPTICS_RUBY_CONFIG'])
+  end
+
   require 'appoptics_apm/loading'
   require 'appoptics_apm/legacy_method_profiling'
   require 'appoptics_apm/method_profiling'

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 7
+    PATCH = 8
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json