From 680edc79ecc1ce869ee211b037f538a3b19f2ce8 Mon Sep 17 00:00:00 2001 From: jsonbailey Date: Wed, 11 Jun 2025 13:50:03 -0500 Subject: [PATCH 1/2] chore: Move dev dependencies to gemspec --- Gemfile | 9 --------- launchdarkly-server-sdk-otel.gemspec | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 09a16c4..3d27acd 100644 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,3 @@ source "https://rubygems.org" # Specify your gem's dependencies in launchdarkly-server-sdk-otel.gemspec gemspec - -gem "rake", "~> 13.0" - -gem "rspec", "~> 3.0" - -gem "rubocop", "~> 1.21" -gem "rubocop-performance", "~> 1.15" -gem "rubocop-rake", "~> 0.6" -gem "rubocop-rspec", "~> 2.27" diff --git a/launchdarkly-server-sdk-otel.gemspec b/launchdarkly-server-sdk-otel.gemspec index 31fb1cc..e5a7ab9 100644 --- a/launchdarkly-server-sdk-otel.gemspec +++ b/launchdarkly-server-sdk-otel.gemspec @@ -31,6 +31,13 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "launchdarkly-server-sdk", "~> 8.4.0" spec.add_runtime_dependency "opentelemetry-sdk", "~> 1.4.0" + spec.add_development_dependency 'rake', '~> 13.0' + spec.add_development_dependency 'rspec', '~> 3.0' + spec.add_development_dependency 'rubocop', '~> 1.21' + spec.add_development_dependency 'rubocop-performance', '~> 1.15' + spec.add_development_dependency 'rubocop-rake', '~> 0.6' + spec.add_development_dependency 'rubocop-rspec', '~> 2.27' + # For more information and examples about making a new gem, check out our # guide at: https://bundler.io/guides/creating_gem.html end From bd90724815671c81a0810157f1314432ea6727c0 Mon Sep 17 00:00:00 2001 From: jsonbailey Date: Thu, 12 Jun 2025 14:49:58 +0000 Subject: [PATCH 2/2] fix build issues and rubocop warnings --- .rubocop.yml | 11 +++++++---- launchdarkly-server-sdk-otel.gemspec | 2 +- spec/ldclient_otel_spec.rb | 2 +- spec/tracing_hook_spec.rb | 8 ++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c07869b..db8d6a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,4 @@ -require: +plugins: - rubocop-performance - rubocop-rake - rubocop-rspec @@ -291,7 +291,7 @@ Style/PerlBackrefs: StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers' Enabled: false -Naming/PredicateName: +Naming/PredicatePrefix: Description: 'Check the names of predicate methods.' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark' ForbiddenPrefixes: @@ -890,8 +890,11 @@ Style/WhileUntilDo: Style/ZeroLengthPredicate: Enabled: false -RSpec/FilePath: - SpecSuffixOnly: true +RSpec/SpecFilePathFormat: + Enabled: false + +RSpec/SpecFilePathSuffix: + Enabled: true RSpec/ExampleLength: Enabled: false diff --git a/launchdarkly-server-sdk-otel.gemspec b/launchdarkly-server-sdk-otel.gemspec index e5a7ab9..377bb89 100644 --- a/launchdarkly-server-sdk-otel.gemspec +++ b/launchdarkly-server-sdk-otel.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rubocop', '~> 1.21' spec.add_development_dependency 'rubocop-performance', '~> 1.15' spec.add_development_dependency 'rubocop-rake', '~> 0.6' - spec.add_development_dependency 'rubocop-rspec', '~> 2.27' + spec.add_development_dependency 'rubocop-rspec', '~> 3.6' # For more information and examples about making a new gem, check out our # guide at: https://bundler.io/guides/creating_gem.html diff --git a/spec/ldclient_otel_spec.rb b/spec/ldclient_otel_spec.rb index 9ae973f..8749295 100644 --- a/spec/ldclient_otel_spec.rb +++ b/spec/ldclient_otel_spec.rb @@ -2,6 +2,6 @@ RSpec.describe LaunchDarkly::Otel do it 'has a version number' do - expect(LaunchDarkly::Otel::VERSION).not_to be nil + expect(LaunchDarkly::Otel::VERSION).not_to be_nil end end diff --git a/spec/tracing_hook_spec.rb b/spec/tracing_hook_spec.rb index f5b3b86..c61a6cd 100644 --- a/spec/tracing_hook_spec.rb +++ b/spec/tracing_hook_spec.rb @@ -42,7 +42,7 @@ expect(event.attributes['feature_flag.key']).to eq 'boolean' expect(event.attributes['feature_flag.provider_name']).to eq 'LaunchDarkly' expect(event.attributes['feature_flag.context.key']).to eq 'org:org-key' - expect(event.attributes['feature_flag.variant']).to eq nil + expect(event.attributes['feature_flag.variant']).to be_nil end end @@ -109,7 +109,7 @@ expect(event.attributes['feature_flag.key']).to eq 'boolean' expect(event.attributes['feature_flag.provider_name']).to eq 'LaunchDarkly' expect(event.attributes['feature_flag.context.key']).to eq 'org:org-key' - expect(event.attributes['feature_flag.variant']).to eq nil + expect(event.attributes['feature_flag.variant']).to be_nil end it 'hook makes its span active' do @@ -140,13 +140,13 @@ expect(middle.events[0].attributes['feature_flag.key']).to eq 'boolean' expect(middle.events[0].attributes['feature_flag.provider_name']).to eq 'LaunchDarkly' expect(middle.events[0].attributes['feature_flag.context.key']).to eq 'org:org-key' - expect(middle.events[0].attributes['feature_flag.variant']).to eq nil + expect(middle.events[0].attributes['feature_flag.variant']).to be_nil expect(top.events[0].name).to eq 'feature_flag' expect(top.events[0].attributes['feature_flag.key']).to eq 'boolean' expect(top.events[0].attributes['feature_flag.provider_name']).to eq 'LaunchDarkly' expect(top.events[0].attributes['feature_flag.context.key']).to eq 'org:org-key' - expect(top.events[0].attributes['feature_flag.variant']).to eq nil + expect(top.events[0].attributes['feature_flag.variant']).to be_nil end end end