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

[core] drop legacy port 7777 #82

Merged
merged 2 commits into from
Mar 6, 2017
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
2 changes: 0 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ dependencies:
# configure Ruby interpreters
- rvm get head
- rvm install $MRI_VERSIONS
# run the agent
- docker run -d -e DD_API_KEY=invalid_key_but_this_is_fine -e DD_BIND_HOST=0.0.0.0 -e DD_APM_ENABLED=true -p 127.0.0.1:8126:8126 -p 127.0.0.1:7777:7777 datadog/docker-dd-agent
override:
- rvm $MRI_VERSIONS --verbose do gem update --system
- rvm $MRI_VERSIONS --verbose do gem install bundler
Expand Down
9 changes: 9 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,12 @@ redis:
image: redis:3.0
ports:
- "127.0.0.1:${TEST_REDIS_PORT}:6379"

ddagent:
image: datadog/docker-dd-agent
environment:
- DD_APM_ENABLED=true
- DD_BIND_HOST=0.0.0.0
- DD_API_KEY=invalid_key_but_this_is_fine
ports:
- "127.0.0.1:8126:8126"
2 changes: 1 addition & 1 deletion docs/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ of the Datadog tracer, you can override the following defaults:
tracer: Datadog.tracer,
debug: false,
trace_agent_hostname: 'localhost',
trace_agent_port: 7777
trace_agent_port: 8126
}

Available settings are:
Expand Down
2 changes: 1 addition & 1 deletion lib/ddtrace/writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Writer
attr_reader :transport

HOSTNAME = 'localhost'.freeze
PORT = '7777'.freeze
PORT = '8126'.freeze

def initialize(options = {})
# writer and transport parameters
Expand Down
2 changes: 1 addition & 1 deletion test/integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_agent_receives_span
skip unless ENV['TEST_DATADOG_INTEGRATION'] # requires a running agent

tracer = Datadog::Tracer.new
tracer.configure(enabled: true, hostname: '127.0.0.1', port: '7777')
tracer.configure(enabled: true, hostname: '127.0.0.1', port: '8126')

agent_receives_span_step1(tracer)
success = agent_receives_span_step2(tracer)
Expand Down
6 changes: 3 additions & 3 deletions test/transport_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ class UtilsTest < Minitest::Test
def setup
# set the transport and temporary disable the logger to prevent
# spam in the tests output
@default_transport = Datadog::HTTPTransport.new('localhost', '7777')
@transport_json = Datadog::HTTPTransport.new('localhost', '7777', encoder: Datadog::Encoding::JSONEncoder.new())
@transport_msgpack = Datadog::HTTPTransport.new('localhost', '7777', encoder: Datadog::Encoding::MsgpackEncoder.new())
@default_transport = Datadog::HTTPTransport.new('localhost', '8126')
@transport_json = Datadog::HTTPTransport.new('localhost', '8126', encoder: Datadog::Encoding::JSONEncoder.new())
@transport_msgpack = Datadog::HTTPTransport.new('localhost', '8126', encoder: Datadog::Encoding::MsgpackEncoder.new())
@original_level = Datadog::Tracer.log.level
Datadog::Tracer.log.level = Logger::FATAL
end
Expand Down