appoptics_apm 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10400db84a2a1a68fb58d21e3242c39377cc334d18cbd8ed5df1f47f5708787b
-  data.tar.gz: 0ca5bfa1737e1dc75e63d8b3f97af692a305620554428ac379eada53c802842b
+  metadata.gz: 26c9d31f4b5d680bd14d2cc041c337ea687f87e85c909fb6133d92e3f8292105
+  data.tar.gz: 1694af39aa2e9c8105a7d1b4fa590af16a5a86ae2b41bc9998531f2b16d192af
 SHA512:
-  metadata.gz: c59d11940602ab5e3d36b6b0809c4247ac7217ea335904b4b18bff5cd7b601e650d3f696d4e4146fe919b0f4a5f725a199711d50fd4b25a8ca14478a4d88df00
-  data.tar.gz: 6dfaea0bfe049cccaefbd174433d22918d0516c9e6ddb7c6b2503cbb11cea86848cf9b8efb26546ebf738df3c6daf8f3e8dbacbf5d691116ecd1e736e91dd5cd
+  metadata.gz: 3257648c80a8da542d0e3f99a49c53b4ea6f3c2dd3ef37d6e6ebc1384f53054b3883b41f6ae43880f310a5ff4b49c37eaa67450a2d9818946e248180c6834222
+  data.tar.gz: ba4d2a1e71ab6805d73a038bbd1c6593889249e5ebdac1005cbb9df6befad04ef728bcfc67780db2352a10a43c694e991314530452dca57d17297f75c30c3d69

data/.gitignore

@@ -32,3 +32,4 @@ scrap*
 *.code-workspace
 .irb_history
 .bundle/
+/builds/

data/.travis.yml

@@ -8,13 +8,12 @@ cache:
 env:
   - DBTYPE=postgresql
   - DBTYPE=mysql2
-  - DBTYPE=mysql
 
 rvm:
+  - 2.7.0
   - 2.6.4
   - 2.5.5
   - 2.4.5
-  - 2.7.0
   - ruby-head
 #  - jruby-9.0.5.0
 
@@ -34,42 +33,14 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.7.0-preview2
+    - rvm: 2.7.0
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.6.4
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/rails60.gemfile
-
-    - rvm: ruby-head
-      env: DBTYPE=mysql
-    - rvm: 2.7.0-preview2
-      env: DBTYPE=mysql
-    - rvm: 2.6.4
-      env: DBTYPE=mysql
-    - rvm: 2.5.5
-      env: DBTYPE=mysql
-    - rvm: 2.4.5
-      env: DBTYPE=mysql
-
-    - gemfile: gemfiles/unit.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/noop.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/libraries.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/instrumentation_mocked.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/instrumentation_mocked_oldgems.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/frameworks.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/rails52.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/rails60.gemfile
-      env: DBTYPE=mysql
-    - gemfile: gemfiles/delayed_job.gemfile
-      env: DBTYPE=mysql
+    - rvm: 2.4.5  # excluding because of new sprockets version (4.0.0)
+      gemfile: gemfiles/rails52.gemfile
 
     - gemfile: gemfiles/unit.gemfile
       env: DBTYPE=mysql2
@@ -87,9 +58,9 @@ matrix:
       env: DBTYPE=mysql2
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.7.0
 
-# FIXME: Figure out if this is still an issue when reviewing cassandra test setup
+# FIXME: No cassandra tests for now
+# ____   Figure out if this is still an issue when reviving cassandra
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 
@@ -104,9 +75,17 @@ matrix:
 #  - sudo service cassandra start
 
 install:
-  - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz
-  - tar xzf swig-3.0.12.tar.gz
-  - pushd swig-3.0.12
+#  - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz
+#  - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-4.0.1/swig-4.0.1.tar.gz
+#  - tar xzf swig-4.0.1.tar.gz
+#  - pushd swig-4.0.1
+#  - ./configure && make && sudo make install
+#  - popd
+
+# use swig from git, it is the only one that works with Ruby 2.7 for now
+  - git clone https://github.com/swig/swig.git
+  - pushd swig
+  - ./autogen.sh
   - ./configure && make && sudo make install
   - popd
 
