solarwinds_apm 6.0.0.preV4 → 6.0.0.prev6

data/lib/solarwinds_apm/oboe_init_options.rb

@@ -1,7 +1,12 @@
-# Copyright (c) 2019 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 require 'singleton'
 require 'uri'
+
 module SolarWindsAPM
   # OboeInitOptions
   class OboeInitOptions
@@ -16,7 +21,7 @@ module SolarWindsAPM
       @debug_level = (ENV['SW_APM_DEBUG_LEVEL'] || SolarWindsAPM::Config[:debug_level] || 3).to_i
       # file name including path for log file
       # TODO eventually find better way to combine ruby and oboe logs
-      @log_file_path = ENV['SW_APM_LOGFILE'] || ''
+      @log_file_path = ENV['SW_APM_LOG_FILEPATH'] || ''
       # maximum number of transaction names to track
       @max_transactions = (ENV['SW_APM_MAX_TRANSACTIONS'] || -1).to_i
       # maximum wait time for flushing data before terminating in milli seconds
@@ -45,7 +50,7 @@ module SolarWindsAPM
       # custom token bucket rate
       @token_bucket_rate = (ENV['SW_APM_TOKEN_BUCKET_RATE'] || -1).to_i
       # use single files in file reporter for each event
-      @file_single = ENV['SW_APM_REPORTER_FILE_SINGLE'].to_s.downcase == 'true' ? 1 : 0
+      @file_single = ENV['SW_APM_REPORTER_FILE_SINGLE'].to_s.casecmp('true').zero? ? 1 : 0
       # timeout for ec2 metadata
       @ec2_md_timeout = read_and_validate_ec2_md_timeout
       @grpc_proxy = read_and_validate_proxy
@@ -54,6 +59,8 @@ module SolarWindsAPM
       # hardcoded arg for trace id format to use w3c format
       # flag for format of metric (0 = Both; 1 = AppOptics only; 2 = SWO only; default = 0)
       @metric_format = determine_the_metric_model
+      # log type (0 = stderr; 1 = stdout; 2 = file; 3 = null; 4 = disabled; default = 0)
+      @log_type = determine_oboe_log_type
     end
 
     # for testing with changed ENV vars
@@ -70,7 +77,6 @@ module SolarWindsAPM
         @max_flush_wait_time,    # 4
         @events_flush_interval,  # 5
         @event_flush_batch_size, # 6
-
         @reporter,               # 7
         @host,                   # 8
         @service_key,            # 9
@@ -84,7 +90,8 @@ module SolarWindsAPM
         @ec2_md_timeout,         #17
         @grpc_proxy,             #18
         0,                       #19 arg for lambda (no lambda for ruby yet)
-        @metric_format           #22
+        @metric_format,          #20
+        @log_type                #21
       ]
     end
 
@@ -142,7 +149,10 @@ module SolarWindsAPM
       otel_resource_service_name = nil
       ENV['OTEL_RESOURCE_ATTRIBUTES']&.split(',')&.each do |pair|
         key, value = pair.split('=')
-        otel_resource_service_name = value; break if key == 'service.name'
+        if key == 'service.name'
+          otel_resource_service_name = value
+          break
+        end
       end
 
       SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] provided otel_resource_service_name #{otel_resource_service_name}"} if otel_resource_service_name
@@ -162,8 +172,9 @@ module SolarWindsAPM
       "#{token}:#{service_name}"
     end
 
+    # In case of java-collector, please provide a dummy service key
     def validate_token(token)
-      if (token !~ /^[0-9a-zA-Z_-]{71}$/) && ENV['SW_APM_COLLECTOR'] !~ /java-collector:1222/
+      unless /^[0-9a-zA-Z_-]{71}$/.match?(token)
         masked = "#{token[0..3]}...#{token[-4..]}"
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. API Token in wrong format. Masked token: #{masked}"}
         return false
@@ -173,20 +184,19 @@ module SolarWindsAPM
     end
 
     def validate_transform_service_name(service_name)
