Change base to keyword argument

DataDog · Feb 2, 2023 · 6ec95b9 · 6ec95b9
1 parent 779117e
commit 6ec95b9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/lib/datadog/tracing/distributed/b3_single.rb b/lib/datadog/tracing/distributed/b3_single.rb
@@ -47,8 +47,8 @@ def extract(env)
           return unless value
 
           parts = value.split('-')
-          trace_id = Helpers.value_to_id(parts[0], 16) unless parts.empty?
-          span_id = Helpers.value_to_id(parts[1], 16) if parts.length > 1
+          trace_id = Helpers.value_to_id(parts[0], base: 16) unless parts.empty?
+          span_id = Helpers.value_to_id(parts[1], base: 16) if parts.length > 1
           sampling_priority = Helpers.value_to_number(parts[2]) if parts.length > 2
 
           # Return if this propagation is not valid

diff --git a/lib/datadog/tracing/distributed/fetcher.rb b/lib/datadog/tracing/distributed/fetcher.rb
@@ -18,11 +18,11 @@ def [](key)
         end
 
         def id(key, base: 10)
-          Helpers.value_to_id(self[key], base)
+          Helpers.value_to_id(self[key], base: base)
         end
 
         def number(key, base: 10)
-          Helpers.value_to_number(self[key], base)
+          Helpers.value_to_number(self[key], base: base)
         end
       end
     end

diff --git a/lib/datadog/tracing/distributed/helpers.rb b/lib/datadog/tracing/distributed/helpers.rb
@@ -40,9 +40,8 @@ def self.truncate_base16_number(value)
           value.sub(/^0*(?=(0$)|[^0])/, '')
         end
 
-        # DEV: move `base` to a keyword argument
-        def self.value_to_id(value, base = 10)
-          id = value_to_number(value, base)
+        def self.value_to_id(value, base: 10)
+          id = value_to_number(value, base: base)
 
           # Return early if we could not parse a number
           return if id.nil?
@@ -53,8 +52,7 @@ def self.value_to_id(value, base = 10)
           id < 0 ? id + (2**64) : id
         end
 
-        # DEV: move `base` to a keyword argument
-        def self.value_to_number(value, base = 10)
+        def self.value_to_number(value, base: 10)
           # It's important to make a difference between no data and zero.
           return if value.nil?
 

diff --git a/spec/datadog/tracing/distributed/fetcher_spec.rb b/spec/datadog/tracing/distributed/fetcher_spec.rb
@@ -34,7 +34,7 @@
 
     it 'delegates to Datadog::Tracing::Distributed::Helpers.value_to_id' do
       ret = double('return')
-      expect(Datadog::Tracing::Distributed::Helpers).to receive(:value_to_id).with(value, base).and_return(ret)
+      expect(Datadog::Tracing::Distributed::Helpers).to receive(:value_to_id).with(value, base: base).and_return(ret)
       is_expected.to eq(ret)
     end
   end
@@ -48,7 +48,7 @@
 
     it 'delegates to Datadog::Tracing::Distributed::Helpers.value_to_number' do
       ret = double('return')
-      expect(Datadog::Tracing::Distributed::Helpers).to receive(:value_to_number).with(value, base).and_return(ret)
+      expect(Datadog::Tracing::Distributed::Helpers).to receive(:value_to_number).with(value, base: base).and_return(ret)
       is_expected.to eq(ret)
     end
   end

diff --git a/spec/datadog/tracing/distributed/helpers_spec.rb b/spec/datadog/tracing/distributed/helpers_spec.rb
@@ -110,8 +110,8 @@
         ['10000', 65536],
         ['deadbeef', 3735928559],
       ].each do |value, expected|
-        xcontext value.inspect do
-          it { expect(described_class.value_to_id(value, 16)).to eq(expected) }
+        context value.inspect do
+          it { expect(described_class.value_to_id(value, base: 16)).to eq(expected) }
         end
       end
     end
@@ -170,7 +170,7 @@
         ['invalid-base16', nil]
       ].each do |value, expected|
         context value.inspect do
-          subject(:subject) { described_class.value_to_number(value, 16) }
+          subject(:subject) { described_class.value_to_number(value, base: 16) }
 
           it { is_expected.to be == expected }
         end