solarwinds_apm 5.1.9 → 6.0.0.preV2

data/lib/solarwinds_apm.rb

@@ -2,23 +2,27 @@
 # All rights reserved.
 
 begin
-  require 'openssl'
+  if ENV.has_key?('SOLARWINDS_APM_ENABLED') && (ENV['SOLARWINDS_APM_ENABLED'] == 'false' || ENV['SOLARWINDS_APM_ENABLED'] == false)
+    SolarWindsAPM.logger.warn 'SOLARWINDS_APM_ENABLED environment variable detected and was set to false; SolarWindsAPM disabled'
+    return
+  end
+
   require 'solarwinds_apm/version'
   require 'solarwinds_apm/thread_local'
-  require 'solarwinds_apm/logger'
-  require 'solarwinds_apm/util'
   require 'solarwinds_apm/support_report'
+  require 'solarwinds_apm/constants'
+  require 'solarwinds_apm/api'
   require 'solarwinds_apm/base'
-  SolarWindsAPM.loaded = false
-
+  require 'solarwinds_apm/logger'
   require 'solarwinds_apm/config'
-  SolarWindsAPM::Config.load_config_file
 
+  SolarWindsAPM::Config.load_config_file
+  SolarWindsAPM.loaded = false
   begin
     if RUBY_PLATFORM =~ /linux/
       require_relative './libsolarwinds_apm.so'
       require 'solarwinds_apm/oboe_init_options'
-      require 'oboe_metal.rb'  # sets SolarWindsAPM.loaded = true if successful
+      require_relative './oboe_metal'  # initialize Reporter; sets SolarWindsAPM.loaded = true if successful
     else
       SolarWindsAPM.logger.warn '==================================================================='
       SolarWindsAPM.logger.warn "SolarWindsAPM warning: Platform #{RUBY_PLATFORM} not yet supported."
@@ -28,7 +32,7 @@ begin
       SolarWindsAPM.logger.warn '==================================================================='
     end
   rescue LoadError => e
-    unless ENV['RAILS_GROUP'] == 'assets' or ENV['SW_APM_NO_LIBRARIES_WARNING']
+    unless ENV['RAILS_GROUP'] == 'assets' || ENV['SW_APM_NO_LIBRARIES_WARNING']
       SolarWindsAPM.logger.error '=============================================================='
       SolarWindsAPM.logger.error 'Missing SolarWindsAPM libraries.  Tracing disabled.'
       SolarWindsAPM.logger.error "Error: #{e.message}"
@@ -37,18 +41,26 @@ begin
     end
   end
 
-  # solarwinds_apm/loading can set SolarWindsAPM.loaded = false if the service key is not working
-  require 'solarwinds_apm/loading'
+  # Auto-start the Reporter unless we are running Unicorn on Heroku
+  # In that case, we start the reporters after fork
+  unless SolarWindsAPM.forking_webserver?
+    SolarWindsAPM::Reporter.start if SolarWindsAPM.loaded
+  end
 
   if SolarWindsAPM.loaded
-    require 'solarwinds_apm/instrumentation'
     require 'solarwinds_apm/support'
+    require 'solarwinds_apm/opentelemetry'
+    require 'solarwinds_apm/otel_config'
+    if ENV['SW_APM_AUTO_CONFIGURE'] == 'false'
+      SolarWindsAPM.logger.warn "SolarWindsAPM warning: Ruby library is not initilaized.
+                                  You may need to initialize Ruby library in application like the following: 
+                                  SolarWindsAPM::OTelConfig.initialize_with_config do |config|
+                                    ...
+                                  end"
+    else
+      SolarWindsAPM::OTelConfig.initialize
+    end
 
-    # Frameworks
-    require 'solarwinds_apm/frameworks/rails'
-    require 'solarwinds_apm/frameworks/sinatra'
-    require 'solarwinds_apm/frameworks/padrino'
-    require 'solarwinds_apm/frameworks/grape'
   else
     SolarWindsAPM.logger.warn '=============================================================='
     SolarWindsAPM.logger.warn 'SolarWindsAPM not loaded. Tracing disabled.'
@@ -57,16 +69,8 @@ begin
     SolarWindsAPM.logger.warn '=============================================================='
     require 'solarwinds_apm/noop/context'
     require 'solarwinds_apm/noop/metadata'
-    # require 'solarwinds_apm/noop/profiling'
-    require 'solarwinds_apm/support/trace_string'
   end
