Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frozen string literals #3392

Merged
merged 5 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
226 changes: 0 additions & 226 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,229 +144,3 @@ Style/ClassVars:
- 'spec/datadog/tracing/contrib/rails/support/rails4.rb'
- 'spec/datadog/tracing/contrib/rails/support/rails5.rb'
- 'spec/datadog/tracing/contrib/rails/support/rails6.rb'

# Offense count: 223
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Style/FrozenStringLiteralComment:
Exclude:
- 'lib/datadog/appsec/assets.rb'
- 'lib/datadog/appsec/autoload.rb'
- 'lib/datadog/appsec/contrib/rack/gateway/watcher.rb'
- 'lib/datadog/appsec/contrib/rack/integration.rb'
- 'lib/datadog/appsec/contrib/rack/request_middleware.rb'
- 'lib/datadog/appsec/contrib/rails/gateway/watcher.rb'
- 'lib/datadog/appsec/contrib/rails/integration.rb'
- 'lib/datadog/appsec/contrib/rails/patcher.rb'
- 'lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb'
- 'lib/datadog/appsec/contrib/sinatra/integration.rb'
- 'lib/datadog/appsec/contrib/sinatra/patcher.rb'
- 'lib/datadog/appsec/event.rb'
- 'lib/datadog/appsec/rate_limiter.rb'
- 'lib/datadog/appsec/utils/http/media_range.rb'
- 'lib/datadog/appsec/utils/http/media_type.rb'
- 'lib/datadog/core/configuration.rb'
- 'lib/datadog/core/configuration/agent_settings_resolver.rb'
- 'lib/datadog/core/configuration/base.rb'
- 'lib/datadog/core/configuration/components.rb'
- 'lib/datadog/core/configuration/settings.rb'
- 'lib/datadog/core/encoding.rb'
- 'lib/datadog/core/environment/cgroup.rb'
- 'lib/datadog/core/environment/container.rb'
- 'lib/datadog/core/environment/platform.rb'
- 'lib/datadog/core/logger.rb'
- 'lib/datadog/core/metrics/client.rb'
- 'lib/datadog/core/metrics/logging.rb'
- 'lib/datadog/core/metrics/options.rb'
- 'lib/datadog/core/pin.rb'
- 'lib/datadog/core/runtime/metrics.rb'
- 'lib/datadog/core/telemetry/emitter.rb'
- 'lib/datadog/core/telemetry/http/adapters/net.rb'
- 'lib/datadog/core/telemetry/http/response.rb'
- 'lib/datadog/core/telemetry/v1/application.rb'
- 'lib/datadog/core/telemetry/v1/configuration.rb'
- 'lib/datadog/core/telemetry/v1/dependency.rb'
- 'lib/datadog/core/telemetry/v1/integration.rb'
- 'lib/datadog/core/telemetry/v1/telemetry_request.rb'
- 'lib/datadog/core/utils.rb'
- 'lib/datadog/core/utils/forking.rb'
- 'lib/datadog/core/utils/safe_dup.rb'
- 'lib/datadog/core/workers/async.rb'
- 'lib/datadog/core/workers/polling.rb'
- 'lib/datadog/opentracer/distributed_headers.rb'
- 'lib/datadog/opentracer/rack_propagator.rb'
- 'lib/datadog/opentracer/span.rb'
- 'lib/datadog/opentracer/text_map_propagator.rb'
- 'lib/datadog/opentracer/thread_local_scope_manager.rb'
- 'lib/datadog/opentracer/tracer.rb'
- 'lib/datadog/profiling.rb'
- 'lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb'
- 'lib/datadog/profiling/collectors/idle_sampling_helper.rb'
- 'lib/datadog/profiling/exporter.rb'
- 'lib/datadog/profiling/ext/forking.rb'
- 'lib/datadog/profiling/http_transport.rb'
- 'lib/datadog/profiling/load_native_extension.rb'
- 'lib/datadog/profiling/profiler.rb'
- 'lib/datadog/profiling/scheduler.rb'
- 'lib/datadog/profiling/stack_recorder.rb'
- 'lib/datadog/profiling/tasks/exec.rb'
- 'lib/datadog/profiling/tasks/help.rb'
- 'lib/datadog/profiling/tasks/setup.rb'
- 'lib/datadog/tracing/buffer.rb'
- 'lib/datadog/tracing/configuration/settings.rb'
- 'lib/datadog/tracing/context_provider.rb'
- 'lib/datadog/tracing/contrib/action_cable/events/broadcast.rb'
- 'lib/datadog/tracing/contrib/action_cable/events/perform_action.rb'
- 'lib/datadog/tracing/contrib/action_cable/events/transmit.rb'
- 'lib/datadog/tracing/contrib/action_cable/instrumentation.rb'
- 'lib/datadog/tracing/contrib/action_cable/integration.rb'
- 'lib/datadog/tracing/contrib/action_mailer/events/deliver.rb'
- 'lib/datadog/tracing/contrib/action_mailer/events/process.rb'
- 'lib/datadog/tracing/contrib/action_mailer/integration.rb'
- 'lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb'
- 'lib/datadog/tracing/contrib/action_pack/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/action_pack/integration.rb'
- 'lib/datadog/tracing/contrib/action_pack/utils.rb'
- 'lib/datadog/tracing/contrib/action_view/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/action_view/events/render_partial.rb'
- 'lib/datadog/tracing/contrib/action_view/events/render_template.rb'
- 'lib/datadog/tracing/contrib/action_view/integration.rb'
- 'lib/datadog/tracing/contrib/action_view/patcher.rb'
- 'lib/datadog/tracing/contrib/action_view/utils.rb'
- 'lib/datadog/tracing/contrib/active_job/events/discard.rb'
- 'lib/datadog/tracing/contrib/active_job/events/enqueue.rb'
- 'lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb'
- 'lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb'
- 'lib/datadog/tracing/contrib/active_job/events/perform.rb'
- 'lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb'
- 'lib/datadog/tracing/contrib/active_job/integration.rb'
- 'lib/datadog/tracing/contrib/active_model_serializers/events/render.rb'
- 'lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb'
- 'lib/datadog/tracing/contrib/active_model_serializers/integration.rb'
- 'lib/datadog/tracing/contrib/active_record/configuration/makara_resolver.rb'
- 'lib/datadog/tracing/contrib/active_record/configuration/resolver.rb'
- 'lib/datadog/tracing/contrib/active_record/events/instantiation.rb'
- 'lib/datadog/tracing/contrib/active_record/events/sql.rb'
- 'lib/datadog/tracing/contrib/active_record/integration.rb'
- 'lib/datadog/tracing/contrib/active_record/utils.rb'
- 'lib/datadog/tracing/contrib/active_support/integration.rb'
- 'lib/datadog/tracing/contrib/active_support/notifications/subscription.rb'
- 'lib/datadog/tracing/contrib/aws/integration.rb'
- 'lib/datadog/tracing/contrib/aws/parsed_context.rb'
- 'lib/datadog/tracing/contrib/aws/services.rb'
- 'lib/datadog/tracing/contrib/concurrent_ruby/integration.rb'
- 'lib/datadog/tracing/contrib/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/dalli/instrumentation.rb'
- 'lib/datadog/tracing/contrib/dalli/integration.rb'
- 'lib/datadog/tracing/contrib/dalli/quantize.rb'
- 'lib/datadog/tracing/contrib/delayed_job/integration.rb'
- 'lib/datadog/tracing/contrib/elasticsearch/integration.rb'
- 'lib/datadog/tracing/contrib/elasticsearch/patcher.rb'
- 'lib/datadog/tracing/contrib/elasticsearch/quantize.rb'
- 'lib/datadog/tracing/contrib/ethon/easy_patch.rb'
- 'lib/datadog/tracing/contrib/ethon/integration.rb'
- 'lib/datadog/tracing/contrib/excon/integration.rb'
- 'lib/datadog/tracing/contrib/excon/middleware.rb'
- 'lib/datadog/tracing/contrib/extensions.rb'
- 'lib/datadog/tracing/contrib/faraday/integration.rb'
- 'lib/datadog/tracing/contrib/faraday/middleware.rb'
- 'lib/datadog/tracing/contrib/faraday/patcher.rb'
- 'lib/datadog/tracing/contrib/grape/endpoint.rb'
- 'lib/datadog/tracing/contrib/grape/instrumentation.rb'
- 'lib/datadog/tracing/contrib/grape/integration.rb'
- 'lib/datadog/tracing/contrib/graphql/integration.rb'
- 'lib/datadog/tracing/contrib/graphql/patcher.rb'
- 'lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb'
- 'lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb'
- 'lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb'
- 'lib/datadog/tracing/contrib/grpc/integration.rb'
- 'lib/datadog/tracing/contrib/hanami/integration.rb'
- 'lib/datadog/tracing/contrib/http/instrumentation.rb'
- 'lib/datadog/tracing/contrib/httpclient/instrumentation.rb'
- 'lib/datadog/tracing/contrib/httpclient/integration.rb'
- 'lib/datadog/tracing/contrib/httpclient/patcher.rb'
- 'lib/datadog/tracing/contrib/httprb/instrumentation.rb'
- 'lib/datadog/tracing/contrib/httprb/integration.rb'
- 'lib/datadog/tracing/contrib/httprb/patcher.rb'
- 'lib/datadog/tracing/contrib/kafka/events/connection/request.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb'
- 'lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb'
- 'lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb'
- 'lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb'
- 'lib/datadog/tracing/contrib/kafka/integration.rb'
- 'lib/datadog/tracing/contrib/lograge/integration.rb'
- 'lib/datadog/tracing/contrib/mongodb/integration.rb'
- 'lib/datadog/tracing/contrib/mongodb/parsers.rb'
- 'lib/datadog/tracing/contrib/mongodb/subscribers.rb'
- 'lib/datadog/tracing/contrib/mysql2/integration.rb'
- 'lib/datadog/tracing/contrib/patcher.rb'
- 'lib/datadog/tracing/contrib/pg/integration.rb'
- 'lib/datadog/tracing/contrib/presto/instrumentation.rb'
- 'lib/datadog/tracing/contrib/presto/integration.rb'
- 'lib/datadog/tracing/contrib/presto/patcher.rb'
- 'lib/datadog/tracing/contrib/propagation/sql_comment.rb'
- 'lib/datadog/tracing/contrib/racecar/events/batch.rb'
- 'lib/datadog/tracing/contrib/racecar/events/consume.rb'
- 'lib/datadog/tracing/contrib/racecar/events/message.rb'
- 'lib/datadog/tracing/contrib/racecar/integration.rb'
- 'lib/datadog/tracing/contrib/rack/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/rack/header_collection.rb'
- 'lib/datadog/tracing/contrib/rack/integration.rb'
- 'lib/datadog/tracing/contrib/rack/middlewares.rb'
- 'lib/datadog/tracing/contrib/rack/patcher.rb'
- 'lib/datadog/tracing/contrib/rack/request_queue.rb'
- 'lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb'
- 'lib/datadog/tracing/contrib/rails/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/rails/integration.rb'
- 'lib/datadog/tracing/contrib/rails/log_injection.rb'
- 'lib/datadog/tracing/contrib/rails/patcher.rb'
- 'lib/datadog/tracing/contrib/rails/railtie.rb'
- 'lib/datadog/tracing/contrib/rake/instrumentation.rb'
- 'lib/datadog/tracing/contrib/rake/integration.rb'
- 'lib/datadog/tracing/contrib/redis/configuration/resolver.rb'
- 'lib/datadog/tracing/contrib/redis/instrumentation.rb'
- 'lib/datadog/tracing/contrib/redis/integration.rb'
- 'lib/datadog/tracing/contrib/redis/patcher.rb'
- 'lib/datadog/tracing/contrib/redis/trace_middleware.rb'
- 'lib/datadog/tracing/contrib/resque/integration.rb'
- 'lib/datadog/tracing/contrib/rest_client/integration.rb'
- 'lib/datadog/tracing/contrib/semantic_logger/integration.rb'
- 'lib/datadog/tracing/contrib/sequel/database.rb'
- 'lib/datadog/tracing/contrib/sequel/integration.rb'
- 'lib/datadog/tracing/contrib/sequel/utils.rb'
- 'lib/datadog/tracing/contrib/shoryuken/integration.rb'
- 'lib/datadog/tracing/contrib/sidekiq/integration.rb'
- 'lib/datadog/tracing/contrib/sinatra/configuration/settings.rb'
- 'lib/datadog/tracing/contrib/sinatra/env.rb'
- 'lib/datadog/tracing/contrib/sinatra/framework.rb'
- 'lib/datadog/tracing/contrib/sinatra/integration.rb'
- 'lib/datadog/tracing/contrib/sinatra/tracer.rb'
- 'lib/datadog/tracing/contrib/status_code_matcher.rb'
- 'lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb'
- 'lib/datadog/tracing/contrib/sucker_punch/integration.rb'
- 'lib/datadog/tracing/contrib/utils/quantization/hash.rb'
- 'lib/datadog/tracing/contrib/utils/quantization/http.rb'
- 'lib/datadog/tracing/correlation.rb'
- 'lib/datadog/tracing/event.rb'
- 'lib/datadog/tracing/metadata/tagging.rb'
- 'lib/datadog/tracing/pipeline.rb'
- 'lib/datadog/tracing/sampling/rate_by_key_sampler.rb'
- 'lib/datadog/tracing/sampling/rate_by_service_sampler.rb'
- 'lib/datadog/tracing/sampling/rate_limiter.rb'
- 'lib/datadog/tracing/sampling/rate_sampler.rb'
- 'lib/datadog/tracing/sampling/rule.rb'
- 'lib/datadog/tracing/sampling/rule_sampler.rb'
- 'lib/datadog/tracing/sampling/sampler.rb'
- 'lib/datadog/tracing/span_operation.rb'
- 'lib/datadog/tracing/trace_operation.rb'
- 'lib/datadog/tracing/trace_segment.rb'
- 'lib/datadog/tracing/tracer.rb'
- 'lib/datadog/tracing/workers.rb'
- 'lib/datadog/tracing/workers/trace_writer.rb'
- 'lib/datadog/tracing/writer.rb'
- 'lib/ddtrace/profiling/preload.rb'
2 changes: 2 additions & 0 deletions lib/datadog/appsec/assets.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'pathname'