-      service_name = 'test_ssl_collector' if ENV['SW_APM_COLLECTOR'] =~ /java-collector:1222/
       if service_name.empty?
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. Service Name is missing"}
         return false
       end
 
-      name = service_name.dup
-      name.downcase!
-      name.gsub!(/[^a-z0-9.:_-]/, '')
-      name = name[0..254]
+      name_ = service_name.dup
+      name_.downcase!
+      name_.gsub!(/[^a-z0-9.:_-]/, '')
+      name_ = name_[0..254]
 
-      if name != service_name
-        SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. Service Name transformed from #{service_name} to #{name}"}
-        service_name = name
+      if name_ != service_name
+        SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY problem. Service Name transformed from #{service_name} to #{name_}"}
+        service_name = name_
       end
       @service_name = service_name # instance variable used in testing
       true
@@ -204,7 +214,7 @@ module SolarWindsAPM
       proxy = ENV['SW_APM_PROXY'] || SolarWindsAPM::Config[:http_proxy] || ''
       return proxy if proxy == ''
 
-      unless proxy =~ /http:\/\/.*:\d+$/
+      unless /http:\/\/.*:\d+$/.match?(proxy)
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_PROXY/http_proxy doesn't start with 'http://', #{proxy}"}
         return '' # try without proxy, it may work, shouldn't crash but may not report
       end
@@ -213,14 +223,15 @@ module SolarWindsAPM
     end
 
     def read_certificates
+      certificate = ''
+
       file = appoptics_collector?? "#{__dir__}/cert/star.appoptics.com.issuer.crt" : ENV['SW_APM_TRUSTEDPATH']
-      return String.new if file.nil? || file&.empty?
+      return certificate if file.nil? || file&.empty?
 
       begin
         certificate = File.open(file,"r").read
       rescue StandardError => e
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] certificates: #{file} doesn't exist or caused by #{e.message}."}
-        certificate = String.new
       end
 
       certificate
@@ -248,5 +259,12 @@ module SolarWindsAPM
       end
       ""
     end
+
+    def determine_oboe_log_type
+      log_type = 0
+      log_type = 2 unless ENV['SW_APM_LOG_FILEPATH'].to_s.empty?
+      log_type = 4 if @debug_level == -1
+      log_type
+    end
   end
 end

data/lib/solarwinds_apm/opentelemetry/solarwinds_exporter.rb

@@ -1,4 +1,9 @@
-# solarwinds_apm will use liboboe to export data to solarwinds swo
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     # SolarWindsExporter
@@ -128,7 +133,7 @@ module SolarWindsAPM
       # helper function that extract gem library version for func add_instrumented_framework
       def check_framework_version(framework)
         framework_version = nil
-        if @version_cache.keys.include? framework
+        if @version_cache.has_key?(framework)
 
           framework_version = @version_cache[framework]
         else

data/lib/solarwinds_apm/opentelemetry/solarwinds_processor.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     # reference: OpenTelemetry::SDK::Trace::SpanProcessor
@@ -125,7 +131,7 @@ module SolarWindsAPM
 
       # This span from inbound HTTP request if from a SERVER by some http.method
       def span_http?(span)
-        (span.kind == ::OpenTelemetry::Trace::SpanKind::SERVER && !span.attributes[HTTP_METHOD].nil?)
+        span.kind == ::OpenTelemetry::Trace::SpanKind::SERVER && !span.attributes[HTTP_METHOD].nil?
       end
 
       # Calculate if this span instance has_error
@@ -142,12 +148,15 @@ module SolarWindsAPM
       end
 
       # Get trans_name and url_tran of this span instance.
+      # Predecessor order: custom SDK > env var SW_APM_TRANSACTION_NAME > automatic naming
       def calculate_transaction_names(span)
         trace_span_id = "#{span.context.hex_trace_id}-#{span.context.hex_span_id}"
         trans_name = @txn_manager.get(trace_span_id)
         if trans_name
           SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] found trans name from txn_manager: #{trans_name} by #{trace_span_id}"}
           @txn_manager.del(trace_span_id)
