solarwinds_apm 6.0.0 → 6.0.1

data/lib/solarwinds_apm/support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -6,36 +8,38 @@
 
 # This file is for loading support library
 
-require_relative './support/logger_formatter'
-require_relative './support/logging_log_event'
-require_relative './support/lumberjack_formatter'
-require_relative './support/transaction_cache'
-require_relative './support/transaction_settings'
-require_relative './support/oboe_tracing_mode'
-require_relative './support/txn_name_manager'
-require_relative './support/utils'
-require_relative './support/x_trace_options'
-require_relative './support/support_report'
+require_relative 'support/logger_formatter'
+require_relative 'support/logging_log_event'
+require_relative 'support/lumberjack_formatter'
+require_relative 'support/transaction_cache'
+require_relative 'support/transaction_settings'
+require_relative 'support/oboe_tracing_mode'
+require_relative 'support/txn_name_manager'
+require_relative 'support/utils'
+require_relative 'support/x_trace_options'
+require_relative 'support/support_report'
 
 if SolarWindsAPM::Config[:tag_sql]
-  if defined?(::Rails)
-    if ::Rails.version < '7'
-      require_relative './support/swomarginalia/railtie'
-    elsif ::Rails.version >= '7'
+  if defined?(Rails)
+    if Rails.version < '7'
+      require_relative 'support/swomarginalia/railtie'
+    elsif Rails.version >= '7'
       # User has to define in their config/environments:
-      # config.active_record.query_log_tags = [ 
-      #   { 
-      #     tracecontext: -> { 
-      #       SolarWindsAPM::SWOMarginalia::Comment.traceparent 
-      #     } 
+      # config.active_record.query_log_tags = [
+      #   {
+      #     tracecontext: -> {
+      #       SolarWindsAPM::SWOMarginalia::Comment.traceparent
+      #     }
       #   }
       # ]
-      SolarWindsAPM.logger.info {"In Rails 7, tag tracecontext on a query by including SolarWindsAPM::SWOMarginalia::Comment.traceparent as function in config.active_record.query_log_tags."}
-      SolarWindsAPM.logger.info {"For more information, please check https://api.rubyonrails.org/classes/ActiveRecord/QueryLogs.html"}
-      require_relative './support/swomarginalia/comment'
+      SolarWindsAPM.logger.info do
+        'In Rails 7, tag tracecontext on a query by including SolarWindsAPM::SWOMarginalia::Comment.traceparent as function in config.active_record.query_log_tags.'
+      end
+      SolarWindsAPM.logger.info { 'For more information, please check https://api.rubyonrails.org/classes/ActiveRecord/QueryLogs.html' }
+      require_relative 'support/swomarginalia/comment'
     end
-  elsif defined?(::ActiveRecord)
-    require_relative './support/swomarginalia/load_swomarginalia'
+  elsif defined?(ActiveRecord)
+    require_relative 'support/swomarginalia/load_swomarginalia'
     SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert
   end
 end

data/lib/solarwinds_apm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -11,7 +13,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 6 # breaking,
     MINOR  = 0 # feature,
-    PATCH  = 0 # fix => BFF
+    PATCH  = 1 # fix => BFF
     PRE    = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/solarwinds_apm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
@@ -17,12 +19,10 @@ begin
   end
 
   begin
-    if /linux/.match?(RUBY_PLATFORM)
+    if RUBY_PLATFORM.include?('linux')
       require 'solarwinds_apm/config'
-      SolarWindsAPM::Config.load_config_file
-
-      require 'solarwinds_apm/oboe_init_options'      # setup oboe reporter options
-      unless SolarWindsAPM::OboeInitOptions.instance.service_key_ok?
+      require 'solarwinds_apm/oboe_init_options' # setup oboe reporter options
+      if !SolarWindsAPM::OboeInitOptions.instance.service_key_ok? && !SolarWindsAPM::OboeInitOptions.instance.lambda_env
         SolarWindsAPM.logger.warn '=============================================================='
         SolarWindsAPM.logger.warn 'SW_APM_SERVICE_KEY Error. SolarWinds APM disabled'
         SolarWindsAPM.logger.warn 'Please check previous log messages for more details.'
@@ -30,8 +30,8 @@ begin
         return
       end
 
-      require_relative './libsolarwinds_apm.so'       # load c-lib oboe
-      require_relative './oboe_metal'                 # initialize reporter: SolarWindsAPM.loaded = true
+      require_relative 'libsolarwinds_apm.so'       # load c-lib oboe
+      require_relative 'oboe_metal'                 # initialize reporter: SolarWindsAPM.loaded = true
 
       require 'opentelemetry/sdk/version'                 # load otel sdk version
       require 'opentelemetry/instrumentation/all/version' # load otel instrumentation
@@ -43,34 +43,45 @@ begin
       SolarWindsAPM.logger.info "OpenTelemetry instrumentation version: #{OpenTelemetry::Instrumentation::All::VERSION}."
       SolarWindsAPM.logger.info '==================================================================='
 
-      SolarWindsAPM::Reporter.start                 # start the reporter, any issue will be logged
+      if SolarWindsAPM::OboeInitOptions.instance.lambda_env
+        SolarWindsAPM.logger.info '==================================================================='
+        SolarWindsAPM.logger.info "Ruby #{RUBY_VERSION} on platform #{RUBY_PLATFORM} is running in lambda environment."
+        SolarWindsAPM.logger.info '==================================================================='
+
+        SolarWindsAPM.oboe_api = SolarWindsAPM::OboeAPI.new # start oboe api for lambda env
+        require 'solarwinds_apm/otel_lambda_config'
+
+        SolarWindsAPM::OTelLambdaConfig.initialize # we don't allow in-code configuration under lambda env
+      else
+        SolarWindsAPM::Reporter.start # start the reporter, any issue will be logged
 
