teakflake 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb7cda8d44ef39be4aa9bea51b96e798f95116a951c26bba0af5d339e64f68e
-  data.tar.gz: 5feb1b32b9ac97549e221459799faf90f4776c185c126d644e1c179fea115de9
+  metadata.gz: 560d11d7fe0fe920474447c525110c05643ca515c71a332cd42af17a752f2027
+  data.tar.gz: bfb71079d0bfaaaa1fb1aac85582c21cabeb58980c97a055056cb9432cdefabc
 SHA512:
-  metadata.gz: 9e4c5cb314a56823e893f28a23a995f7d9efe6ee2acd3e6fa0cca16d666005c04a2184be8991ce41f01456afe495fdc31bd2f7d7412a0cc5bd391f25fb5149ca
-  data.tar.gz: '019e1784b55b312ca54edd5d280d0dc39b17e0b25051a334af29488fce78475fc71a71cc8caf6d635e01373fe150da1d9912d698880cf119cdbbb8e9c12e42ff'
+  metadata.gz: baa8fb219bf903d62ecefddbcb94cd9f65139013482834236a25b72ced1ae4369493ec6824a20357fa873035ad51ecc607123a8d658cd01ddbfca59618be4ff3
+  data.tar.gz: 5637a46c5563314bda23987c3c57c6cefef238d5cb4801934e5e30850f61cc5a1843d99d3109054218d6c16d700ace81b5145b2ba27d35f613206a0fa02134f2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.1.5
+
+ENHANCEMENTS:
+
+* `TEAKFLAKE_ADVERTISE_ADDR` (a bare host or IP) sets the advertised address. Without it, falls back to the hostname's canonname. (C-2042)
+* Log the claimed worker id, advertised URL and every peer after registering. (C-2045)
+
+BUG FIXES:
+
+* Declare `logger` and `benchmark`, which zookeeper requires without declaring and Ruby 4.0 dropped from the default gems. Raise the rack floor to 2.2.24. (C-2024)
+
 ## 0.1.4
 
 BUG FIXES:

data/Gemfile.lock

@@ -1,29 +1,35 @@
 PATH
   remote: .
   specs:
-    teakflake (0.1.4)
+    teakflake (0.1.5)
+      benchmark
+      logger
       logsformyfamily (~> 0.3.0)
-      rack (~> 2.2, >= 2.2.3.1)
+      rack (~> 2.2, >= 2.2.24)
       zk (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.9.1)
+      public_suffix (>= 2.0.2, < 8.0)
+    benchmark (0.5.0)
     benchmark-ips (2.10.0)
-    crack (0.4.5)
+    bigdecimal (4.1.3)
+    crack (1.0.1)
+      bigdecimal
       rexml
     diff-lcs (1.5.0)
     docile (1.4.0)
-    hashdiff (1.0.1)
+    hashdiff (1.2.1)
+    logger (1.7.0)
     logsformyfamily (0.3.0)
-    public_suffix (4.0.7)
-    rack (2.2.3.1)
+    public_suffix (7.0.5)
+    rack (2.2.25)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.6)
-    rexml (3.2.5)
+    rexml (3.4.4)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -44,7 +50,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.19)
-    webmock (3.14.0)
+    webmock (3.34.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/teakflake/server.rb

@@ -68,7 +68,7 @@ module Teakflake
         ZK::Client::Threaded.new(config[:zookeeper_servers].join(',')),
         config[:datacenter_id],
         ENV['WORKER_ID'].to_i,
-        "http://#{Addrinfo.getaddrinfo(@hostname, nil, nil, :STREAM,nil, Socket::AI_CANONNAME).first.canonname}:#{config[:server_port]}",
+        advertise_addr,
         ProcessClock.new
       )
       id_assigner.sanity_check_peers
@@ -90,6 +90,16 @@ module Teakflake
 
   private
 
+    # TEAKFLAKE_ADVERTISE_ADDR is a bare host or IP. Without it we advertise the hostname's canonname, which
+    # only resolves for peers if the host's resolver/hosts file says so.
+    def advertise_addr
+      host = ENV['TEAKFLAKE_ADVERTISE_ADDR'].to_s.strip
+      if host.empty?
+        host = Addrinfo.getaddrinfo(@hostname, nil, nil, :STREAM, nil, Socket::AI_CANONNAME).first.canonname
+      end
+      "http://#{host}:#{config[:server_port]}"
+    end
+
     POST_BODY = 'rack.input'.freeze
     FORM_INPUT = 'rack.request.form_input'.freeze
     FORM_HASH = 'rack.request.form_hash'.freeze

data/lib/teakflake/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Teakflake
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/teakflake/worker_id_sources/static_worker_id.rb

@@ -55,6 +55,7 @@ module Teakflake
       end
       @id_registered = true
       logger.info(:claimed_worker_id, id: @worker_id)
+      log_registration
     end
 
     def assert(_time)
@@ -102,7 +103,20 @@ module Teakflake
       JSON.parse(response.body).dig('response', 'ids', 0)
     end
 
+    # One line with everything needed to see what each node advertised, without reading ZK by hand.
+    def log_registration
+      logger.info(:registered_worker, id: @worker_id, addr: @addr, peers: read_peers)
+    rescue StandardError => e
+      logger.warning(:registered_worker_peers_unreadable, id: @worker_id, addr: @addr, message: e.message)
+    end
+
     def peers
+      found = read_peers
+      logger.info(:found_peers, peers: found)
+      found
+    end
+
+    def read_peers
       begin
         @zookeeper.get(@worker_id_zk_path)
       rescue ZK::Exceptions::NoNode
@@ -116,8 +130,6 @@ module Teakflake
         hash[child.to_i] = info[0]
       end
 
-      logger.info(:found_peers, peers: peers)
-
       peers
     end
   end

data/teakflake.gemspec

@@ -28,5 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'logsformyfamily', '~> 0.3.0'
   spec.add_dependency 'zk', '~> 1.10'
-  spec.add_dependency 'rack', '~> 2.2', '>= 2.2.3.1'
+  spec.add_dependency 'rack', '~> 2.2', '>= 2.2.24'
+  # zookeeper 1.5.5 requires these without declaring them, and Ruby 4.0 dropped both from the default gems.
+  spec.add_dependency 'logger'
+  spec.add_dependency 'benchmark'
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teakflake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alex Scarborough
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logsformyfamily
@@ -46,7 +47,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3.1
+        version: 2.2.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +57,36 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3.1
+        version: 2.2.24
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - alex@teak.io
 executables: []
@@ -90,6 +120,7 @@ metadata:
   homepage_uri: https://github.com/GoCarrot/teakflake
   source_code_uri: https://github.com/GoCarrot/teakflake
   changelog_uri: https://github.com/GoCarrot/teakflake/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,7 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Generate Twitter Snowflake style ids.
 test_files: []