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.

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

chore: AWS SDK min version 3.0 #1166

Closed
wants to merge 1 commit into from
Closed

chore: AWS SDK min version 3.0 #1166

Show file tree
Hide file tree
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
48 changes: 0 additions & 48 deletions instrumentation/aws_sdk/Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,3 @@ end
appraise 'aws-sdk-3.0' do
gem 'aws-sdk', '~> 3.0'
end

appraise 'aws-sdk-2.11' do
gem 'aws-sdk', '~> 2.11'
end

appraise 'aws-sdk-2.10' do
gem 'aws-sdk', '~> 2.10'
end

appraise 'aws-sdk-2.9' do
gem 'aws-sdk', '~> 2.9'
end

appraise 'aws-sdk-2.8' do
gem 'aws-sdk', '~> 2.8'
end

appraise 'aws-sdk-2.7' do
gem 'aws-sdk', '~> 2.7'
end

appraise 'aws-sdk-2.6' do
gem 'aws-sdk', '~> 2.6'
end

appraise 'aws-sdk-2.5' do
gem 'aws-sdk', '~> 2.5'
end

appraise 'aws-sdk-2.4' do
gem 'aws-sdk', '~> 2.4'
end

appraise 'aws-sdk-2.3' do
gem 'aws-sdk', '~> 2.3'
end

appraise 'aws-sdk-2.2' do
gem 'aws-sdk', '~> 2.2'
end

appraise 'aws-sdk-2.1' do
gem 'aws-sdk', '~> 2.1'
end

appraise 'aws-sdk-2.0' do
gem 'aws-sdk', '~> 2.0'
end
15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.0.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.1.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.10.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.11.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.2.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.3.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.4.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.5.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.6.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.7.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.8.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_2.9.gemfile
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_3.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ group :test do
gem "opentelemetry-common", path: "../../../common"
gem "opentelemetry-sdk", path: "../../../sdk"
gem "opentelemetry-semantic_conventions", path: "../../../semantic_conventions"
gem "webrick", "~> 1.7"
arielvalentin marked this conversation as resolved.
Show resolved Hide resolved
end

gemspec path: "../"
1 change: 1 addition & 0 deletions instrumentation/aws_sdk/gemfiles/aws_sdk_3.1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ group :test do
gem "opentelemetry-common", path: "../../../common"
gem "opentelemetry-sdk", path: "../../../sdk"
gem "opentelemetry-semantic_conventions", path: "../../../semantic_conventions"
gem "webrick", "~> 1.7"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/instrumentation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Instrumentation
module AwsSdk
# Instrumentation class that detects and installs the AwsSdk instrumentation
class Instrumentation < OpenTelemetry::Instrumentation::Base
MINIMUM_VERSION = Gem::Version.new('2.0')
MINIMUM_VERSION = Gem::Version.new('3.0')
arielvalentin marked this conversation as resolved.
Show resolved Hide resolved

install do |_config|
require_dependencies
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.19.0'

spec.add_development_dependency 'appraisal', '~> 2.2.0'
spec.add_development_dependency 'aws-sdk', '>= 2.0'
spec.add_development_dependency 'aws-sdk', '>= 3.0'
spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
Expand Down
4 changes: 1 addition & 3 deletions instrumentation/aws_sdk/test/opentelemetry/instrumentation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
end

it 'returns true for supported gem versions' do
Gem.stub(:loaded_specs, 'aws-sdk' => Gem::Specification.new { |s| s.version = minimum_version }) do
_(instrumentation.compatible?).must_equal true
end
_(instrumentation.compatible?).must_equal true
end
end

Expand Down