@@ -119,8 +98,9 @@ before_script:
   - export APPOPTICS_TOKEN_BUCKET_RATE=1000
   - export APPOPTICS_FROM_S3=true
 
-  - bundle update --jobs=3 --retry=3
-  - bundle exec rake clean fetch compile
+#  - bundle update --jobs=3 --retry=3
+  - ./.travis/bundle.sh
+  - bundle exec rake distclean fetch compile
   - psql -c 'create database travis_ci_test;' -U postgres
   - mysql -e 'create database travis_ci_test;'
   - redis-server --requirepass secret_pass &

data/.travis/bundle.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ $BUNDLE_GEMFILE == *"gemfiles/frameworks.gemfile"* ]]
+then
+  gem install bundler -v 1.17.3
+  bundle _1.17.3_ update --jobs=3 --retry=3
+else
+  bundle update --jobs=3 --retry=3
+fi

data/ext/oboe_metal/extconf.rb

@@ -48,6 +48,8 @@ success = false
 while retries > 0
   begin
     # download
+    # TODO warning: calling URI.open via Kernel#open is deprecated, call URI.open directly or use URI#open
+    # ____ figure out if URI.open is supported in older rubies
     download = open(ao_item, 'rb')
     IO.copy_stream(download, clib)
 

data/ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-7.1.0
+7.1.1

data/lib/appoptics_apm/inst/graphql.rb

@@ -13,23 +13,23 @@
 # ____  what is in the graphql gem and vice-versa
 
 
-if defined?(GraphQL::Tracing)
+if defined?(GraphQL::Tracing) && !(AppOpticsAPM::Config[:graphql][:enabled] == false)
   module GraphQL
     module Tracing
       # AppOpticsTracing in the graphql gem may be a different version than the
       # one defined here, we want to use the newer one
-      dont_redefine = false
+      redefine = true
       this_version = Gem::Version.new('1.0.0')
 
       if defined?(GraphQL::Tracing::AppOpticsTracing)
         if this_version > GraphQL::Tracing::AppOpticsTracing.version
           send(:remove_const, :AppOpticsTracing)
         else
-          dont_redefine = true
+          redefine = false
         end
       end
 
-      unless dont_redefine
+      if redefine
         #-----------------------------------------------------------------------------#
         #----- this class is duplicated in the graphql gem ---------------------------#
         #-----------------------------------------------------------------------------#
@@ -84,7 +84,7 @@ if defined?(GraphQL::Tracing)
 
           def transaction_name(query)
             return if gql_config[:transaction_name] == false ||
-                      ::AppOpticsAPM::SDK.get_transaction_name
+              ::AppOpticsAPM::SDK.get_transaction_name
 
             split_query = query.strip.split(/\W+/, 3)
             split_query[0] = 'query' if split_query[0].empty?
@@ -95,7 +95,7 @@ if defined?(GraphQL::Tracing)
 
           def multiplex_transaction_name(names)
             return if gql_config[:transaction_name] == false ||
-                      ::AppOpticsAPM::SDK.get_transaction_name
+              ::AppOpticsAPM::SDK.get_transaction_name
 
             name = "graphql.multiplex.#{names.join('.')}"
             name = "#{name[0..251]}..." if name.length > 254
@@ -167,8 +167,8 @@ if defined?(GraphQL::Tracing)
 
             # remove arguments
             query.gsub(/"[^"]*"/, '"?"')                 # strings
-                 .gsub(/-?[0-9]*\.?[0-9]+e?[0-9]*/, '?') # ints + floats
-                 .gsub(/\[[^\]]*\]/, '[?]')              # arrays
+              .gsub(/-?[0-9]*\.?[0-9]+e?[0-9]*/, '?') # ints + floats
+              .gsub(/\[[^\]]*\]/, '[?]')              # arrays
           end
 
           def remove_comments(query)