module Datadog
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/autoload.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

if %w[1 true].include?((ENV['DD_APPSEC_ENABLED'] || '').downcase)
begin
require_relative 'contrib/auto_instrument'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/rack/gateway/watcher.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../../../instrumentation/gateway'
require_relative '../../../reactive/operation'
require_relative '../reactive/request'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/rack/integration.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../integration'

require_relative 'patcher'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/rack/request_middleware.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'json'

require_relative 'gateway/request'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/rails/gateway/watcher.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../../../instrumentation/gateway'
require_relative '../../../reactive/operation'
require_relative '../reactive/action'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/rails/integration.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../integration'

require_relative 'patcher'
Expand Down
4 changes: 3 additions & 1 deletion lib/datadog/appsec/contrib/rails/patcher.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../../../core/utils/only_once'

require_relative '../patcher'
Expand Down Expand Up @@ -137,7 +139,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_initialize
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../../../instrumentation/gateway'
require_relative '../../../reactive/operation'
require_relative '../../rack/reactive/request_body'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/sinatra/integration.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../integration'

require_relative 'patcher'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/contrib/sinatra/patcher.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative '../../../tracing/contrib/rack/middlewares'

require_relative '../patcher'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/event.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'json'
require 'zlib'
require 'base64'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/appsec/rate_limiter.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Datadog
module AppSec
# Simple per-thread rate limiter
Expand Down
6 changes: 4 additions & 2 deletions lib/datadog/appsec/utils/http/media_range.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative 'media_type'

