Merge branch 'master' into ivoanjo/prof-6447-improve-mysql2-issue-det…

…ection

.gitlab/benchmarks.yml

@@ -14,10 +14,8 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always
     - when: manual
-
   # If you have a problem with Gitlab cache, see Troubleshooting section in Benchmarking Platform docs
   image: $GITLAB_BENCHMARKS_CI_IMAGE
-
   script:
     - export ARTIFACTS_DIR="$(pwd)/reports" && (mkdir "${ARTIFACTS_DIR}" || :)
     - export DD_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.dd_api_key --with-decryption --query "Parameter.Value" --out text)
@@ -34,6 +32,10 @@ variables:
     FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
     DD_RELENV_DDTRACE_COMMIT_ID: $CI_COMMIT_SHORT_SHA
     K6_RUN_ID_PREFIX: ci_rb
+  # Workaround: Currently we're not running the benchmarks on every PR, but GitHub still shows them as pending.
+  # By marking the benchmarks as allow_failure, this should go away. (This workaround should be removed once the
+  # benchmarks get changed to run on every PR)
+  allow_failure: true
 
 baseline-benchmarks:
   extends: .benchmarks

Steepfile

@@ -648,8 +648,6 @@ target :ddtrace do
   library 'base64'
   library 'digest'
 
-  # TODO: gem 'libddwaf'
-
   repo_path 'vendor/rbs'
   library 'ffi'
   library 'jruby'
@@ -659,4 +657,7 @@ target :ddtrace do
   library 'google-protobuf'
   library 'protobuf-cucumber'
   library 'mysql2'
+
+  # TODO: gem 'libddwaf'
+  library 'libddwaf'
 end

lib/datadog/appsec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'appsec/configuration'
 require_relative 'appsec/extensions'
 

lib/datadog/appsec/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Datadog

lib/datadog/appsec/autoload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if %w[1 true].include?((ENV['DD_APPSEC_ENABLED'] || '').downcase)
   begin
     require_relative 'contrib/auto_instrument'

lib/datadog/appsec/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'configuration/settings'
 
 module Datadog

lib/datadog/appsec/contrib/auto_instrument.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../core/configuration/base'
 
 module Datadog

lib/datadog/appsec/contrib/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/rack/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

lib/datadog/appsec/contrib/rack/ext.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib
       module Rack
         # Rack integration constants
         module Ext
-          APP = 'rack'.freeze
-          ENV_ENABLED = 'DD_TRACE_RACK_ENABLED'.freeze # TODO: DD_APPSEC?
+          APP = 'rack'
+          ENV_ENABLED = 'DD_TRACE_RACK_ENABLED' # TODO: DD_APPSEC?
         end
       end
     end

lib/datadog/appsec/contrib/rack/gateway/watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../instrumentation/gateway'
 require_relative '../../../reactive/operation'
 require_relative '../reactive/request'

lib/datadog/appsec/contrib/rack/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../integration'
 
 require_relative 'configuration/settings'

lib/datadog/appsec/contrib/rack/patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative '../../monitor'
 require_relative 'gateway/watcher'

lib/datadog/appsec/contrib/rack/request_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 require_relative 'gateway/request'

lib/datadog/appsec/contrib/rails/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

lib/datadog/appsec/contrib/rails/ext.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib
       module Rails
         # Rack integration constants
         module Ext
-          APP = 'rails'.freeze
-          ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'.freeze
+          APP = 'rails'
+          ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
         end
       end
     end

lib/datadog/appsec/contrib/rails/framework.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/rails/gateway/watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../instrumentation/gateway'
 require_relative '../../../reactive/operation'
 require_relative '../reactive/action'

lib/datadog/appsec/contrib/rails/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../integration'
 
 require_relative 'configuration/settings'

lib/datadog/appsec/contrib/rails/patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../core/utils/only_once'
 
 require_relative '../patcher'
@@ -131,7 +133,7 @@ def method_missing(_op, *args) # rubocop:disable Style/MissingRespondToMissing
           end
 
           def inspect_middlewares(app)
-            Datadog.logger.debug { 'Rails middlewares: ' << app.middleware.map(&:inspect).inspect }
+            Datadog.logger.debug { "Rails middlewares: #{app.middleware.map(&:inspect).inspect}" }
           end
 
           def patch_after_intialize

lib/datadog/appsec/contrib/rails/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/rails/request_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/sinatra/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

lib/datadog/appsec/contrib/sinatra/ext.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib
       module Sinatra
         # Sinatra integration constants
         module Ext