+        elsif ENV.has_key?('SW_APM_TRANSACTION_NAME') && ENV['SW_APM_TRANSACTION_NAME'] != ''
+          trans_name =  ENV['SW_APM_TRANSACTION_NAME']
         else
           trans_name = span.attributes[HTTP_ROUTE] || nil
           trans_name = span.name if span.name && (trans_name.nil? || trans_name.empty?)

data/lib/solarwinds_apm/opentelemetry/solarwinds_propagator.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     module SolarWindsPropagator

data/lib/solarwinds_apm/opentelemetry/solarwinds_response_propagator.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     module SolarWindsResponsePropagator

data/lib/solarwinds_apm/opentelemetry/solarwinds_sampler.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     # SolarWindsSampler
@@ -266,7 +272,8 @@ module SolarWindsAPM
         SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] trace_state_no_response #{trace_state_no_response.inspect}"}
 
         trace_state_no_response = parent_span_context.tracestate.delete(XTraceOptions.sw_xtraceoptions_response_key)
-        no_sw_count             = trace_state_no_response.to_h.reject { |k, _v| k == "sw" }.count
+        no_sw_count             = trace_state_no_response.to_h.count { |k, _v| k != 'sw' }
+
         new_attributes[SW_TRACESTATE_CAPTURE_KEY] = Utils.trace_state_header(trace_state_no_response) if no_sw_count > 0 
         SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] new_attributes after add_tracestate_capture_to_new_attributes: #{new_attributes.inspect}"}
         

data/lib/solarwinds_apm/opentelemetry.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 require 'opentelemetry/sdk'
 require 'opentelemetry/instrumentation/all'
 

data/lib/solarwinds_apm/otel_config.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   # OTelConfig module
   # For configure otel component: configurable: propagator, exporter
@@ -23,20 +29,12 @@ module SolarWindsAPM
     end
 
     def self.resolve_sampler
-
-      resolve_sampler_config
+      sampler_config = {"trigger_trace" => SolarWindsAPM::Config[:trigger_tracing_mode]}
       @@config[:sampler] =
         ::OpenTelemetry::SDK::Trace::Samplers.parent_based(
-          root: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]),
-          remote_parent_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]),
-          remote_parent_not_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(@@config[:sampler_config]))
-    end
-
-    def self.resolve_sampler_config
-      sampler_config = {}
-      sampler_config["trigger_trace"] = "enabled"
-      sampler_config["trigger_trace"] = nil if ENV["SW_APM_TRIGGER_TRACING_MODE"] == 'disabled'
-      @@config[:sampler_config] = sampler_config
+          root: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config),
+          remote_parent_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config),
+          remote_parent_not_sampled: SolarWindsAPM::OpenTelemetry::SolarWindsSampler.new(sampler_config))
     end
 
     #
@@ -59,20 +57,6 @@ module SolarWindsAPM
       end
     end
 
-    def self.obfuscate_helper(instrumentation)
-      if @@config_map[instrumentation] # user provided the option
-        @@config_map[instrumentation][:db_statement] = :obfuscate unless @@config_map[instrumentation][:db_statement] # user provided the db_statement, ignore our default setting 
-      else
-        @@config_map[instrumentation] = {db_statement: :obfuscate}
-      end
-    end
-
-    def self.obfuscate_query
-      obfuscate_helper("OpenTelemetry::Instrumentation::Dalli")
-      obfuscate_helper("OpenTelemetry::Instrumentation::Mysql2")
-      obfuscate_helper("OpenTelemetry::Instrumentation::PG")
-    end
-
     def self.[](key)
       @@config[key.to_sym]
     end
@@ -126,13 +110,18 @@ module SolarWindsAPM
       resolve_solarwinds_processor
       resolve_response_propagator
 
-      obfuscate_query
-
       print_config if SolarWindsAPM.logger.level.zero?
 
       ENV['OTEL_TRACES_EXPORTER'] = 'none' if ENV['OTEL_TRACES_EXPORTER'].to_s.empty?
 