module Datadog
Expand All @@ -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
Expand Down Expand Up @@ -184,7 +186,7 @@ def wildcard?(field = nil)
end

def to_s
s = "#{@type}/#{@subtype}"
s = +"#{@type}/#{@subtype}"

s << ';' << @parameters.map { |k, v| "#{k}=#{v}" }.join(';') if @parameters.count > 0
s << ";q=#{@quality}" if @quality < 1.0
Expand Down
6 changes: 4 additions & 2 deletions lib/datadog/appsec/utils/http/media_type.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Datadog
module AppSec
module Utils
Expand All @@ -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
Expand Down Expand Up @@ -72,7 +74,7 @@ def initialize(media_type)
end

def to_s
s = "#{@type}/#{@subtype}"
s = +"#{@type}/#{@subtype}"

s << ';' << @parameters.map { |k, v| "#{k}=#{v}" }.join(';') if @parameters.count > 0

Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/core/configuration.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative 'configuration/components'
require_relative 'configuration/settings'
require_relative 'telemetry/emitter'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/core/configuration/agent_settings_resolver.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'uri'

require_relative 'settings'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/core/configuration/base.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative 'options'

module Datadog
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/core/configuration/components.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require_relative 'agent_settings_resolver'
require_relative 'ext'
require_relative '../diagnostics/environment_logger'
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog/core/configuration/settings.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'logger'

require_relative 'base'
Expand Down
Loading
Loading