-      if SolarWindsAPM.loaded
-        require 'solarwinds_apm/constants'
-        require 'solarwinds_apm/api'
-        require 'solarwinds_apm/support'
-        require 'solarwinds_apm/opentelemetry'
-        require 'solarwinds_apm/patch'
-        require 'solarwinds_apm/otel_config'
-        
-        if ENV['SW_APM_AUTO_CONFIGURE'] != 'false'
-          SolarWindsAPM::OTelConfig.initialize
-        elsif ENV['SW_APM_AUTO_CONFIGURE'] == 'false'
+        if SolarWindsAPM.loaded
+          require 'solarwinds_apm/constants'
+          require 'solarwinds_apm/api'
+          require 'solarwinds_apm/support'
+          require 'solarwinds_apm/opentelemetry'
+          require 'solarwinds_apm/patch'
+          require 'solarwinds_apm/otel_config'
+
+          if ENV['SW_APM_AUTO_CONFIGURE'] != 'false'
+            SolarWindsAPM::OTelConfig.initialize
+          elsif ENV['SW_APM_AUTO_CONFIGURE'] == 'false'
+            SolarWindsAPM.logger.warn '=============================================================='
+            SolarWindsAPM.logger.warn 'SW_APM_AUTO_CONFIGURE set to false.'
+            SolarWindsAPM.logger.warn 'You need to initialize Ruby library in application with'
+            SolarWindsAPM.logger.warn 'SolarWindsAPM::OTelConfig.initialize_with_config do |config|'
+            SolarWindsAPM.logger.warn '  # ... your configuration code'
+            SolarWindsAPM.logger.warn 'end'
+            SolarWindsAPM.logger.warn 'See: https://github.com/solarwinds/apm-ruby/blob/main/CONFIGURATION.md#in-code-configuration'
+            SolarWindsAPM.logger.warn "\e[1mPlease discard this message if application have already taken this action.\e[0m"
+            SolarWindsAPM.logger.warn '=============================================================='
+          end
+        else
           SolarWindsAPM.logger.warn '=============================================================='
-          SolarWindsAPM.logger.warn 'SW_APM_AUTO_CONFIGURE set to false.'
-          SolarWindsAPM.logger.warn 'You need to initialize Ruby library in application with'
-          SolarWindsAPM.logger.warn 'SolarWindsAPM::OTelConfig.initialize_with_config do |config|'
-          SolarWindsAPM.logger.warn '  # ... your configuration code'
-          SolarWindsAPM.logger.warn 'end'
-          SolarWindsAPM.logger.warn 'See: https://github.com/solarwinds/apm-ruby/blob/main/CONFIGURATION.md#in-code-configuration'
-          SolarWindsAPM.logger.warn "\e[1mPlease discard this message if application have already taken this action.\e[0m"
+          SolarWindsAPM.logger.warn 'SolarWindsAPM not loaded. SolarWinds APM disabled'
+          SolarWindsAPM.logger.warn 'Please check previous log messages.'
           SolarWindsAPM.logger.warn '=============================================================='
         end
-      else
-        SolarWindsAPM.logger.warn '=============================================================='
-        SolarWindsAPM.logger.warn 'SolarWindsAPM not loaded. SolarWinds APM disabled'
-        SolarWindsAPM.logger.warn 'Please check previous log messages.'
-        SolarWindsAPM.logger.warn '=============================================================='
       end
     else
       SolarWindsAPM.logger.warn '==================================================================='
@@ -87,8 +98,7 @@ begin
     SolarWindsAPM.logger.error 'See: https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent'
     SolarWindsAPM.logger.error '=============================================================='
   end
-  
 rescue StandardError => e
-  $stderr.puts "[solarwinds_apm/error] Problem loading: #{e.inspect}"
-  $stderr.puts e.backtrace
+  warn "[solarwinds_apm/error] Problem loading: #{e.inspect}"
+  warn e.backtrace
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-sdk
+  name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-instrumentation-all
+  name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -55,20 +55,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: opentelemetry-exporter-otlp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.2
 description: Automatic tracing and metrics for Ruby applications. Get started at cloud.solarwinds.com
 email: technicalsupport@solarwinds.com
 executables: []
@@ -82,6 +68,8 @@ files:
 - ext/oboe_metal/lib/liboboe-1.0-aarch64.so.sha256
 - ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.sha256
 - ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.sha256
+- ext/oboe_metal/lib/liboboe-1.0-lambda-aarch64.so.sha256
+- ext/oboe_metal/lib/liboboe-1.0-lambda-x86_64.so.sha256
 - ext/oboe_metal/lib/liboboe-1.0-x86_64.so.sha256
 - ext/oboe_metal/src/VERSION
 - ext/oboe_metal/src/bson/bson.h
@@ -114,12 +102,14 @@ files:
 - lib/solarwinds_apm/noop/span.rb
 - lib/solarwinds_apm/oboe_init_options.rb
 - lib/solarwinds_apm/opentelemetry.rb
+- lib/solarwinds_apm/opentelemetry/otlp_processor.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_exporter.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_processor.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_propagator.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_response_propagator.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_sampler.rb
 - lib/solarwinds_apm/otel_config.rb
+- lib/solarwinds_apm/otel_lambda_config.rb
 - lib/solarwinds_apm/patch.rb
 - lib/solarwinds_apm/patch/dummy_patch.rb
 - lib/solarwinds_apm/support.rb
@@ -150,6 +140,7 @@ metadata:
   homepage_uri: https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html
   source_code_uri: https://github.com/solarwinds/apm-ruby
   github_repo: https://github.com/solarwinds/apm-ruby.git
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -165,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: SolarWindsAPM performance instrumentation gem for Ruby