atatus 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc239b97c79b5f08087cb18a01202d02a040380a57ab7cb4f324f788693459b6
-  data.tar.gz: 30cb19013300718357c28e41e95306ced7fa80633904d4213216e54485e0618f
+  metadata.gz: e583b9f10ae2db24b5ffedfe79959daf38c6b1b947a0cb71ddcf2fb1005e6495
+  data.tar.gz: 5db30ee5dd57494608263eeb2b45943a81dbd5eb8bce84a8e19fecad49ba2650
 SHA512:
-  metadata.gz: 39c3db15d4ee7f8f3a7d055977638c3c4a88b3073c3503a7194dd749574197166e65df68c525c45631e3514a59dbbba1cfa156b224cb4220226c691961a086b0
-  data.tar.gz: 50f8cd73f38d8729d786c407a3be835b92fe44b7a721e6adf2a6053153ae00cbb48ec5650fb6313f7d1590e1fd6f0db12d52b8c58e535be117d99e8fc91101bb
+  metadata.gz: 2e88330ad4178a8b991792e2c518e2b4b4d9144508365953b8e2528fad479b01fe6d445487adf3d00c31315119ecab8a146b673145fd6cc76dda9b57ed145f03
+  data.tar.gz: f522a2e7f232b8892b7f8a4a07a36c39fa982a4cad992c3e4edd7ef7100b7a0df2309876670f4e5f17e391703170f4a9ddd9184447c8354de05bc5e1ebf5dca1

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.1.0 (Wed, 7 Jan 2026)
+
+- Fixed host details fetching issue in docker.
+- Added support for distributed tracing.
+- Added support for server url.
+
+
 ## 2.0.3 (Wed, 16 Oct 2024)
 
 - Fixed Action Dispatch exception handler failure in Rails 7.1

data/lib/atatus/collector/base.rb

@@ -6,6 +6,7 @@ require 'atatus/transaction'
 require 'atatus/collector/hist'
 require 'atatus/collector/layer'
 require 'atatus/collector/transport'
+require 'atatus/transport/base'
 
 SpanTiming = Struct.new(:name, :type, :subtype, :start, :end, :duration, :id, :transaction_id)
 
@@ -27,6 +28,8 @@ module Atatus
       def initialize(config)
         # info 'Initializing Collector'
         @config = config
+        initialize_server_urls
+
         @spans = Hash.new {|h,k| h[k]=[]}
 
         @txns_lock = Mutex.new
@@ -38,6 +41,7 @@ module Atatus
 
         @errors_lock = Mutex.new
         @errors_aggs = []
+        @error_limit = 20
 
         @metrics_lock = Mutex.new
         @metrics_agg = []
@@ -48,9 +52,39 @@ module Atatus
 
         @hostinfo_response = {}
         @hostinfo_response["analytics"] = true
-        @transport = Atatus::BaseTransport.new(config)
+        @transport = Atatus::BaseTransport.new(@config)
+        @dt_transport = Atatus::Transport::Base.new(@config)
         @collect_counter = 0
         @running = false
+
+        @transaction_ignore_urls = @config.transaction_ignore_urls.dup
+      end
+
+      def initialize_server_urls
+        url = nil
+
+        if @config.notify_host != "https://apm-rx.atatus.com"
+          url = @config.notify_host
+        end
+
+        if @config.server_url != ''
+          url = @config.server_url
+        end
+
+        if url
+          if @config.apm_server_url == "https://apm-rx.atatus.com"
+            @config.apm_server_url = url
+          end
+          if @config.analytics_server_url == "https://an-rx.atatus.com"
+            @config.analytics_server_url = url
+          end
+          if @config.traces_server_url == "https://dt-rx.atatus.com"
+            @config.traces_server_url = url
+          end
+          if @config.logs_server_url == "https://log-rx.atatus.com"
+            @config.logs_server_url = url
+          end
+        end
       end
 
       attr_reader :config
@@ -60,6 +94,7 @@ module Atatus
       end
 
       def start
