Skip to content

Commit

Permalink
inject
Browse files Browse the repository at this point in the history
  • Loading branch information
p committed Feb 18, 2025
1 parent a30f07c commit d9d0dba
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions lib/datadog/tracing/sync_writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module Tracing
# @public_api
class SyncWriter
attr_reader \
:logger,
:events,
:transport

Expand All @@ -25,7 +26,9 @@ class SyncWriter
# @param [Hash<Symbol,Object>] transport_options options for the default transport instance.
# @param [Datadog::Tracing::Configuration::AgentSettingsResolver::AgentSettings] agent_settings agent options for
# the default transport instance.
def initialize(transport: nil, transport_options: {}, agent_settings: nil)
def initialize(transport: nil, transport_options: {}, agent_settings: nil, logger: Datadog.logger)
@logger = logger

@transport = transport || begin
transport_options[:agent_settings] = agent_settings if agent_settings
Transport::HTTP.default(**transport_options)
Expand All @@ -40,7 +43,7 @@ def initialize(transport: nil, transport_options: {}, agent_settings: nil)
def write(trace)
flush_trace(trace)
rescue => e
Datadog.logger.debug(e)
logger.debug(e)
end

# Does nothing.
Expand Down
5 changes: 4 additions & 1 deletion lib/datadog/tracing/workers/trace_writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ module Workers
# Writes traces to transport synchronously
class TraceWriter < Core::Worker
attr_reader \
:logger,
:transport

# rubocop:disable Lint/MissingSuper
def initialize(options = {})
@logger = options[:logger] || Datadog.logger

transport_options = options.fetch(:transport_options, {})

transport_options[:agent_settings] = options[:agent_settings] if options.key?(:agent_settings)
Expand All @@ -43,7 +46,7 @@ def write_traces(traces)
traces = process_traces(traces)
flush_traces(traces)
rescue StandardError => e
Datadog.logger.warn(
logger.warn(
"Error while writing traces: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/datadog/tracing/writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Writer
:events

def initialize(options = {})
@logger = options.fetch(:logger, Datadog.logger)
@logger = options[:logger] || Datadog.logger

# writer and transport parameters
@buff_size = options.fetch(:buffer_size, Workers::AsyncTransport::DEFAULT_BUFFER_MAX_SIZE)
Expand Down

0 comments on commit d9d0dba

Please sign in to comment.