-
-  # Load Ruby module last.  If there is no framework detected,
-  # it will load all of the Ruby instrumentation
-  require 'solarwinds_apm/ruby'
-
-  require 'solarwinds_apm/test' if ENV['SW_APM_GEM_TEST']
-rescue => e
+rescue StandardError => e
   $stderr.puts "[solarwinds_apm/error] Problem loading: #{e.inspect}"
   $stderr.puts e.backtrace
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 5.1.9
+  version: 6.0.0.preV2
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,191 +11,131 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: no_proxy_fix
+  name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-    - - ">="
+        version: 0.31.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-    - - ">="
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-exporter-otlp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-description: 'Automatic tracing and metrics for Ruby applications. Get started at
-  cloud.solarwinds.com
-
-  '
+        version: 0.24.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.24.0
+description: Automatic tracing and metrics for Ruby applications. Get started at cloud.solarwinds.com
 email: technicalsupport@solarwinds.com
-executables:
-- solarwinds_apm_config
+executables: []
 extensions:
 - ext/oboe_metal/extconf.rb
 extra_rdoc_files:
 - LICENSE
 files:
-- ".dockerignore"
-- ".gitignore"
-- ".rubocop.yml"
-- ".whitesource"
-- ".yardopts"
-- CHANGELOG-appoptics.md
-- CHANGELOG.md
-- CONFIG.md
-- Gemfile
 - LICENSE
-- README.md
-- bin/solarwinds_apm_config
-- examples/prepend.rb
-- examples/sdk_examples.rb
-- ext/oboe_metal/README.md
 - ext/oboe_metal/extconf.rb
-- ext/oboe_metal/extconf_local.rb
-- ext/oboe_metal/lib/.keep
 - 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-x86_64.so.sha256
-- ext/oboe_metal/noop/noop.c
-- ext/oboe_metal/src/README.md
 - ext/oboe_metal/src/VERSION
 - ext/oboe_metal/src/bson/bson.h
 - ext/oboe_metal/src/bson/platform_hacks.h
-- ext/oboe_metal/src/frames.cc
-- ext/oboe_metal/src/frames.h
 - ext/oboe_metal/src/init_solarwinds_apm.cc
-- ext/oboe_metal/src/logging.cc
-- ext/oboe_metal/src/logging.h
 - ext/oboe_metal/src/oboe.h
 - ext/oboe_metal/src/oboe_api.cpp
 - ext/oboe_metal/src/oboe_api.h
 - ext/oboe_metal/src/oboe_debug.h
 - ext/oboe_metal/src/oboe_swig_wrap.cc
-- ext/oboe_metal/src/profiling.cc
-- ext/oboe_metal/src/profiling.h
-- ext/oboe_metal/test/CMakeLists.txt
-- ext/oboe_metal/test/FindGMock.cmake
-- ext/oboe_metal/test/README.md
-- ext/oboe_metal/test/frames_test.cc
-- ext/oboe_metal/test/profiling_test.cc
-- ext/oboe_metal/test/ruby_inc_dir.rb
-- ext/oboe_metal/test/ruby_prefix.rb
-- ext/oboe_metal/test/ruby_test_helper.rb
-- ext/oboe_metal/test/test.h
-- ext/oboe_metal/test/test_main.cc
-- init.rb
 - lib/oboe.rb
 - lib/oboe_metal.rb
 - lib/rails/generators/solarwinds_apm/install_generator.rb
 - lib/rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb
 - lib/solarwinds_apm.rb
 - lib/solarwinds_apm/api.rb
-- lib/solarwinds_apm/api/layerinit.rb
-- lib/solarwinds_apm/api/logging.rb
-- lib/solarwinds_apm/api/memcache.rb
-- lib/solarwinds_apm/api/metrics.rb
-- lib/solarwinds_apm/api/util.rb
+- lib/solarwinds_apm/api/current_trace_info.rb
+- lib/solarwinds_apm/api/tracing.rb
+- lib/solarwinds_apm/api/transaction_name.rb
 - lib/solarwinds_apm/base.rb
 - lib/solarwinds_apm/cert/star.appoptics.com.issuer.crt
 - lib/solarwinds_apm/config.rb
