newrelic-infinite_tracing 8.13.1 → 8.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1c8e822a9bca51eccf2b2c93a12d3cedabedea0f1269e9c423663cffd9eb0e
-  data.tar.gz: ea3a78f73f1ab78be3c68c8c6b433c851fd502ba95cf3d193be8a4b3634be475
+  metadata.gz: ef58ccd55c212b9f5de2fb32b7574ecbdfdb8d82794fccf628de4c76ae17cb5f
+  data.tar.gz: '0868bd0fc973b1a0562701b966a29e62636ed9558fe8710f0148be6239bd5433'
 SHA512:
-  metadata.gz: 7f0162e668193e3da17d6d5aeeb05e1dd0beed258d049a2e02bcb20fece10b30521aec64401122ff2c51bed37f6c15b90ee0f3ff286c5d26ec3449b159316cbe
-  data.tar.gz: 4b716c1bffd149167b29a5c00ef4881ae50e406392f0b302f59375bf0d144bd82a85ba58f8a67cc312706e09078aab726f8064abdb2c437819e60904f7e48511
+  metadata.gz: 2f5570f978e5a18bb7e7f6f9c9a06676ed4d3edc2fb874fbcfde6a19a8778806023af125a850e053479b6a2245a2d6d7da3a5718ba4a14a9eaa1a804954a158e
+  data.tar.gz: 6aead156960e0785cda78807c50e74dbf802b02a5e96e4b0073ad6593347dedfc3a53934d4345682a2de7f41bf5840c37f8b1a3300ac0df76cc6cb1a762541e9

data/lib/infinite_tracing/channel.rb

@@ -5,8 +5,8 @@
 module NewRelic::Agent
   module InfiniteTracing
     class Channel
-      COMPRESSION_LEVELS = %i[none low medium high].freeze
-      DEFAULT_COMPRESSION_LEVEL = :none
+      SETTINGS_BASE = {'grpc.enable_deadline_checking' => 0}.freeze
+      SETTINGS_COMPRESSION_DISABLED = SETTINGS_BASE.merge({'grpc.minimal_stack' => 1}).freeze
 
       def stub
         NewRelic::Agent.logger.debug("Infinite Tracer Opening Channel to #{host_and_port}")
@@ -19,64 +19,29 @@ module NewRelic::Agent
         )
       end
 
-      def channel
-        GRPC::Core::Channel.new(host_and_port, settings, credentials)
-      end
-
-      def channel_args
-        return NewRelic::EMPTY_HASH unless compression_enabled?
-
-        GRPC::Core::CompressionOptions.new(compression_options).to_channel_arg_hash
-      end
-
-      def compression_enabled?
-        compression_level != :none
-      end
-
-      def compression_level
-        @compression_level ||= begin
-          level = if valid_compression_level?(configured_compression_level)
-            configured_compression_level
-          else
-            DEFAULT_COMPRESSION_LEVEL
-          end
-          NewRelic::Agent.logger.debug("Infinite Tracer compression level set to #{level}")
-          level
-        end
-      end
-
-      def compression_options
-        {default_algorithm: :gzip,
-         default_level: compression_level}
-      end
-
-      def configured_compression_level
-        NewRelic::Agent.config[:'infinite_tracing.compression_level']
+      def host_and_port
+        Config.trace_observer_host_and_port
       end
 
       def credentials
-        # Uses system configured certificates by default
-        GRPC::Core::ChannelCredentials.new
+        @credentials ||= GRPC::Core::ChannelCredentials.new
       end
 
-      def host_and_port
-        Config.trace_observer_host_and_port
+      def channel
+        GRPC::Core::Channel.new(host_and_port, settings, credentials)
       end
 
       def settings
-        {
-          'grpc.minimal_stack' => 1,
-          'grpc.enable_deadline_checking' => 0
-        }
-      end
+        return channel_args.merge(SETTINGS_COMPRESSION_DISABLED).freeze unless Config.compression_enabled?
 
-      def valid_compression_level?(level)
-        return true if COMPRESSION_LEVELS.include?(level)
+        channel_args.merge(SETTINGS_BASE).freeze
+      end
 