-      ::OpenTelemetry::SDK.configure { |c| c.use_all(@@config_map) }
+      if ENV['OTEL_LOG_LEVEL'].to_s.empty?
+        ::OpenTelemetry::SDK.configure do |c|
+          c.logger = ::Logger.new($stdout, level: ::SolarWindsAPM.logger.level) # sync solarwinds_apm logger to otel log
+          c.use_all(@@config_map)
+        end
+      else
+        ::OpenTelemetry::SDK.configure { |c| c.use_all(@@config_map) }
+      end
 
       validate_propagator(::OpenTelemetry.propagation.instance_variable_get(:@propagators))
 

data/lib/solarwinds_apm/support/logger_formatter.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2019 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 require 'logger'
 
@@ -16,7 +19,7 @@ module SolarWindsAPM
       private
 
       def insert_trace_id(msg)
-        return msg if msg =~ /trace_id=/
+        return msg if /trace_id=/.match?(msg)
 
         current_trace = SolarWindsAPM::API.current_trace_info
         if current_trace.do_log

data/lib/solarwinds_apm/support/logging_log_event.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2019 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 require_relative 'logger_formatter'
 

data/lib/solarwinds_apm/support/lumberjack_formatter.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2023 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 require_relative 'logger_formatter'
 

data/lib/solarwinds_apm/support/oboe_tracing_mode.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   module OpenTelemetry
     # OboeTracingMode
@@ -11,15 +17,15 @@ module SolarWindsAPM
 
       def self.get_oboe_trace_mode(tracing_mode)
         mode = OBOE_SETTINGS_UNSET
-        mode = OBOE_TRACE_ENABLED if tracing_mode == 'enabled'
-        mode = OBOE_TRACE_DISABLED if tracing_mode == 'disabled'
+        mode = OBOE_TRACE_ENABLED if tracing_mode == :enabled
+        mode = OBOE_TRACE_DISABLED if tracing_mode == :disabled
         mode
       end
 
       def self.get_oboe_trigger_trace_mode(trigger_trace_mode)
         mode = OBOE_SETTINGS_UNSET
-        mode = OBOE_TRIGGER_ENABLED if trigger_trace_mode == 'enabled'
-        mode = OBOE_TRIGGER_DISABLED if trigger_trace_mode == 'disabled'
+        mode = OBOE_TRIGGER_ENABLED if trigger_trace_mode == :enabled
+        mode = OBOE_TRIGGER_DISABLED if trigger_trace_mode == :disabled
         mode
       end
     end

data/lib/solarwinds_apm/support/swomarginalia/README.md