+        @dt_transport.start
         debug '%s: Starting collector', pid_str
 
         ensure_worker_running
@@ -67,6 +102,7 @@ module Atatus
 
       def stop
         return unless @running
+        @dt_transport.stop
         @running = false
         if worker_active?
           debug '%s: Waiting for collector worker to exit', pid_str
@@ -81,6 +117,7 @@ module Atatus
       def handle_forking!
         stop
         start
+        @dt_transport.handle_forking!
       end
 
       def add_error(error)
@@ -93,7 +130,7 @@ module Atatus
         then
           if @hostinfo_response.key?("ignoreExceptionPatterns")
             @hostinfo_response['ignoreExceptionPatterns'].each do |k, v|
-              if error.exception.type.match(k)
+              if k.match(error.exception.type)
                 exception_values = v
                 if exception_values.length == 0
                   ignore_error = true
@@ -111,10 +148,10 @@ module Atatus
         end
         if ignore_error == false
           @errors_lock.synchronize do
-            if @errors_aggs.length < 20
+            if @errors_aggs.length < @error_limit
               @errors_aggs.push(error)
             else
-              i = rand(20)
+              i = rand(@error_limit)
               @errors_aggs[i] = error
             end
           end
@@ -249,6 +286,15 @@ module Atatus
       end
 
       def add_span(span)
+
+        if @hostinfo_response.key?("tracing")
+          if @hostinfo_response["tracing"] == true && @config.tracing == true
+            if @hostinfo_response["performance"] && @config.performance
+              @dt_transport.submit(span)
+            end
+          end
+        end
+
         ensure_worker_running
 
         if
@@ -265,6 +311,15 @@ module Atatus
       end
 
       def add_txn(txn)
+
+        if @hostinfo_response.key?("tracing")
+          if @hostinfo_response["tracing"] == true && @config.tracing == true
+            if @hostinfo_response["performance"] && @config.performance
+              @dt_transport.submit(txn)
+            end
+          end
+        end
+
         ensure_worker_running
 
         if
@@ -279,7 +334,7 @@ module Atatus
         ignore_txn = false
         if @hostinfo_response.key?("ignoreTxnNamePatterns")
           @hostinfo_response['ignoreTxnNamePatterns'].each do |k|
-            if txn.name.match(k)
+            if k.match(txn.name)
               ignore_txn = true
               break
             end
@@ -433,7 +488,7 @@ module Atatus
             if status_code >= 400 && status_code != 404
               if @hostinfo_response.key?("ignoreHTTPFailurePatterns")
                 @hostinfo_response['ignoreHTTPFailurePatterns'].each do |k, v|
-                  if txn.name.match(k)
+                  if k.match(txn.name)
                     status_code_array_s = v
                     if status_code_array_s.length == 0
                       ignore_status_code = true
@@ -490,8 +545,8 @@ module Atatus
 
           while @running
             start_time = (Time.now.to_f * 1000).to_i
-            sleep(60)
             collect start_time
+            sleep(60)
           end
         end
       end
@@ -516,6 +571,10 @@ module Atatus
 
         if @collect_counter % 30 == 0
           @hostinfo_response = @transport.hostinfo(start_time)
+          @config.transaction_ignore_urls = @transaction_ignore_urls | @hostinfo_response["ignoreTxnUrlPatterns"]
+          if @hostinfo_response.key?("errorLimit")
+            @error_limit = @hostinfo_response["errorLimit"]
+          end
           @collect_counter = 0
         end
         @collect_counter += 1

data/lib/atatus/collector/builder.rb

@@ -131,14 +131,24 @@ module Atatus
     end
 
     def build_hostinfo_env_settings()