@@ -184,10 +184,16 @@ if defined?(GraphQL::Tracing)
 
   module AppOpticsAPM
     module GraphQLSchemaPrepend
-      def use(plugin, options = {})
-        super unless GraphQL::Schema.plugins.find { |pl| pl[0].to_s == plugin.to_s }
+      def use(plugin, **options)
+        # super unless GraphQL::Schema.plugins.find { |pl| pl[0].to_s == plugin.to_s }
+        super unless self.plugins.find { |pl| pl[0].to_s == plugin.to_s }
 
-        GraphQL::Schema.plugins
+        self.plugins
+      end
+
+      def inherited(subclass)
+        subclass.use(GraphQL::Tracing::AppOpticsTracing)
+        super
       end
     end
 
@@ -200,16 +206,35 @@ if defined?(GraphQL::Tracing)
       end
     end
     # rubocop:enable Style/RedundantSelf
-  end
 
-  if defined?(GraphQL::Schema)
-    GraphQL::Schema.singleton_class.prepend(AppOpticsAPM::GraphQLSchemaPrepend)
-    GraphQL::Schema.use(GraphQL::Tracing::AppOpticsTracing)
+    # a different way of autoinstrumenting for graphql 1.7.4 - < 1.8.0
+    module GraphQLSchemaPrepend17
+      def initialize
+        super
+        unless tracers.find { |tr| tr.is_a? GraphQL::Tracing::AppOpticsTracing }
+          tracer = GraphQL::Tracing::AppOpticsTracing.new
+          tracers.push(tracer)
+          instrumenters[:field] << tracer
+        end
+      end
+    end
   end
 
-  # rubocop:disable Style/IfUnlessModifier
-  if defined?(GraphQL::Error)
-    GraphQL::Error.prepend(AppOpticsAPM::GraphQLErrorPrepend)
+  if Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version >= Gem::Version.new('1.8.0')
+    AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting GraphQL' if AppOpticsAPM::Config[:verbose]
+    if defined?(GraphQL::Schema)
+      GraphQL::Schema.singleton_class.prepend(AppOpticsAPM::GraphQLSchemaPrepend)
+    end
+
+    # rubocop:disable Style/IfUnlessModifier
+    if defined?(GraphQL::Error)
+      GraphQL::Error.prepend(AppOpticsAPM::GraphQLErrorPrepend)
+    end
+    # rubocop:enable Style/IfUnlessModifier
+  elsif Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version >= Gem::Version.new('1.7.4')
+    AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting GraphQL' if AppOpticsAPM::Config[:verbose]
+    if defined?(GraphQL::Schema)
+      GraphQL::Schema.prepend(AppOpticsAPM::GraphQLSchemaPrepend17)
+    end
   end
-  # rubocop:enable Style/IfUnlessModifier
 end

data/lib/appoptics_apm/inst/grpc_client.rb

@@ -156,4 +156,4 @@ if defined?(GRPC) && AppOpticsAPM::Config[:grpc_client][:enabled]
 
     end
   end
-end
+end

data/lib/appoptics_apm/support/transaction_metrics.rb

@@ -64,4 +64,4 @@ module AppOpticsAPM
 
     end
   end
-end
+end

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4 # breaking,
     MINOR = 11 # feature,
-    PATCH = 0 # fix => BFF
+    PATCH = 1 # fix => BFF
 
     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.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -133,7 +133,7 @@ dependencies:
 description: 'Automatic tracing and metrics for Ruby applications. Get started at
   appoptics.com. @AppOptics
 
-  '
+'
 email: support@appoptics.com
 executables:
 - appoptics_apm_config
@@ -147,6 +147,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- ".travis/bundle.sh"
 - ".yardopts"
 - CHANGELOG.md
 - CONFIG.md