appoptics_apm 4.0.8 → 4.0.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Dockerfile_alpine +5 -4
  3. data/appoptics_apm.gemspec +1 -0
  4. data/docker-compose.yml +22 -22
  5. data/ext/oboe_metal/extconf.rb +5 -2
  6. data/lib/appoptics_apm.rb +0 -8
  7. data/lib/appoptics_apm/util.rb +3 -0
  8. data/lib/appoptics_apm/version.rb +1 -1
  9. metadata +22 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63891419b08dae57346397728f4b264cd0983e19
4
- data.tar.gz: 9cbae772eb1ef1f3fa54329f747eabf35f0733ff
3
+ metadata.gz: a51f0eb046ed02b1a7a348d9fe94bd2032346610
4
+ data.tar.gz: fe218ed8a4c12fa99467c38fe90263e16c25bfc9
5
5
  SHA512:
6
- metadata.gz: 4f72ed697ec06cb2f9baffc87291778a983d055d08a7ac9f8b1d48c56397fe7762ff61864f573c40333791c66ffdcbd39c6b957af5c25ab82a99c4ba6062bbfc
7
- data.tar.gz: cb612f1afdd05c0e80eb82911f770dd38c2d0a3e8e35b655eff3a56563b0a955988e9bef82e4424a3c05ae933622f4054b9717e29d7808b7f53e8acc5dae5138
6
+ metadata.gz: f26600d8d87550401be000a90d062a9eed4bbb317312be5383d04ab92f9fdc612f36da5d9d90d56a94cebaec41fd516b4aa2721a8b86676c1be1a88d89512343
7
+ data.tar.gz: 86fa8448ef415190e497d79be22dd19623d54c9ca5865d3f01d0029e7847618894ca44f57c91eb874917cca0c9b42b84c9572823aff25654be8fc0a5c6923108
data/Dockerfile_alpine CHANGED
@@ -32,10 +32,11 @@ 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 \
35
+ RUN source ~/.profile
36
+ && rbenv install 1.9.3-p551 \
36
37
  && rbenv install 2.3.1 \
37
- && rbenv install 2.4.1 \
38
- # && rbenv install jruby-9.0.5.0
38
+ && rbenv install 2.4.1
39
+ && rbenv install jruby-9.0.5.0
39
40
 
40
41
  # install swig 3.0.8
41
42
  RUN curl -SL http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz \
@@ -49,7 +50,7 @@ RUN apk add --upgrade \
49
50
  redis \
50
51
  memcached \
51
52
  postgresql \
52
- openrc \
53
+ openrc
53
54
  && rc-service postgresql start \
54
55
  && echo "psql --command \"CREATE USER docker WITH SUPERUSER PASSWORD 'docker';\"" >> /tmp/config \
55
56
  && echo "createdb -O docker travis_ci_test" >> /tmp/config \
data/appoptics_apm.gemspec CHANGED
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
29
29
  s.extensions = ['ext/oboe_metal/extconf.rb'] unless defined?(JRUBY_VERSION)
30
30
 
31
31
  s.add_runtime_dependency('json', '>= 0')
32
+ s.add_runtime_dependency('no_proxy_fix', '~> 0.1.2', '>= 0.1.2')
32
33
 
33
34
  # Development dependencies used in gem development & testing
34
35
  s.add_development_dependency('rake', '>= 0.9.0')
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_apm /code/ruby-appoptics_apm/ruby_setup.sh 2.3.6 gemfiles/rails42.gemfile
10
+ # > docker-compose run --service-ports ruby_appoptics /code/ruby-appoptics_apm/ruby_setup.sh 2.3.1 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/ext/oboe_metal/extconf.rb CHANGED
@@ -4,7 +4,9 @@
4
4
  require 'mkmf'
5
5
  require 'rbconfig'
6
6
  require 'open-uri'
7
- require 'digest'
7
+ require 'no_proxy_fix'
8
+
9
+ # require 'digest'
8
10
 
9
11
  ext_dir = File.expand_path(File.dirname(__FILE__))
10
12
 
@@ -18,7 +20,7 @@ ao_include = File.join(ext_dir, 'src')
18
20
 
19
21
  # Download the appropriate liboboe from S3(via rake for testing) or files.appoptics.com (production)
20
22
  version = File.read(File.join(ao_include, 'VERSION')).chomp
21
- if ENV['FROM_S3']
23
+ if ENV['APPOPTICS_FROM_S3'].to_s.downcase == 'true'
22
24
  ao_path = File.join('https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/', version)
23
25
  puts "Fetching c-lib from S3"
24
26
  else
@@ -78,6 +80,7 @@ if success
78
80
 
79
81
  dir_config('oboe', 'src', 'lib')
80
82
 
83
+ # create Makefile
81
84
  if jruby || ENV.key?('APPOPTICS_URL')
82
85
  # Build the noop extension under JRuby and Heroku.
83
86
  # The oboe-heroku gem builds it's own c extension which links to
data/lib/appoptics_apm.rb CHANGED
@@ -46,14 +46,6 @@ 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
-
57
49
  require 'appoptics_apm/loading'
58
50
  require 'appoptics_apm/legacy_method_profiling'
59
51
  require 'appoptics_apm/method_profiling'
data/lib/appoptics_apm/util.rb CHANGED
@@ -105,6 +105,9 @@ module AppOpticsAPM
105
105
  #
106
106
  def static_asset?(path)
107
107
  path =~ Regexp.new(AppOpticsAPM::Config[:dnt_regexp], AppOpticsAPM::Config[:dnt_opts])
108
+ rescue => e
109
+ AppOpticsAPM.logger.warn "[AppOpticsAPM/debug] Could not apply Regex.new to path. #{e.inspect}"
110
+ false
108
111
  end
109
112
 
110
113
  ##
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 = 8
11
+ PATCH = 9
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.8
4
+ version: 4.0.9
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-04-13 00:00:00.000000000 Z
13
+ date: 2018-05-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: json
@@ -26,6 +26,26 @@ dependencies:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
28
  version: '0'
29
+ - !ruby/object:Gem::Dependency
30
+ name: no_proxy_fix
31
+ requirement: !ruby/object:Gem::Requirement
32
+ requirements:
33
+ - - "~>"
34
+ - !ruby/object:Gem::Version
35
+ version: 0.1.2
36
+ - - ">="
37
+ - !ruby/object:Gem::Version
38
+ version: 0.1.2
39
+ type: :runtime
40
+ prerelease: false
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ requirements:
43
+ - - "~>"
44
+ - !ruby/object:Gem::Version
45
+ version: 0.1.2
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: 0.1.2
29
49
  - !ruby/object:Gem::Dependency
30
50
  name: rake
31
51
  requirement: !ruby/object:Gem::Requirement