-          APP = 'sinatra'.freeze
-          ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'.freeze
+          APP = 'sinatra'
+          ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
           ROUTE_INTERRUPT = :datadog_appsec_contrib_sinatra_route_interrupt
         end
       end

lib/datadog/appsec/contrib/sinatra/framework.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../instrumentation/gateway'
 require_relative '../../../reactive/operation'
 require_relative '../../rack/reactive/request_body'

lib/datadog/appsec/contrib/sinatra/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../integration'
 
 require_relative 'configuration/settings'

lib/datadog/appsec/contrib/sinatra/patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../tracing/contrib/rack/middlewares'
 
 require_relative '../patcher'

lib/datadog/appsec/contrib/sinatra/request_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Contrib

lib/datadog/appsec/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 require_relative 'rate_limiter'

lib/datadog/appsec/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'configuration'
 
 module Datadog

lib/datadog/appsec/rate_limiter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     # Simple per-thread rate limiter

lib/datadog/appsec/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'assets'
 require_relative 'utils/http/media_range'
 

lib/datadog/appsec/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     # Utilities for AppSec

lib/datadog/appsec/utils/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Utils

lib/datadog/appsec/utils/http/media_range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'media_type'
 
 module Datadog
@@ -9,7 +11,7 @@ class MediaRange
           class ParseError < ::StandardError
           end
 
-          WILDCARD = '*'.freeze
+          WILDCARD = '*'
           WILDCARD_RE = ::Regexp.escape(WILDCARD)
 
           # See: https://www.rfc-editor.org/rfc/rfc7230#section-3.2.6
@@ -184,7 +186,7 @@ def wildcard?(field = nil)
           end
 
           def to_s
-            s = "#{@type}/#{@subtype}"
+            s = "#{@type}/#{@subtype}".dup
 
             s << ';' << @parameters.map { |k, v| "#{k}=#{v}" }.join(';') if @parameters.count > 0
             s << ";q=#{@quality}" if @quality < 1.0

lib/datadog/appsec/utils/http/media_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module AppSec
     module Utils
@@ -11,7 +13,7 @@ class MediaType
           class ParseError < ::StandardError
           end
 
-          WILDCARD = '*'.freeze
+          WILDCARD = '*'
 
           # See: https://www.rfc-editor.org/rfc/rfc7230#section-3.2.6
           TOKEN_RE = /[-#$%&'*+.^_`|~A-Za-z0-9]+/.freeze
@@ -72,7 +74,7 @@ def initialize(media_type)
           end
 
           def to_s
-            s = "#{@type}/#{@subtype}"
+            s = "#{@type}/#{@subtype}".dup
 
             s << ';' << @parameters.map { |k, v| "#{k}=#{v}" }.join(';') if @parameters.count > 0
 

lib/datadog/ci.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'core'
 require_relative 'tracing'
 require_relative 'tracing/contrib'

lib/datadog/ci/configuration/components.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../flush'
 
 module Datadog

lib/datadog/ci/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ext/settings'
 
 module Datadog

lib/datadog/ci/contrib/cucumber/configuration/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../tracing/contrib/configuration/settings'
 require_relative '../ext'
 

lib/datadog/ci/contrib/cucumber/ext.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module Datadog
   module CI
     module Contrib
       module Cucumber
         # Cucumber integration constants
         # TODO: mark as `@public_api` when GA, to protect from resource and tag name changes.
         module Ext
-          APP = 'cucumber'.freeze
-          ENV_ENABLED = 'DD_TRACE_CUCUMBER_ENABLED'.freeze
-          ENV_OPERATION_NAME = 'DD_TRACE_CUCUMBER_OPERATION_NAME'.freeze
-          FRAMEWORK = 'cucumber'.freeze
-          OPERATION_NAME = 'cucumber.test'.freeze
-          SERVICE_NAME = 'cucumber'.freeze
-          STEP_SPAN_TYPE = 'step'.freeze
-          TEST_TYPE = 'test'.freeze
+          APP = 'cucumber'
+          ENV_ENABLED = 'DD_TRACE_CUCUMBER_ENABLED'
+          ENV_OPERATION_NAME = 'DD_TRACE_CUCUMBER_OPERATION_NAME'
+          FRAMEWORK = 'cucumber'
+          OPERATION_NAME = 'cucumber.test'
+          SERVICE_NAME = 'cucumber'
+          STEP_SPAN_TYPE = 'step'
+          TEST_TYPE = 'test'
         end
       end
     end

lib/datadog/ci/contrib/cucumber/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test'
 require_relative '../../ext/app_types'
 require_relative '../../ext/environment'