-        NewRelic::Agent.logger.error("Invalid compression level '#{level}' specified! Must be one of " \
-          "#{COMPRESSION_LEVELS.join('|')}. Using default level of '#{DEFAULT_COMPRESSION_LEVEL}'")
+      def channel_args
+        return NewRelic::EMPTY_HASH unless Config.compression_enabled?
 
-        false
+        GRPC::Core::CompressionOptions.new(default_algorithm: :gzip,
+          default_level: Config.compression_level).to_channel_arg_hash
       end
     end
   end

data/lib/infinite_tracing/config.rb

@@ -7,6 +7,9 @@ module NewRelic::Agent
     module Config
       extend self
 
+      COMPRESSION_LEVEL_DISABLED = :none
+      COMPRESSION_LEVEL_DEFAULT = :high
+      COMPRESSION_LEVEL_LIST = %i[none low medium high].freeze
       TRACE_OBSERVER_NOT_CONFIGURED_ERROR = "Trace Observer host not configured!"
 
       # We only want to load the infinite tracing gem's files when
@@ -109,6 +112,29 @@ module NewRelic::Agent
       def trace_observer_configured?
         trace_observer_host != NewRelic::EMPTY_STR
       end
+
+      def compression_enabled?
+        compression_level != COMPRESSION_LEVEL_DISABLED
+      end
+
+      def compression_level
+        @compression_level ||= begin
+          level = if COMPRESSION_LEVEL_LIST.include?(configured_compression_level)
+            configured_compression_level
+          else
+            NewRelic::Agent.logger.error("Invalid compression level '#{configured_compression_level}' specified! " \
+                                         "Must be one of #{COMPRESSION_LEVEL_LIST.join('|')}. Using default level " \
+                                         "of '#{COMPRESSION_LEVEL_DEFAULT}'")
+            COMPRESSION_LEVEL_DEFAULT
+          end
+          NewRelic::Agent.logger.debug("Infinite Tracer compression level set to #{level}")
+          level
+        end
+      end
+
+      def configured_compression_level
+        NewRelic::Agent.config[:'infinite_tracing.compression_level']
+      end
     end
   end
 end

data/lib/infinite_tracing/connection.rb

@@ -17,6 +17,12 @@
 module NewRelic::Agent
   module InfiniteTracing
     class Connection
+      GZIP_METADATA = {'grpc-internal-encoding-request' => 'gzip',
+                       'grpc-encoding' => 'gzip',
+                       'grpc-accept-encoding' => ['gzip'],
+                       'content-coding' => 'gzip',
+                       'content-encoding' => 'gzip'}.freeze
+
       # listens for server side configurations added to the agent.  When a new config is
       # added, we have a new agent run token and need to restart the client's RPC stream
       # with the new metadata information.
@@ -100,9 +106,18 @@ module NewRelic::Agent
             "agent_run_token" => agent_id
           }
           @metadata.merge!(request_headers_map)
+          merge_gzip_metadata
         end
       end
 
+      # If (gzip based) compression is enabled, explicitly provide all
+      # relevant metadata
+      def merge_gzip_metadata
+        return @metadata unless Config.compression_enabled?
+
+        @metadata.merge!(GZIP_METADATA)
+      end
+
       # Initializes rpc so we can get a Channel and Stub (connect to gRPC server)
       # Initializes metadata so we use newest values in establishing channel
       # Sets the agent_connected flag and signals the agent started so any

data/lib/newrelic/infinite_tracing.rb

