appoptics_apm 4.0.7 → 4.0.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Dockerfile_alpine +4 -5
  3. data/Rakefile +1 -1
  4. data/docker-compose.yml +22 -22
  5. data/lib/appoptics_apm.rb +8 -0
  6. data/lib/appoptics_apm/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 075662979a96c233661f6043362df2bf8febad26
4
- data.tar.gz: 8dd4bd8daed4d2148311d4d375f88a7968a19b22
3
+ metadata.gz: 63891419b08dae57346397728f4b264cd0983e19
4
+ data.tar.gz: 9cbae772eb1ef1f3fa54329f747eabf35f0733ff
5
5
  SHA512:
6
- metadata.gz: e74260bd8fceb642c221e69b82e81fdb5741c979de47f55d60c4a87b514ef6e78d53752a94917606d57e34543a1ff37890da7fb172906fcd4ce6721519fc32cd
7
- data.tar.gz: 6666c8f48a79bcd2be93a0163b76eb8815569251d83684ccef38f2b0fae4f6e4c4299b45f144577577edb3982735120472e4423a4aecb9e7f8a6dc9546ffe663
6
+ metadata.gz: 4f72ed697ec06cb2f9baffc87291778a983d055d08a7ac9f8b1d48c56397fe7762ff61864f573c40333791c66ffdcbd39c6b957af5c25ab82a99c4ba6062bbfc
7
+ data.tar.gz: cb612f1afdd05c0e80eb82911f770dd38c2d0a3e8e35b655eff3a56563b0a955988e9bef82e4424a3c05ae933622f4054b9717e29d7808b7f53e8acc5dae5138
data/Dockerfile_alpine CHANGED
@@ -32,11 +32,10 @@ RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
32
32
  && echo 'bundler' > ~/.rbenv/default-gems
33
33
 
34
34
  # install rubies to build our gem against
35
- RUN source ~/.profile
36
- && rbenv install 1.9.3-p551 \
35
+ RUN source ~/.profile \
37
36
  && rbenv install 2.3.1 \
38
- && rbenv install 2.4.1
39
- && rbenv install jruby-9.0.5.0
37
+ && rbenv install 2.4.1 \
38
+ # && rbenv install jruby-9.0.5.0
40
39
 
41
40
  # install swig 3.0.8
42
41
  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 \
50
49
  redis \
51
50
  memcached \
52
51
  postgresql \
53
- openrc
52
+ openrc \
54
53
  && rc-service postgresql start \
55
54
  && echo "psql --command \"CREATE USER docker WITH SUPERUSER PASSWORD 'docker';\"" >> /tmp/config \
56
55
  && echo "createdb -O docker travis_ci_test" >> /tmp/config \
data/Rakefile CHANGED
@@ -73,7 +73,7 @@ task :fetch_ext_deps do
73
73
  end
74
74
 
75
75
  # The c-lib version is different from the gem version
76
- oboe_version = ENV['OBOE_VERSION'] || 'latest'
76
+ oboe_version = ENV['OBOE_VERSION'] || '2.0.9'
77
77
  oboe_src_dir = "https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/#{oboe_version}"
78
78
  ext_src_dir = File.expand_path('ext/oboe_metal/src')
79
79
 
data/docker-compose.yml CHANGED
@@ -7,7 +7,7 @@ version: "2"
7
7
  # ('ruby_appoptics' and 'wait' will exit)
8
8
  #
9
9
  # to run some ruby tests:
10
- # > docker-compose run --service-ports ruby_appoptics /code/ruby-appoptics_apm/ruby_setup.sh 2.3.1 gemfiles/rails42.gemfile
10
+ # > docker-compose run --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh 2.3.6 gemfiles/rails42.gemfile
11
11
  #
12
12
  ########################################################################################################
13
13
 
@@ -34,27 +34,27 @@ services:
34
34
  - MYSQL_HOST=mysql
35
35
  - APPOPTICS_MONGO_SERVER=mongo
36
36
 
37
- ruby_appoptics_apm_alpine:
38
- container_name: ruby_appoptics_apm_alpine
39
- image: ruby_alpine
40
- build:
41
- context: .
42
- dockerfile: ./Dockerfile_alpine
43
- cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
44
- mem_limit: 1G
45
- volumes:
46
- - .:/code/ruby-appoptics_apm
47
- depends_on:
48
- - wait
49
- links:
50
- - wait
51
- environment:
52
- - APPOPTICS_RABBITMQ_SERVER=rabbitmq
53
- - DOCKER_MYSQL_PASS=admin
54
- - MYSQL_ALLOW_EMPTY_PASSWORD=yes
55
- - MYSQL_ROOT_PASSWORD=admin
56
- - MYSQL_HOST=mysql
57
- - APPOPTICS_MONGO_SERVER=mongo
37
+ # ruby_appoptics_apm_alpine:
38
+ # container_name: ruby_appoptics_apm_alpine
39
+ # image: ruby_alpine
40
+ # build:
41
+ # context: .
42
+ # dockerfile: ./Dockerfile_alpine
43
+ # cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
44
+ # mem_limit: 1G
45
+ # volumes:
46
+ # - .:/code/ruby-appoptics_apm
47
+ # depends_on:
48
+ # - wait
49
+ # links:
50
+ # - wait
51
+ # environment:
52
+ # - APPOPTICS_RABBITMQ_SERVER=rabbitmq
53
+ # - DOCKER_MYSQL_PASS=admin
54
+ # - MYSQL_ALLOW_EMPTY_PASSWORD=yes
55
+ # - MYSQL_ROOT_PASSWORD=admin
56
+ # - MYSQL_HOST=mysql
57
+ # - APPOPTICS_MONGO_SERVER=mongo
58
58
 
59
59
  rabbitmq:
60
60
  container_name: rabbitmq
data/lib/appoptics_apm.rb CHANGED
@@ -46,6 +46,14 @@ begin
46
46
  end
47
47
 
48
48
  require 'appoptics_apm/config'
49
+
50
+ config_file = File.join(Dir.pwd, 'appoptics_apm_config.rb')
51
+ if File.exist?(config_file)
52
+ load(config_file)
53
+ elsif ENV.key?('APPOPTICS_RUBY_CONFIG')
54
+ load(ENV['APPOPTICS_RUBY_CONFIG'])
55
+ end
56
+
49
57
  require 'appoptics_apm/loading'
50
58
  require 'appoptics_apm/legacy_method_profiling'
51
59
  require 'appoptics_apm/method_profiling'
data/lib/appoptics_apm/version.rb CHANGED
@@ -8,7 +8,7 @@ module AppOpticsAPM
8
8
  module Version
9
9
  MAJOR = 4
10
10
  MINOR = 0
11
- PATCH = 7
11
+ PATCH = 8
12
12
 
13
13
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
14
14
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appoptics_apm
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.7
4
+ version: 4.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Maia Engeli
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2018-03-28 00:00:00.000000000 Z
13
+ date: 2018-04-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: json