-      {
+      settings = {
         agentVersion: VERSION,
-        appName: @config.app_name,
-        framework: @config.framework_name,
-        frameworkVersion: @config.framework_version,
-        logLevel: @config.log_level,
         ruby: RUBY_VERSION
       }
+
+      @config.options.each do |key, opt|
+        value = opt.value
+
+        next if value.nil? ||
+                value == "" ||
+                (value.respond_to?(:empty?) && value.empty?)
+
+        settings[key] = value
+      end
+
+      settings.delete(:license_key)
+      settings.delete(:sanitize_field_names)
+      settings
     end
 
     def build_hostinfo_gems()

data/lib/atatus/collector/compress_body.rb

@@ -0,0 +1,14 @@
+require 'zlib'
+require 'stringio'
+
+module Atatus
+  class Compress
+    def compress(body)
+      sio = StringIO.new
+      gz = Zlib::GzipWriter.new(sio)
+      gz.write(body)
+      gz.close
+      sio.string
+    end
+  end
+end

data/lib/atatus/collector/transport.rb

@@ -2,6 +2,8 @@ require 'json'
 require 'thread'
 require 'net/http'
 require 'atatus/collector/builder'
+require 'atatus/config/wildcard_pattern_list'
+require 'atatus/collector/compress_body'
 
 module Atatus
   class BaseTransport
@@ -19,25 +21,21 @@ module Atatus
     def initialize(config)
       @config = config
 
-      @notify_host = @config.notify_host
-      uri = URI(@notify_host)
-      if not uri.kind_of?(URI::HTTPS) and not uri.kind_of?(URI::HTTP)
-        @notify_host = "https://apm-rx.atatus.com"
-      end
-
-      @analytics_notify_host = @config.analytics_notify_host
-      uri = URI(@analytics_notify_host)
-      if not uri.kind_of?(URI::HTTPS) and not uri.kind_of?(URI::HTTP)
-        @analytics_notify_host = "https://an-rx.atatus.com"
-      end
+      @apm_server_url = @config.apm_server_url
+      @analytics_server_url = @config.analytics_server_url
 
       @builder = Atatus::Builder.new(config)
       @headers = {}
       @headers['Content-Type'] = "application/json"
+      @headers['Content-Encoding'] = "gzip"
 
       @blocked = false
       @capture_percentiles = false
       @hostinfo_response = {}
+      @wildcard_pattern_factory = Config::WildcardPatternList.new
+
+      @http_transport = Transport::Connection::Http.new(@config, headers: @headers)
+      @compressor = Compress.new
     end
 
     def hostinfo(start_time)
@@ -47,11 +45,15 @@ module Atatus
     end
 
     def txns(start_time, end_time, data)
+      return unless @hostinfo_response["performance"] && @config.performance
+
       payload = @builder.txns(start_time, end_time, data)
       post(TXN_ENDPOINT, payload)
     end
 
     def txn_hist(start_time, end_time, data)
+      return unless @hostinfo_response["performance"] && @config.performance
+      
       if @capture_percentiles == true
         payload = @builder.txn_hist(start_time, end_time, data)
         post(TXN_HIST_ENDPOINT, payload)
@@ -59,11 +61,15 @@ module Atatus
     end
 
     def traces(start_time, end_time, data)
+      return unless @hostinfo_response["performance"] && @config.performance
+      
       payload = @builder.traces(start_time, end_time, data)
       post(TRACE_ENDPOINT, payload)
     end
 
     def error_metrics(start_time, end_time, metrics_data, requests_data)
+      return unless @hostinfo_response["performance"] && @config.performance
+
       payload = @builder.error_metrics(start_time, end_time, metrics_data, requests_data)
       post(ERROR_METRIC_ENDPOINT, payload)
     end
@@ -74,6 +80,8 @@ module Atatus
     end
 
     def metrics(start_time, end_time, metric_data)
+      return unless @hostinfo_response["performance"] && @config.performance
+
       payload = @builder.metrics(start_time, end_time, metric_data)
       post(METRIC_ENDPOINT, payload)
     end
@@ -86,28 +94,30 @@ module Atatus
     private
 
     def post(endpoint, data)
-      # puts ::JSON.pretty_generate(data, :max_nesting => false)
+
       if @blocked == true and endpoint != HOSTINFO_ENDPOINT
+        debug "Client blocked"
         return
       end
 
       begin
-        notify_host = @notify_host
+        server_url = @apm_server_url
         if endpoint == ANALYTICS_ENDPOINT
-          notify_host = @analytics_notify_host
+          server_url = @analytics_server_url
         end
 
-        uri = URI(notify_host + endpoint)
+        uri = URI(server_url + endpoint)
         uri.query = URI.encode_www_form({"license_key": @config.license_key, "agent_name": AGENT_NAME, "agent_version": VERSION})
 
-        request = Net::HTTP::Post.new(uri.request_uri, @headers)
-        request.body = ::JSON.dump(data)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        response = http.start { |http| http.request(request) }
+        verbose "Sending data to #{uri}"
+        verbose "Payload: #{::JSON.pretty_generate(data, :max_nesting => false)}"
+        
+        compressed_body = @compressor.compress(::JSON.generate(data))
+        headers_new = @headers.merge('Content-Length' => compressed_body.bytesize.to_s)
+        response = @http_transport.post(uri, body: compressed_body, headers: headers_new)
+
       rescue SystemCallError, Timeout::Error, EOFError, SocketError => e
-        error format('Atatus transport [%s%s] failed with exception: %s', notify_host, endpoint, e.message)
+        error format('Atatus transport [%s%s] failed with exception: %s', server_url, endpoint, e.message)
         return
       end
 
@@ -115,8 +125,8 @@ module Atatus
         @blocked = false
       end
 
-      case response
-      when Net::HTTPSuccess
+      case response.status
+      when 200
         if endpoint == HOSTINFO_ENDPOINT
           @capture_percentiles = false
 
@@ -125,11 +135,16 @@ module Atatus
           end
 
           resp = JSON.parse response.body
+          
           if resp
             if resp.key?("analytics")
               @hostinfo_response['analytics'] = resp["analytics"]
             end
 
+            if resp.key?("tracing")
+              @hostinfo_response['tracing'] = resp["tracing"]
+            end
+
             if resp.key?("capturePercentiles")
               @capture_percentiles = resp["capturePercentiles"]
               @hostinfo_response['capturePercentiles'] = @capture_percentiles
@@ -138,24 +153,43 @@ module Atatus
             if resp.key?("extRequestPatterns")
               @hostinfo_response['extRequestPatterns'] = resp["extRequestPatterns"]
             end
+            
+            if resp.key?("ignoreTxnUrlPatterns")
+              @hostinfo_response['ignoreTxnUrlPatterns'] = resp["ignoreTxnUrlPatterns"]
+            else
+              @hostinfo_response['ignoreTxnUrlPatterns'] = []
+            end
 
             if resp.key?("ignoreTxnNamePatterns")
-              @hostinfo_response['ignoreTxnNamePatterns'] = resp["ignoreTxnNamePatterns"]
+              @hostinfo_response['ignoreTxnNamePatterns'] = @wildcard_pattern_factory.call(resp["ignoreTxnNamePatterns"])
             end
 
             if resp.key?("ignoreHTTPFailurePatterns")
-              @hostinfo_response['ignoreHTTPFailurePatterns'] = resp["ignoreHTTPFailurePatterns"]
+              @hostinfo_response['ignoreHTTPFailurePatterns'] = @wildcard_pattern_factory.call(resp["ignoreHTTPFailurePatterns"])
             end
 
             if resp.key?("ignoreExceptionPatterns")
-              @hostinfo_response['ignoreExceptionPatterns'] = resp["ignoreExceptionPatterns"]
+              @hostinfo_response['ignoreExceptionPatterns'] = @wildcard_pattern_factory.call(resp["ignoreExceptionPatterns"])
             end
 
+            if resp.key?("performance")
+              @hostinfo_response['performance'] = resp["performance"]
+            else
+              @hostinfo_response['performance'] = true
+            end
+
+            if resp.key?("errorLimit") and resp["errorLimit"].is_a?(Integer)
+              if resp["errorLimit"] < 20
+                @hostinfo_response['errorLimit'] = 20
+              else
+                @hostinfo_response['errorLimit'] = resp["errorLimit"]
+              end
+            end
           end
         else
           true
         end
-      when Net::HTTPBadRequest
+      when 400..499
         if not response.body
           error format('Transport status 400, failed without content')
           return

data/lib/atatus/config/error_limit_converter.rb

@@ -0,0 +1,17 @@
+module Atatus
+  class Config
+    class ErrorLimitConverter
+      def call(value)
+        value = value.to_i
+
+        if value < 20
+          return 20
+        elsif value > 200
+          return 200
+        else
+          return value
+        end        
+      end
+    end
+  end
+end

data/lib/atatus/config/log_level_map.rb

@@ -22,6 +22,7 @@ module Atatus
     # @api private
     class LogLevelMap
       LEVELS = {
+        verbose: Logger::VERBOSE,
         debug: Logger::DEBUG,
         info: Logger::INFO,
         warn: Logger::WARN,

data/lib/atatus/config/options.rb

@@ -90,8 +90,17 @@ module Atatus
         end
 
         def normalize_url(val)
-          val = val.to_s
-          val.end_with?('/') ? val.chomp('/') : val
+          if key.to_s == "server_url" and val == ""
+            return ""
+          end
+
+          uri = URI(val)
+
+          if not uri.kind_of?(URI::HTTPS) and not uri.kind_of?(URI::HTTP)
+            raise InternalError, "Invalid URL for #{key}: #{val}"
+          end
+
+          uri.to_s.chomp('/')
         end
       end
 

data/lib/atatus/config/wildcard_pattern_list.rb

@@ -33,6 +33,12 @@ module Atatus
           !!@pattern.match(other)
         end
 
+        def ==(other)
+          other.is_a?(WildcardPattern) && @pattern == other.pattern
+        end
+
+        alias eql? ==
+
         alias :match :match?
 
         private
@@ -55,11 +61,40 @@ module Atatus
             case_sensitive ? nil : Regexp::IGNORECASE
           )
         end
-      end
+      end      
 
       def call(value)
-        value = value.is_a?(String) ? value.split(',') : Array(value)
-        value.map { |p| WildcardPattern.new(p) }
+        hash = false
+        if value.is_a?(Hash)
+          hash = true
+        elsif value.is_a?(String)
+          value = value.split(',')
+        else
+          value = Array(value)
+        end          
+
+        if !hash 
+          value = value.map do |p|
+            if p.is_a?(WildcardPattern) 
+              p
+            else
+              begin
+                WildcardPattern.new(p)
+              rescue RegexpError
+                nil
+              end
+            end
+          end
+
+        else
+          new_hash = {}
+          value = value.map do |k, v|
+            new_hash[WildcardPattern.new(k)] = v
+          end
+          value = new_hash
+        end
+
+        value.uniq.compact
       end
     end
   end

data/lib/atatus/config.rb

@@ -26,6 +26,7 @@ require 'atatus/config/regexp_list'
 require 'atatus/config/wildcard_pattern_list'
 require 'atatus/deprecations'
 require 'atatus/config/server_info'
+require 'atatus/config/error_limit_converter'
 
 module Atatus
   # @api private
@@ -39,12 +40,17 @@ module Atatus
     # rubocop:disable Layout/LineLength, Layout/ExtraSpacing
     option :app_name,                          type: :string
     option :license_key,                       type: :string
-    option :notify_host,                       type: :string, default: 'https://apm-rx.atatus.com'
-    option :analytics_notify_host,             type: :string, default: 'https://an-rx.atatus.com'
+    option :notify_host,                       type: :url,    default: 'https://apm-rx.atatus.com'
+    option :analytics_notify_host,             type: :url,    default: 'https://an-rx.atatus.com'
     option :trace_threshold,                   type: :int,    default: 2000
     option :analytics,                         type: :bool,   default: false
+    option :tracing,                           type: :bool,   default: false
     option :config_file,                       type: :string, default: 'config/atatus.yml'
     option :server_url,                        type: :url,    default: ''
+    option :apm_server_url,                    type: :url,    default: 'https://apm-rx.atatus.com'
+    option :analytics_server_url,              type: :url,    default: 'https://an-rx.atatus.com'
+    option :traces_server_url,                 type: :url,    default: 'https://dt-rx.atatus.com'
+    option :logs_server_url,                   type: :url,    default: 'https://log-rx.atatus.com'
     option :secret_token,                      type: :string
     option :api_key,                           type: :string
 
@@ -105,8 +111,11 @@ module Atatus
     option :transaction_ignore_urls,           type: :list,   default: [],      converter: WildcardPatternList.new
     option :transaction_max_spans,             type: :int,    default: 500
     option :transaction_sample_rate,           type: :float,  default: 1.0,     converter: RoundFloat.new
-    option :use_atatus_traceparent_header,    type: :bool,   default: true
+    option :use_atatus_traceparent_header,     type: :bool,   default: true
     option :verify_server_cert,                type: :bool,   default: true
+    # option :error_limit,                       type: :int,    default: 20,      converter: ErrorLimitConverter.new
+    option :performance,                       type: :bool,   default: true
+
 
     def log_ecs_formatting
       log_ecs_reformatting

data/lib/atatus/logging.rb

@@ -14,6 +14,25 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'logger'
+
+class Logger
+  module Severity
+    VERBOSE = -1
+  end
+
+  def format_severity(severity)
+    if severity == Severity::VERBOSE
+      'VERBOSE'
+    else
+      SEV_LABEL[severity] || 'ANY'
+    end
+  end
+  
+  def verbose(progname = nil, &block)
+    add(Severity::VERBOSE, nil, progname, &block)
+  end
+end
 
 # frozen_string_literal: true
 
@@ -23,6 +42,7 @@ module Atatus
     PREFIX = '[Atatus] '
 
     LEVELS = {
+      verbose: Logger::VERBOSE,
       debug: Logger::DEBUG,
       info: Logger::INFO,
       warn: Logger::WARN,
@@ -30,6 +50,10 @@ module Atatus
       fatal: Logger::FATAL
     }.freeze
 
+    def verbose(msg, *args, &block)
+      log(:verbose, msg, *args, &block)
+    end
+
     def debug(msg, *args, &block)
       log(:debug, msg, *args, &block)
     end
@@ -55,8 +79,12 @@ module Atatus
     def log(lvl, msg, *args)
       return unless (logger = @config&.logger)
       return unless LEVELS[lvl] >= (@config&.log_level || 0)
-
-      formatted_msg = prepend_prefix(format(msg.to_s, *args))
+      
+      if not args.length == 0
+        formatted_msg = prepend_prefix(format(msg.to_s, *args))
+      else
+        formatted_msg = prepend_prefix(msg.to_s)
+      end
 
       return logger.send(lvl, formatted_msg) unless block_given?
 

data/lib/atatus/metadata/system_info/container_info.rb

@@ -23,6 +23,7 @@ module Atatus
       # @api private
       class ContainerInfo
         CGROUP_PATH = '/proc/self/cgroup'
+        MOUNTINFO_PATH = '/proc/self/mountinfo'
 
         attr_accessor :container_id, :kubernetes_namespace,
           :kubernetes_node_name, :kubernetes_pod_name, :kubernetes_pod_uid
@@ -34,7 +35,9 @@ module Atatus
         attr_reader :cgroup_path
 
         def read!(hostname)
-          read_from_cgroup!
+          read_from_mountinfo!
+          read_from_cgroup! unless container_id && kubernetes_pod_uid
+
           self.kubernetes_pod_name = hostname if kubernetes_pod_uid
           read_from_env!
           self
@@ -98,8 +101,37 @@ module Atatus
           }x
         ].freeze
         SYSTEMD_SCOPE_SUFFIX = '.scope'
