diff --git a/lib/datadog/core/remote/transport/http.rb b/lib/datadog/core/remote/transport/http.rb index b347eb3d85e..fbb7f92fc59 100644 --- a/lib/datadog/core/remote/transport/http.rb +++ b/lib/datadog/core/remote/transport/http.rb @@ -135,33 +135,6 @@ def default_adapter Datadog::Core::Transport::Ext::HTTP::ADAPTER end - def default_hostname(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_hostname for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.hostname - end - - def default_port(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_hostname for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.port - end - - def default_url(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_url for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - nil - end - # Add adapters to registry Builder::REGISTRY.set(Datadog::Core::Transport::HTTP::Adapters::Net, Datadog::Core::Transport::Ext::HTTP::ADAPTER) Builder::REGISTRY.set( diff --git a/lib/datadog/tracing/transport/http.rb b/lib/datadog/tracing/transport/http.rb index 67ef18aa167..55ed4872e82 100644 --- a/lib/datadog/tracing/transport/http.rb +++ b/lib/datadog/tracing/transport/http.rb @@ -84,33 +84,6 @@ def default_adapter Datadog::Core::Transport::Ext::HTTP::ADAPTER end - def default_hostname(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_hostname for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.hostname - end - - def default_port(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_hostname for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.port - end - - def default_url(logger: Datadog.logger) - logger.warn( - 'Deprecated for removal: Using #default_url for configuration is deprecated and will ' \ - 'be removed on a future ddtrace release.' - ) - - nil - end - # Add adapters to registry Builder::REGISTRY.set(Datadog::Core::Transport::HTTP::Adapters::Net, Datadog::Core::Transport::Ext::HTTP::ADAPTER) Builder::REGISTRY.set(Datadog::Core::Transport::HTTP::Adapters::Test, Datadog::Core::Transport::Ext::Test::ADAPTER) diff --git a/spec/datadog/tracing/transport/http_spec.rb b/spec/datadog/tracing/transport/http_spec.rb index eb60c7c7939..1e04a927906 100644 --- a/spec/datadog/tracing/transport/http_spec.rb +++ b/spec/datadog/tracing/transport/http_spec.rb @@ -198,64 +198,4 @@ it { is_expected.to be(:net_http) } end - - describe '.default_hostname' do - subject(:default_hostname) { described_class.default_hostname(logger: logger) } - - let(:logger) { instance_double(Datadog::Core::Logger, warn: nil) } - - before do - stub_const( - 'Datadog::Tracing::Transport::HTTP::DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS', - instance_double(Datadog::Core::Configuration::AgentSettingsResolver::AgentSettings, hostname: 'example-hostname') - ) - end - - it 'returns the hostname from the DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS object' do - expect(default_hostname).to eq 'example-hostname' - end - - it 'logs a deprecation warning' do - expect(logger).to receive(:warn).with(/Deprecated/) - - default_hostname - end - end - - describe '.default_port' do - subject(:default_port) { described_class.default_port(logger: logger) } - - let(:logger) { instance_double(Datadog::Core::Logger, warn: nil) } - - before do - stub_const( - 'Datadog::Tracing::Transport::HTTP::DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS', - instance_double(Datadog::Core::Configuration::AgentSettingsResolver::AgentSettings, port: 12345) - ) - end - - it 'returns the port from the DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS object' do - expect(default_port).to eq 12345 - end - - it 'logs a deprecation warning' do - expect(logger).to receive(:warn).with(/Deprecated/) - - default_port - end - end - - describe '.default_url' do - subject(:default_url) { described_class.default_url(logger: logger) } - - let(:logger) { instance_double(Datadog::Core::Logger, warn: nil) } - - it { is_expected.to be nil } - - it 'logs a deprecation warning' do - expect(logger).to receive(:warn).with(/Deprecated/) - - default_url - end - end end