-- lib/solarwinds_apm/frameworks/grape.rb
-- lib/solarwinds_apm/frameworks/padrino.rb
-- lib/solarwinds_apm/frameworks/rails.rb
-- lib/solarwinds_apm/frameworks/rails/inst/action_controller.rb
-- lib/solarwinds_apm/frameworks/rails/inst/action_controller5.rb
-- lib/solarwinds_apm/frameworks/rails/inst/action_controller_api.rb
-- lib/solarwinds_apm/frameworks/rails/inst/action_view.rb
-- lib/solarwinds_apm/frameworks/rails/inst/active_record.rb
-- lib/solarwinds_apm/frameworks/rails/inst/connection_adapters/mysql2.rb
-- lib/solarwinds_apm/frameworks/rails/inst/connection_adapters/postgresql.rb
-- lib/solarwinds_apm/frameworks/rails/inst/connection_adapters/utils5x.rb
-- lib/solarwinds_apm/frameworks/rails/inst/logger_formatters.rb
-- lib/solarwinds_apm/frameworks/sinatra.rb
-- lib/solarwinds_apm/inst/bunny-client.rb
-- lib/solarwinds_apm/inst/bunny-consumer.rb
-- lib/solarwinds_apm/inst/curb.rb
-- lib/solarwinds_apm/inst/dalli.rb
-- lib/solarwinds_apm/inst/delayed_job.rb
-- lib/solarwinds_apm/inst/excon.rb
-- lib/solarwinds_apm/inst/faraday.rb
-- lib/solarwinds_apm/inst/graphql.rb
-- lib/solarwinds_apm/inst/grpc_client.rb
-- lib/solarwinds_apm/inst/grpc_server.rb
-- lib/solarwinds_apm/inst/httpclient.rb
-- lib/solarwinds_apm/inst/logger_formatter.rb
-- lib/solarwinds_apm/inst/logging_log_event.rb
-- lib/solarwinds_apm/inst/lumberjack_formatter.rb
-- lib/solarwinds_apm/inst/memcached.rb
-- lib/solarwinds_apm/inst/mongo.rb
-- lib/solarwinds_apm/inst/mongo2.rb
-- lib/solarwinds_apm/inst/moped.rb
-- lib/solarwinds_apm/inst/net_http.rb
-- lib/solarwinds_apm/inst/rack.rb
-- lib/solarwinds_apm/inst/rack_cache.rb
-- lib/solarwinds_apm/inst/redis.rb
-- lib/solarwinds_apm/inst/redis_v4.rb
-- lib/solarwinds_apm/inst/resque.rb
-- lib/solarwinds_apm/inst/rest-client.rb
-- lib/solarwinds_apm/inst/sequel.rb
-- lib/solarwinds_apm/inst/sidekiq-client.rb
-- lib/solarwinds_apm/inst/sidekiq-worker.rb
-- lib/solarwinds_apm/inst/typhoeus.rb
-- lib/solarwinds_apm/instrumentation.rb
-- lib/solarwinds_apm/loading.rb
+- lib/solarwinds_apm/constants.rb
 - lib/solarwinds_apm/logger.rb
 - lib/solarwinds_apm/noop/README.md
 - lib/solarwinds_apm/noop/context.rb
 - lib/solarwinds_apm/noop/metadata.rb
-- lib/solarwinds_apm/noop/profiling.rb
 - lib/solarwinds_apm/oboe_init_options.rb
-- lib/solarwinds_apm/ruby.rb
-- lib/solarwinds_apm/sdk/current_trace_info.rb
-- lib/solarwinds_apm/sdk/custom_metrics.rb
-- lib/solarwinds_apm/sdk/logging.rb
-- lib/solarwinds_apm/sdk/trace_context_headers.rb
-- lib/solarwinds_apm/sdk/tracing.rb
+- lib/solarwinds_apm/opentelemetry.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/support.rb
-- lib/solarwinds_apm/support/profiling.rb
-- lib/solarwinds_apm/support/trace_context.rb
-- lib/solarwinds_apm/support/trace_state.rb
-- lib/solarwinds_apm/support/trace_string.rb
-- lib/solarwinds_apm/support/transaction_metrics.rb
+- lib/solarwinds_apm/support/logger_formatter.rb
+- lib/solarwinds_apm/support/logging_log_event.rb
+- lib/solarwinds_apm/support/lumberjack_formatter.rb
+- lib/solarwinds_apm/support/oboe_tracing_mode.rb
+- lib/solarwinds_apm/support/swomarginalia/LICENSE
+- lib/solarwinds_apm/support/swomarginalia/README.md
+- lib/solarwinds_apm/support/swomarginalia/comment.rb
+- lib/solarwinds_apm/support/swomarginalia/load_swomarginalia.rb
+- lib/solarwinds_apm/support/swomarginalia/railtie.rb
+- lib/solarwinds_apm/support/swomarginalia/swomarginalia.rb
+- lib/solarwinds_apm/support/transaction_cache.rb
 - lib/solarwinds_apm/support/transaction_settings.rb