@@ -2,6 +2,40 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-unless defined? NewRelic::Agent::InfiniteTracing
-  require_relative '../infinite_tracing'
+# Entry point for New Relic Infinite Tracing.
+
+require 'uri'
+
+require 'newrelic_rpm'
+
+NewRelic::Agent.logger.debug("Detected New Relic Infinite Tracing Gem")
+
+require 'infinite_tracing/version'
+require 'infinite_tracing/config'
+
+DependencyDetection.defer do
+  named :infinite_tracing
+
+  depends_on do
+    NewRelic::Agent::InfiniteTracing::Config.should_load?
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug("Loading New Relic Infinite Tracing Library")
+
+    require 'infinite_tracing/proto'
+
+    require 'infinite_tracing/constants'
+    require 'infinite_tracing/worker'
+    require 'infinite_tracing/record_status_handler'
+
+    require 'infinite_tracing/transformer'
+    require 'infinite_tracing/streaming_buffer'
+    require 'infinite_tracing/suspended_streaming_buffer'
+    require 'infinite_tracing/channel'
+    require 'infinite_tracing/connection'
+    require 'infinite_tracing/client'
+
+    require 'infinite_tracing/agent_integrations'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 8.13.1
+  version: 8.15.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.13.1
+        version: 8.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.13.1
+        version: 8.15.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,6 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
-- lib/infinite_tracing.rb
 - lib/infinite_tracing/agent_integrations.rb
 - lib/infinite_tracing/agent_integrations/agent.rb
 - lib/infinite_tracing/agent_integrations/datastore_segment.rb
@@ -268,7 +267,6 @@ files:
 - lib/infinite_tracing/transformer.rb
 - lib/infinite_tracing/version.rb
 - lib/infinite_tracing/worker.rb
-- lib/new_relic/infinite_tracing.rb
 - lib/newrelic/infinite_tracing.rb
 - lib/proto/infinite_tracing.proto
 - newrelic-infinite_tracing.gemspec

data/lib/infinite_tracing.rb

@@ -1,39 +0,0 @@
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
-# frozen_string_literal: true
-
-require 'uri'
-
-require 'newrelic_rpm'
-
-NewRelic::Agent.logger.debug("Detected New Relic Infinite Tracing Gem")
-
-require 'infinite_tracing/version'
-require 'infinite_tracing/config'
-
-DependencyDetection.defer do
-  named :infinite_tracing
-
-  depends_on do
-    NewRelic::Agent::InfiniteTracing::Config.should_load?
-  end
-
-  executes do
-    NewRelic::Agent.logger.debug("Loading New Relic Infinite Tracing Library")
-
-    require 'infinite_tracing/proto'
-
-    require 'infinite_tracing/constants'
-    require 'infinite_tracing/worker'
-    require 'infinite_tracing/record_status_handler'
-
-    require 'infinite_tracing/transformer'
-    require 'infinite_tracing/streaming_buffer'
-    require 'infinite_tracing/suspended_streaming_buffer'
-    require 'infinite_tracing/channel'
-    require 'infinite_tracing/connection'
-    require 'infinite_tracing/client'
-
-    require 'infinite_tracing/agent_integrations'
-  end
-end

data/lib/new_relic/infinite_tracing.rb

@@ -1,39 +0,0 @@
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
-# frozen_string_literal: true
-
-require 'uri'
-
-require 'newrelic_rpm'
-
-NewRelic::Agent.logger.debug("Detected New Relic Infinite Tracing Gem")
-
-require 'new_relic/infinite_tracing/version'
-require 'new_relic/infinite_tracing/config'
-
-DependencyDetection.defer do
-  named :infinite_tracing
-
-  depends_on do
-    NewRelic::Agent::InfiniteTracing::Config.should_load?
-  end
-
-  executes do
-    NewRelic::Agent.logger.debug("Loading New Relic Infinite Tracing Library")
-
-    require 'new_relic/infinite_tracing/proto'
-
-    require 'new_relic/infinite_tracing/constants'
-    require 'new_relic/infinite_tracing/worker'
-    require 'new_relic/infinite_tracing/record_status_handler'
-
-    require 'new_relic/infinite_tracing/transformer'
-    require 'new_relic/infinite_tracing/streaming_buffer'
-    require 'new_relic/infinite_tracing/suspended_streaming_buffer'
-    require 'new_relic/infinite_tracing/channel'
-    require 'new_relic/infinite_tracing/connection'
-    require 'new_relic/infinite_tracing/client'
-
-    require 'new_relic/infinite_tracing/agent_integrations'
-  end
-end