appsignal 4.10.4-java → 5.0.0-java

data/lib/appsignal/utils/request_headers.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Appsignal
+  module Utils
+    class RequestHeaders
+      # The only two request headers Rack passes without the `HTTP_` prefix,
+      # because CGI reserves the prefixed spelling of them.
+      UNPREFIXED_HEADER_KEYS = %w[CONTENT_LENGTH CONTENT_TYPE].freeze
+
+      # `HTTP_VERSION` is a CGI variable holding the same value as
+      # `SERVER_PROTOCOL`, not a header.
+      NON_HEADER_KEYS = %w[HTTP_VERSION].freeze
+
+      # The environment keys the instrumentation already describes with a semantic
+      # convention attribute, read from the request itself.
+      TRANSLATED_ENV_KEYS = %w[
+        PATH_INFO REQUEST_METHOD REQUEST_PATH SERVER_NAME SERVER_PORT
+        SERVER_PROTOCOL
+      ].freeze
+
+      HTTP_PREFIX = "HTTP_"
+
+      class << self
+        def split(env)
+          return [{}, env] unless env.is_a?(Hash)
+
+          headers = {}
+          environment = {}
+
+          env.each do |key, value|
+            name = header_name(key)
+            if name
+              headers[name] = value
+            else
+              environment[key] = value
+            end
+          end
+
+          [headers, environment]
+        end
+
+        def split_lazily(&block)
+          split = nil
+          splitter = lambda { split ||= split(block.call) }
+
+          [lambda { splitter.call.first }, lambda { splitter.call.last }]
+        end
+
+        def header_name(env_key)
+          env_key = env_key.to_s
+          return if NON_HEADER_KEYS.include?(env_key)
+
+          if env_key.start_with?(HTTP_PREFIX)
+            normalize(env_key.delete_prefix(HTTP_PREFIX))
+          elsif UNPREFIXED_HEADER_KEYS.include?(env_key)
+            normalize(env_key)
+          end
+        end
+
+        # A key does not always make the round trip as itself, because two Rack keys
+        # can name the same header: a server that sets both `CONTENT_LENGTH` and
+        # `HTTP_CONTENT_LENGTH` gets the second one back as the first.
+        def rack_name(header)
+          env_key = header.to_s.upcase.tr("-", "_")
+          return env_key if UNPREFIXED_HEADER_KEYS.include?(env_key)
+
+          "#{HTTP_PREFIX}#{env_key}"
+        end
+
+        # Several OpenTelemetry SDKs write header attribute names with underscores,
+        # where the semantic conventions the collector compares against use dashes.
+        def normalize(name)
+          name.to_s.downcase.tr("_", "-")
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/utils/stdout_and_logger_message.rb

@@ -8,9 +8,18 @@ module Appsignal
         logger.warn message
       end
 
+      def self.error(message, logger = Appsignal.internal_logger)
+        Kernel.warn "appsignal ERROR: #{message}"
+        logger.error message
+      end
+
       def stdout_and_logger_warning(message, logger = Appsignal.internal_logger)
         Appsignal::Utils::StdoutAndLoggerMessage.warning(message, logger)
       end
+
+      def stdout_and_logger_error(message, logger = Appsignal.internal_logger)
+        Appsignal::Utils::StdoutAndLoggerMessage.error(message, logger)
+      end
     end
   end
 end

data/lib/appsignal/utils.rb

@@ -10,6 +10,7 @@ require "appsignal/utils/integration_memory_logger"
 require "appsignal/utils/stdout_and_logger_message"
 require "appsignal/utils/data"
 require "appsignal/utils/sample_data_sanitizer"
+require "appsignal/utils/request_headers"
 require "appsignal/utils/integration_logger"
 require "appsignal/utils/json"
 require "appsignal/utils/ndjson"

data/lib/appsignal/version.rb

@@ -2,5 +2,5 @@
 
 module Appsignal
   # @return [String]
-  VERSION = "4.10.4"
+  VERSION = "5.0.0"
 end

data/lib/appsignal.rb

@@ -2,12 +2,15 @@
 
 require "json"
 require "securerandom"
+require "set"
 require "stringio"
 
 require "appsignal/logger"
 require "appsignal/utils/stdout_and_logger_message"
 require "appsignal/helpers/instrumentation"
 require "appsignal/helpers/metrics"
+require "appsignal/backends"
+require "appsignal/opentelemetry"
 
 # AppSignal for Ruby gem's main module.
 #
@@ -143,6 +146,8 @@ module Appsignal
           Appsignal::Hooks.load_hooks
           Appsignal::Loaders.start
 
+          Appsignal::OpenTelemetry.configure(config) if config.collector_mode_configured?
+
           if config[:enable_allocation_tracking] && !Appsignal::System.jruby?
             Appsignal::Extension.install_allocation_event_hook
             Appsignal::Environment.report_enabled("allocation_tracking")
@@ -241,6 +246,10 @@ module Appsignal
     # @return [void]
     # @since 1.0.0
     def stop(called_by = nil)
+      # Wrapped in `Thread.new ... .join` so this is safe to call from a
+      # `Signal.trap` block: `Mutex#synchronize` (used by
+      # `CheckIn::Scheduler`) is unsafe in trap handlers, and running on a
+      # separate thread sidesteps that restriction. See PR #1295.
       Thread.new do
         if called_by
           internal_logger.info("Stopping AppSignal (#{called_by})")
@@ -250,6 +259,7 @@ module Appsignal
         Appsignal::Extension.stop
         Appsignal::Probes.stop
         Appsignal::CheckIn.stop
+        Appsignal::OpenTelemetry.shutdown
       end.join
       nil
     end