+- lib/solarwinds_apm/support/transformer.rb
+- lib/solarwinds_apm/support/txn_name_manager.rb
 - lib/solarwinds_apm/support/x_trace_options.rb
 - lib/solarwinds_apm/support_report.rb
-- lib/solarwinds_apm/test.rb
 - lib/solarwinds_apm/thread_local.rb
-- lib/solarwinds_apm/util.rb
 - lib/solarwinds_apm/version.rb
-- log/.keep
-- log/postgresql/.keep
-- solarwinds_apm.gemspec
-- yardoc_frontpage.md
 homepage: https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html
 licenses:
 - Apache-2.0
@@ -215,11 +155,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: SolarWindsAPM performance instrumentation gem for Ruby

data/.dockerignore

@@ -1,5 +0,0 @@
-# exclude everything by default
-*
-
-# add whitelist of includes via:
-# !somefile.txt

data/.gitignore

@@ -1,58 +0,0 @@
-!.keep
-*.gem
-*.lock
-*.log
-*.swp
-*~
-*.rdb
-.*byebug*
-.bundle/
-.env
-.irb_history
-.irbrc
-.ruby-version
-dump.rdb
-.trusted_paths/
-.yardoc/
-/app/
-builds/
-config/
-coverage/
-doc/
-ext/oboe_metal/*.o
-ext/oboe_metal/Makefile
-ext/oboe_metal/lib/liboboe*so*
-ext/oboe_metal/mkmf.log
-ext/oboe_metal/oboe_metal.so
-ext/oboe_metal/oboe_noop.so
-ext/oboe_metal/src/bson/
-ext/oboe_metal/src/oboe_api.cpp
-ext/oboe_metal/src/oboe.h
-ext/oboe_metal/src/oboe_api.h
-ext/oboe_metal/src/oboe_debug.h
-ext/oboe_metal/src/oboe_swig_wrap.cc
-ext/oboe_metal/src/VERSION_latest
-ext/oboe_metal/test/build/
-ext/oboe_metal/test/MakeFile
-ext/oboe_metal/.DS_Store
-gemfiles/*.lock
-gemfiles/.bundle/
-gemfiles/vendor*
-lib/libsolarwinds_apm.so
-vendor/
-
-# test & test script
-tmp.rb
-apm.collector.st-ssp.solarwinds.com
-test/run_tests/.ruby_version_ubuntu
-test/run_tests/.ruby_version_alpine
-test/run_tests/.ruby_version_centos
-test/run_tests/.ruby_version_ubuntu
-
-redis-test.*
-
-# compiling
-ext/oboe_metal/verify
-
-# mac DS_Store
-.DS_Store

data/.rubocop.yml

@@ -1,29 +0,0 @@
-Style/StringLiterals:
-  Description: 'Checks if uses of quotes match the configured preference.'
-  StyleGuide: '#consistent-string-literals'
-  Enabled: false
-
-Layout/LineLength:
-  Description: 'Limit lines to 80 characters.'
-  Enabled: false
-
-Naming/VariableNumber:
-  Description: 'Use the configured style when numbering variables.'
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Description: >-
-    Add the frozen_string_literal comment to the top of files
-    to help transition to frozen string literals by default.
-  Enabled: false
-
-Style/Documentation:
-  Description: 'Document classes and non-namespace modules.'
-  Enabled: false
-
-Style/WordArray:
-  EnforcedStyle: brackets
-
-Metrics/BlockLength:
-  Exclude:
-    - test/*/*_test.rb

data/.whitesource

@@ -1,22 +0,0 @@
-{
-  "scanSettings": {
-    "configMode": "AUTO",
-    "configExternalURL": "",
-    "projectToken": "",
-    "baseBranches": []
-  },
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure",
-    "displayMode": "diff",
-    "useMendCheckNames": true
-  },
-  "issueSettings": {
-    "minSeverityLevel": "LOW",
-    "issueType": "DEPENDENCY"
-  },
-  "remediateSettings": {
-    "workflowRules": {
-      "enabled": true
-    }
-  }
-}

data/.yardopts

@@ -1,7 +0,0 @@
---no-private
---readme yardoc_frontpage.md
-lib/solarwinds_apm/sdk/logging.rb
-lib/solarwinds_apm/sdk/trace_context_headers.rb
-lib/solarwinds_apm/sdk/tracing.rb
-lib/solarwinds_apm/sdk/custom_metrics.rb
-lib/solarwinds_apm/sdk/current_trace_info.rb