+
+        CONTAINER_ID_V2_REGEX = %r{
+          ([[:xdigit:]]{64}|
+           [[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4,})
+        }x.freeze
+
+        POD_UID_V2_REGEX = %r{/kubelet/pods/([[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4,})}.freeze
+
         # rubocop:enable Style/RegexpLiteral
 
+        def read_from_mountinfo!
+          return unless File.exist?(MOUNTINFO_PATH)
+
+          IO.readlines(MOUNTINFO_PATH).each do |line|
+            if line.include?('/etc/hostname')
+              parts = line.split(' ')
+              if parts.length > 3
+                if (match = CONTAINER_ID_V2_REGEX.match(parts[3]))
+                  self.container_id = match[1]
+                end
+              end
+            end
+
+            if (match = POD_UID_V2_REGEX.match(line))
+              self.kubernetes_pod_uid = match[1] if match.size > 1
+            end
+
+            break if container_id && kubernetes_pod_uid
+          end
+        end
+
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
         def read_from_cgroup!

data/lib/atatus/metadata/system_info/hw_info.rb

@@ -81,7 +81,7 @@ module Atatus
           return unless File.exist?(LINUX_CPUINFO_PATH)
           cpuinfo = File.read(LINUX_CPUINFO_PATH)
           self.cpuinfo_cores = cpuinfo.scan(PROCESSOR_COUNT_REGEX).size
-          self.cpuinfo_model = cpuinfo.scan(MODEL_NAME_REGEX).flatten.first.strip
+          self.cpuinfo_model = cpuinfo.scan(MODEL_NAME_REGEX).flatten.first&.strip
           self.cpuinfo_mhz = cpuinfo.scan(CPU_MHZ_REGEX).flatten.first
         end
         # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity

data/lib/atatus/transport/connection/http.rb

@@ -116,8 +116,8 @@ module Atatus
             begin
               resp = post(url, body: @rd, headers: @headers.chunked.to_h)
 
-              if resp&.status == 202
-                debug 'APM Server responded with status 202'
+              if resp&.status == 200
+                debug 'APM Server responded with status 200'
               elsif resp
                 error "APM Server responded with an error:\n%p", resp.body.to_s
               end

data/lib/atatus/transport/connection.rb

@@ -42,7 +42,12 @@ module Atatus
             Metadata.new(config)
           )
         )
