Skip to content

Commit

Permalink
Merge pull request #8 from haotianw465/master
Browse files Browse the repository at this point in the history
Add Travis CI
  • Loading branch information
haotianw465 authored May 8, 2018
2 parents e7daa78 + 0aca42a commit e55b90a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: ruby

rvm:
- 2.4
- 2.5
- 2.6

sudo: false

install:
- bundle install

script:
- rake test

matrix:
allow_failures:
- rvm: 2.6
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/aws/aws-xray-sdk-ruby.svg?branch=master)](https://travis-ci.org/aws/aws-xray-sdk-ruby)

# AWS X-Ray SDK for Ruby <sup><sup><sup>(beta)</sup></sup></sup>

![Screenshot of the AWS X-Ray console](/images/example_servicemap.png?raw=true)
Expand Down
13 changes: 0 additions & 13 deletions test/aws-xray-sdk/tc_emitter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,4 @@ def test_pass_through
emitter = XRay::DefaultEmitter.new
emitter.send_entity entity: segment
end

def test_invalid_daemon_address
segment = XRay::Segment.new name: name
segment.close
assert_raises XRay::InvalidDaemonAddressError do
emitter = XRay::DefaultEmitter.new
emitter.daemon_address = 'blah'
end
assert_raises XRay::InvalidDaemonAddressError do
emitter = XRay::DefaultEmitter.new
emitter.daemon_address = '127.0.0.1'
end
end
end
4 changes: 2 additions & 2 deletions test/aws-xray-sdk/tc_recorder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ def test_plugins_runtime_context
emitter: XRay::TestHelper::StubbedEmitter.new,
plugins: %I[ecs ec2]
}

recorder.configure(config)
segment = recorder.begin_segment name

aws_meta = segment.to_h[:aws]
assert aws_meta[:ecs]
assert aws_meta[:ec2]
assert_equal XRay::Plugins::EC2::ORIGIN, segment.origin
assert segment.origin

WebMock.reset!
end
Expand Down

0 comments on commit e55b90a

Please sign in to comment.