apollo-studio-tracing 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff2d17a9b33169e238f8c70b88916e38fcc16b527903b3392419c2cc73353b5
-  data.tar.gz: 70adab1f671440bd2c697b879471b60e42e9e279ead91b0a62180df6b5c8be2d
+  metadata.gz: 676b93f9a1b7fdae4fa0d954064cdff300812e5f1d1673cbb2c179ad3e8fd777
+  data.tar.gz: f24bfa49269991787e26320e3f5eb089acfaffb994348b55dcb13e83fbb9e5e6
 SHA512:
-  metadata.gz: 25a9934e528dd156ce401103df016ec5592b16a99bb29900dd7b6a9daa0ca9cbbb7549bffcf1aec4aa6d092de73421c8285c3bb8c503b8cec05dc27aa6c5be86
-  data.tar.gz: a36ef4094400263b728d215a88849bd371ab5d06090edbac939fc9a8b3e2120390929a812107d1cd9456c800c10e9835eb7fc5328a2aa3aad039e18719820853
+  metadata.gz: f41489cdf1f1540e50c4dfcfafbaa1cc14d0746761a33aa2775c056804c95a3729430f7776a95509051de8374d27c702bcc106a029b65a897f9c57a492250377
+  data.tar.gz: 2e40c8f8c03aecf4b182eb0b0a9ba4d816656127d0337e5c34d338a02de0ac5aab0039024a251f8b9402b58a560fd697cf861e8d17325a94c484fc76929182ba

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.1](https://github.com/EnjoyTech/apollo-studio-tracing-ruby/compare/v1.0.0...v1.0.1) (2020-11-02)
+
+
+### Bug Fixes
+
+* **tracing:** avoid trapping SIGINT, just use `at_exit` ([de7c85e](https://github.com/EnjoyTech/apollo-studio-tracing-ruby/commit/de7c85e63b455a98474694a972daf001f8b12719))
+
 # [1.0.0](https://github.com/EnjoyTech/apollo-studio-tracing-ruby/compare/v0.1.0...v1.0.0) (2020-10-26)
 
 

data/lib/apollo-studio-tracing.rb

@@ -3,6 +3,7 @@
 require 'apollo-studio-tracing/proto'
 require 'apollo-studio-tracing/node_map'
 require 'apollo-studio-tracing/tracer'
+require 'apollo-studio-tracing/logger'
 
 module ApolloStudioTracing
   extend self
@@ -13,7 +14,7 @@ module ApolloStudioTracing
   attr_accessor :logger
 
   # TODO: Initialize this to Rails.logger in a Railtie
-  self.logger = Logger.new(STDOUT)
+  self.logger = ApolloLogger.new(STDOUT)
 
   def use(schema, **options)
     tracer = ApolloStudioTracing::Tracer.new(**options)
@@ -32,9 +33,7 @@ module ApolloStudioTracing
     tracers.each(&:shutdown_trace_channel)
   end
 
-  trap('SIGINT') do
-    Thread.new { shutdown }
-  end
+  at_exit { shutdown }
 
   private
 

data/lib/apollo-studio-tracing/api.rb

@@ -22,13 +22,13 @@ module ApolloStudioTracing
       if e.is_a?(RetryableUploadAttemptError) && attempt < max_attempts
         retry_delay = min_retry_delay_secs * 2**attempt
         ApolloStudioTracing.logger.warn(
-          "Attempt to send Apollo trace report failed and will be retried in #{retry_delay} " \
+          "Attempt to send trace report failed and will be retried in #{retry_delay} " \
           "secs: #{e.message}",
         )
         sleep(retry_delay)
         retry
       else
-        ApolloStudioTracing.logger.warn("Failed to send Apollo trace report: #{e.message}")
+        ApolloStudioTracing.logger.warn("Failed to send trace report: #{e.message}")
       end
     end
 

data/lib/apollo-studio-tracing/logger.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ApolloStudioTracing
+  class ApolloLogger < Logger
+    def format_message(severity, timestamp, progname, msg)
+      "[#{timestamp}] #{severity} #{progname}: [Apollo Studio Tracing] #{msg}\n"
+    end
+  end
+end

data/lib/apollo-studio-tracing/trace_channel.rb

@@ -104,6 +104,7 @@ module ApolloStudioTracing
     def shutdown
       return unless @uploader_thread
 
+      ApolloStudioTracing.logger.info('Shutting down Apollo trace channel...')
       @shutdown_barrier.shutdown
       @uploader_thread.join
     end
@@ -115,15 +116,15 @@ module ApolloStudioTracing
     end
 
     def run_uploader
-      ApolloStudioTracing.logger.info('Apollo trace uploader starting')
+      ApolloStudioTracing.logger.info('Trace uploader starting')
       drain_queue until @shutdown_barrier.await_shutdown(reporting_interval)
-      puts 'Stopping uploader run loop'
+      ApolloStudioTracing.logger.info('Draining queue before shutdown...')
       drain_queue
     rescue StandardError => e
       ApolloStudioTracing.logger.warn("Exception thrown in uploader process. #{e}")
       raise e
     ensure
-      ApolloStudioTracing.logger.info('Apollo trace uploader exiting')
+      ApolloStudioTracing.logger.info('Trace uploader exiting')
     end
 
     def drain_queue

data/lib/apollo-studio-tracing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApolloStudioTracing
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo-studio-tracing
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luke Saniwck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -220,6 +220,7 @@ files:
 - bin/rspec
 - lib/apollo-studio-tracing.rb
 - lib/apollo-studio-tracing/api.rb
+- lib/apollo-studio-tracing/logger.rb
 - lib/apollo-studio-tracing/node_map.rb
 - lib/apollo-studio-tracing/proto.rb
 - lib/apollo-studio-tracing/proto/apollo.proto