@@ -38,4 +38,4 @@ Post Load (1.1ms)  SELECT `posts`.* FROM `posts` /*application=SqlcommenterRails
 ```
 
 ## License
-This project is licensed under the [MIT License](https://github.com/solarwindscloud/swotel-ruby/tree/main/lib/solarwinds_apm/support/swomarginalia/LICENSE).
+This project is licensed under the [MIT License](https://github.com/solarwinds/apm-ruby/blob/main/lib/solarwinds_apm/support/swomarginalia/LICENSE).

data/lib/solarwinds_apm/support/swomarginalia/comment.rb

@@ -9,7 +9,7 @@ module SolarWindsAPM
       mattr_accessor :components, :lines_to_ignore, :prepend_comment
       SWOMarginalia::Comment.components ||= [:traceparent]
       # To add new components: 
-      # Create file and load after swotel-ruby, and add following:
+      # Create file and load after loading solarwinds_apm, and add following:
       # SolarWindsAPM::SWOMarginalia::Comment.component = [:user_defined]
 
       def self.update!(controller=nil)
@@ -25,7 +25,7 @@ module SolarWindsAPM
       end
 
       def self.construct_comment
-        ret = String.new
+        ret = +''
         components.each do |c|
           component_value = send(c)
           ret << "#{c}='#{component_value}'," if component_value.present?
@@ -107,7 +107,7 @@ module SolarWindsAPM
         marginalia_job["class"] if marginalia_job.respond_to?(:[])
       end
 
-      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}
+      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}.freeze # rubocop:disable Style/RedundantFreeze
 
       def self.line
         SWOMarginalia::Comment.lines_to_ignore ||= DEFAULT_LINES_TO_IGNORE_REGEX

data/lib/solarwinds_apm/support/swomarginalia/load_swomarginalia.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 require_relative './swomarginalia'
 
 module SolarWindsAPM

data/lib/solarwinds_apm/support/swomarginalia/swomarginalia.rb

@@ -79,7 +79,7 @@ module SolarWindsAPM
 
     def self.with_annotation(comment, &block)
       SWOMarginalia::Comment.inline_annotations.push(comment)
-      block.call if block.present?
+      yield if block.present?
     ensure
       SWOMarginalia::Comment.inline_annotations.pop
     end

data/lib/solarwinds_apm/support/transaction_cache.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   # LRU TransactionCache with initial limit 1000
   module TransactionCache

data/lib/solarwinds_apm/support/transaction_settings.rb

@@ -1,6 +1,9 @@
-# Copyright (c) 2018 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   ##
   # This module helps with setting up the transaction filters and applying them
@@ -18,15 +21,11 @@ module SolarWindsAPM
     # calculate trace mode to set either 1 or 0 based on url_path and name+kind
     # first check if url_path match, if not match, then match the name+kind
     def calculate_trace_mode
-      tracing_mode_enabled? && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
+      SolarWindsAPM::Config[:tracing_mode] == :enabled && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
     end
 
     private
 
-    def tracing_mode_enabled?
-      SolarWindsAPM::Config[:tracing_mode] && ![:disabled, :never].include?(SolarWindsAPM::Config[:tracing_mode])
-    end
-
     def tracing_enabled?
       span_layer = "#{@kind}:#{@name}"
 

data/lib/solarwinds_apm/support/txn_name_manager.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   # SolarWindsTxnNameManager
   class TxnNameManager

data/lib/solarwinds_apm/support/utils.rb

@@ -1,3 +1,9 @@
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 module SolarWindsAPM
   # Utils
   class Utils

data/lib/solarwinds_apm/support/x_trace_options.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2019 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 module SolarWindsAPM
   # XTraceOptions

data/lib/solarwinds_apm/support.rb

@@ -1,8 +1,10 @@
-# Copyright (c) 2023 SolarWinds, LLC.
-# All rights reserved.
+# © 2023 SolarWinds Worldwide, LLC. All rights reserved.
 #
-# This file is for loading support library
+# 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
 #
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+# This file is for loading support library
 
 require_relative './support/logger_formatter'
 require_relative './support/logging_log_event'

data/lib/solarwinds_apm/support_report.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 require 'rbconfig'
 require 'logger'
@@ -82,7 +85,7 @@ module SolarWindsAPM
     SolarWindsAPM.logger.warn '********************************************************'
     SolarWindsAPM.logger.warn '* END SolarWindsAPM Support Report'
     SolarWindsAPM.logger.warn '*   Support Email: technicalsupport@solarwinds.com'
-    SolarWindsAPM.logger.warn '*   Github: https://github.com/solarwindscloud/swotel-ruby'
+    SolarWindsAPM.logger.warn '*   Github: https://github.com/solarwinds/apm-ruby'
     SolarWindsAPM.logger.warn '********************************************************'
 
     SolarWindsAPM.logger.level = @logger_level

data/lib/solarwinds_apm/thread_local.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 module SolarWindsAPM
   ##

data/lib/solarwinds_apm/version.rb

@@ -1,5 +1,8 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
+# © 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
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 module SolarWindsAPM
   ##
@@ -9,7 +12,7 @@ module SolarWindsAPM
     MAJOR  = 6 # breaking,
     MINOR  = 0 # feature,
     PATCH  = 0 # fix => BFF
-    PRE    = 'preV4'.freeze # for pre-releases into packagecloud, set to nil for production releases into rubygems
+    PRE    = 'prev6'.freeze
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end