-        @url = "#{config.server_url}/intake/v2/events"
+
+        uri = URI(@config.traces_server_url + "/track/traces/spans")
+        uri.query = URI.encode_www_form({"license_key": @config.license_key, "agent_name": AGENT_NAME, "agent_version": VERSION, "app_name": @config.app_name})
+
+        @url = uri
+
         @mutex = Mutex.new
       end
 

data/lib/atatus/transport/serializers/span_serializer.rb

@@ -30,14 +30,16 @@ module Atatus
 
         attr_reader :context_serializer
 
-        def build(span)
+        def build(span)          
           {
             span: {
               id: span.id,
               transaction_id: span.transaction.id,
               parent_id: span.parent_id,
               name: keyword_field(span.name),
-              type: join_type(span),
+              type: keyword_field(span.type),
+              subtype: keyword_field(span.subtype),
+              action: keyword_field(span.action),
               duration: ms(span.duration),
               context: context_serializer.build(span.context),
               stacktrace: span.stacktrace.to_a,

data/lib/atatus/version.rb

@@ -19,5 +19,5 @@
 
 module Atatus
   AGENT_NAME = 'Ruby'
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atatus
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Atatus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2026-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -79,12 +79,14 @@ files:
 - lib/atatus/child_durations.rb
 - lib/atatus/collector/base.rb
 - lib/atatus/collector/builder.rb
+- lib/atatus/collector/compress_body.rb
 - lib/atatus/collector/hist.rb
 - lib/atatus/collector/layer.rb
 - lib/atatus/collector/transport.rb
 - lib/atatus/config.rb
 - lib/atatus/config/bytes.rb
 - lib/atatus/config/duration.rb
+- lib/atatus/config/error_limit_converter.rb
 - lib/atatus/config/log_level_map.rb
 - lib/atatus/config/options.rb
 - lib/atatus/config/regexp_list.rb