Skip to content

Cleanup instrumentation specs with ruby version check #4954

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −53
Open

Cleanup instrumentation specs with ruby version check #4954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 1 addition & 53 deletions spec/datadog/tracing/contrib/aws/instrumentation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@
end

# aws-sdk >= (3.1.0)->aws-sdk-kinesis >= (1.45.0) resolves to a different host name
describe '#describe_stream_consumer', if: RUBY_VERSION >= '2.3.0' do
describe '#describe_stream_consumer' do
subject!(:describe_stream_consumer) do
client.describe_stream_consumer(
stream_arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/my-stream', # required
Expand Down Expand Up @@ -671,58 +671,6 @@
.to eq('123456789012.control-kinesis.us-stubbed-1.amazonaws.com')
end
end

# aws-sdk <= (3.0.2)->aws-sdk-kinesis >= (1.34.0) resolves to a different host name
describe '#describe_stream_consumer', if: RUBY_VERSION < '2.3.0' do
subject!(:describe_stream_consumer) do
client.describe_stream_consumer(
stream_arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/my-stream', # required
consumer_name: 'cosumerName', # required
consumer_arn: 'consumerArn', # required
)
end
let(:responses) do
{describe_stream_consumer: {
consumer_description: {
consumer_name: 'John Doe',
consumer_arn: 'consumerArn',
consumer_status: 'CREATING',
consumer_creation_timestamp: Time.new(2023, 3, 31, 12, 30, 0, '-04:00'),
stream_arn: 'streamArn'
}
}}
end

it_behaves_like 'schema version span'
it_behaves_like 'environment service name', 'DD_TRACE_AWS_SERVICE_NAME'
it_behaves_like 'configured peer service span', 'DD_TRACE_AWS_PEER_SERVICE'
it_behaves_like 'a peer service span' do
let(:peer_service_val) { 'my-stream' }
let(:peer_service_source) { 'streamname' }
end

it 'generates a span' do
expect(span.name).to eq('aws.command')
expect(span.service).to eq('aws')
expect(span.type).to eq('http')
expect(span.resource).to eq('kinesis.describe_stream_consumer')
expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
expect(span.get_tag('aws.operation')).to eq('describe_stream_consumer')
expect(span.get_tag('region')).to eq('us-stubbed-1')
expect(span.get_tag('aws_service')).to eq('kinesis')
expect(span.get_tag('streamname')).to eq('my-stream')
expect(span.get_tag('path')).to eq('')
expect(span.get_tag('host')).to eq('kinesis.us-stubbed-1.amazonaws.com')
expect(span.get_tag('http.method')).to eq('POST')
expect(span.get_tag('http.status_code')).to eq('200')
expect(span.get_tag('span.kind')).to eq('client')
expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('aws')
expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION))
.to eq('command')
expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_PEER_HOSTNAME))
.to eq('kinesis.us-stubbed-1.amazonaws.com')
end
end
end

context 'with an eventbridge client' do
Expand Down