elastic apm support

datacite · Nov 23, 2019 · ec7fc34 · ec7fc34
1 parent 6bf7670
commit ec7fc34
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/Gemfile b/Gemfile
@@ -61,12 +61,12 @@ gem 'elasticsearch-model', '~> 7.0', require: 'elasticsearch/model'
 gem 'elasticsearch-rails', '~> 7.0'
 gem 'faraday_middleware-aws-sigv4', '~> 0.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.6'
-gem 'graphql', '~> 1.9', '>= 1.9.4'
-gem 'graphql-errors', '~> 0.3.0'
-gem 'graphql-batch', '~> 0.4.0'
+gem 'graphql', '~> 1.9', '>= 1.9.15'
+gem 'graphql-errors', '~> 0.4.0'
+gem 'graphql-batch', '~> 0.4.1'
 gem 'batch-loader', '~> 1.4', '>= 1.4.1'
 gem 'graphql-cache', '~> 0.6.0', git: "https://github.com/stackshareio/graphql-cache"
-gem 'apollo-federation', '~> 0.4.0'
+gem 'apollo-federation', '~> 0.5.1'
 gem 'google-protobuf', '3.10.0.rc.1'
 
 gem 'sprockets', '~> 3.7', '>= 3.7.2'
@@ -78,6 +78,7 @@ gem 'mini_magick', '~> 4.5', '>= 4.5.1'
 gem 'remotipart', '~> 1.2'
 gem 'rack-jwt'
 gem 'git', '~> 1.5'
+gem 'elastic-apm', '~> 3.2'
 
 group :development do
   gem 'pry-rails', '~> 0.3.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -65,17 +65,17 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.237.0)
-    aws-sdk-core (3.76.0)
+    aws-partitions (1.244.0)
+    aws-sdk-core (3.81.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.228.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.53.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-s3 (1.57.0)
+      aws-sdk-core (~> 3, >= 3.77.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sdk-sqs (1.23.1)
@@ -235,6 +235,9 @@ GEM
       sxp (~> 1.0)
     edtf (3.0.5)
       activesupport (>= 3.0, < 7.0)
+    elastic-apm (3.2.0)
+      concurrent-ruby (~> 1.0)
+      http (>= 3.0)
     elasticsearch (7.1.0)
       elasticsearch-api (= 7.1.0)
       elasticsearch-transport (= 7.1.0)
@@ -274,7 +277,10 @@ GEM
       faraday (>= 0.9)
     fast_jsonapi (1.5)
       activesupport (>= 4.2)
-    ffi (1.11.1)
+    ffi (1.11.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     flipper (0.17.1)
     flipper-active_support_cache_store (0.17.1)
       activesupport (>= 4.2, < 7)
@@ -315,9 +321,17 @@ GEM
       redcarpet (>= 2.2, < 4.0)
       rouge (>= 1.5)
     htmlentities (4.3.4)
+    http (4.2.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httplog (1.3.2)
+    http-form_data (2.1.1)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
+    httplog (1.3.3)
       rack (>= 1.0)
       rainbow (>= 2.0.0)
     i18n (1.7.0)
@@ -441,7 +455,7 @@ GEM
       nokogiri (~> 1.10.4)
     orm_adapter (0.5.0)
     pandoc-ruby (2.0.2)
-    parallel (1.18.0)
+    parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     poltergeist (1.18.1)
@@ -463,8 +477,8 @@ GEM
       docopt (~> 0.5)
       sysrandom
     rack (2.0.7)
-    rack-cors (1.0.5)
-      rack (>= 1.6.0)
+    rack-cors (1.1.0)
+      rack (>= 2.0.0)
     rack-jwt (0.4.0)
       jwt (~> 2.0)
       rack (>= 1.6.0)
@@ -537,7 +551,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rouge (3.12.0)
+    rouge (3.13.0)
     rspec-core (3.9.0)
       rspec-support (~> 3.9.0)
     rspec-expectations (3.9.0)
@@ -562,7 +576,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.0)
+    rubocop-performance (1.5.1)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     ruby_dig (0.0.2)
@@ -575,7 +589,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-raven (2.12.2)
+    sentry-raven (2.12.3)
       faraday (>= 0.7.6, < 1.0)
     shoryuken (4.0.3)
       aws-sdk-core (>= 2)
@@ -676,6 +690,7 @@ DEPENDENCIES
   database_cleaner (~> 1.7)
   devise (~> 4.7)
   dotenv (~> 2.1)
+  elastic-apm (~> 3.2)
   elasticsearch (~> 7.1.0)
   elasticsearch-extensions (~> 0.0.29)
   elasticsearch-model (~> 7.0)

diff --git a/app/graphql/types/base_interface.rb b/app/graphql/types/base_interface.rb
@@ -2,6 +2,7 @@
 
 module BaseInterface
   include GraphQL::Schema::Interface
-
-  field_class GraphQL::Cache::Field
+  include ApolloFederation::Interface
+
+  field_class BaseField
 end