elastic-transport 8.3.5 → 8.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4543af71a663d5f638c673407101529237507d56e7e2034f0c7e9fd5dd78c6a
-  data.tar.gz: 39a000ce02f4cf2208d0ec41f51f133e74454748f90eb6617d08bac3aad7e572
+  metadata.gz: 55e1343a320fd2a1dba29077ff4d9ad72b6adf62fe918856480f43e00e8a9927
+  data.tar.gz: da17629d377258be5b8564ba0bd82c3ef6119117e307a14ac60f8da14894e375
 SHA512:
-  metadata.gz: 747447a8e84b3f71f1b8244237809c2087e60de35426820d065de72fb57b9ab17094ee1fb95e2f228c41902098b1d2ba8fd1f248f6d2cf493785d50745c08ec0
-  data.tar.gz: 6923af2b78bf3a8ecb956038a878f1752723546dfdabd3d6d3492f545f9d51312807a8faf7a8e1adee21b34034d95569b01939172198eb572709d16e6e5ace53
+  metadata.gz: e375ab5339638b8fedd29d38ae0ff6384407e8256c9201c383ee084689e4781752fe4cc9b23830a2380185234acfbbc59533d91f653ec51fff9007a433b033b3
+  data.tar.gz: 25a3847030def992ed441260e8921509ad5375353ad3e564218e799341bc53942e30245e6dad79c6e38e1783b993298e6729951320bb785e17308a2f5f9ca19f

data/.github/workflows/otel.yml

@@ -2,10 +2,10 @@ name: opentelemetry
 on:
   push:
     branches:
-      - main
+      - 8.3
   pull_request:
     branches:
-      - main
+      - 8.3
 jobs:
   test-otel:
     name: 'Test Open Telemetry'
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['3.3', 'jruby-9.4']
-        es_version: ['8.15.0-SNAPSHOT']
+        es_version: ['9.2.0-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

data/.github/workflows/tests.yml

@@ -1,11 +1,11 @@
-name: main tests
+name: 8.3 tests
 on:
   push:
     branches:
-      - main
+      - 8.3
   pull_request:
     branches:
-      - main
+      - 8.3
 jobs:
   test:
     name: 'Main tests'
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3', 'jruby-9.3', 'jruby-9.4']
-        es_version: ['8.14.2-SNAPSHOT', '8.15.0-SNAPSHOT', '8.16.0-SNAPSHOT']
+        ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4']
+        es_version: ['8.18.8-SNAPSHOT', '8.19.5-SNAPSHOT', '9.0.8-SNAPSHOT', '9.1.5-SNAPSHOT', '9.2.0-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -53,8 +53,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3', 'jruby-9.3']
-        es_version: ['8.16.0-SNAPSHOT']
+        ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby-9.3']
+        es_version: ['8.19.5-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 8.3.6
+
+- Moves `require 'timeout'` to the classes that use it. Closed [#79](https://github.com/elastic/elastic-transport-ruby/issues/79).
+- Sanitize url on OTEL spans, thanks @steve21168. Pull Request: [#98](https://github.com/elastic/elastic-transport-ruby/pull/98)
+
 ## 8.3.5
 
 - Small updates in source code documentation.

data/lib/elastic/transport/transport/base.rb

@@ -195,7 +195,7 @@ module Elastic
         #
         def __log_response(method, path, params, body, url, response, json, took, duration)
           if logger
-            sanitized_url = url.to_s.gsub(/\/\/(.+):(.+)@/, '//' + '\1:' + SANITIZED_PASSWORD + '@')
+            sanitized_url = sanitize_url(url.to_s)
             log_info "#{method.to_s.upcase} #{sanitized_url} " +
                          "[status:#{response.status}, request:#{sprintf('%.3fs', duration)}, query:#{took}]"
             log_debug "> #{__convert_to_json(body)}" if body
@@ -472,9 +472,13 @@ module Elastic
           end
         end
 
+        def sanitize_url(url)
+          url.to_s.gsub(/\/\/(.+):(.+)@/, '//' + '\1:' + SANITIZED_PASSWORD + '@')
+        end
+
         def capture_otel_span_attributes(connection, url)
           if defined?(::OpenTelemetry)
-            ::OpenTelemetry::Trace.current_span&.set_attribute('url.full', url)
+            ::OpenTelemetry::Trace.current_span&.set_attribute('url.full', sanitize_url(url))
             ::OpenTelemetry::Trace.current_span&.set_attribute('server.address', connection.host[:host])
             ::OpenTelemetry::Trace.current_span&.set_attribute('server.port', connection.host[:port].to_i)
           end

data/lib/elastic/transport/transport/errors.rb

@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'timeout'
+
 module Elastic
   module Transport
     module Transport

data/lib/elastic/transport/transport/sniffer.rb

@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'timeout'
+
 module Elastic
   module Transport
     module Transport

data/lib/elastic/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.3.5'.freeze
+    VERSION = '8.3.6'.freeze
   end
 end

data/lib/elastic/transport.rb

@@ -18,7 +18,6 @@
 require 'faraday'
 require 'multi_json'
 require 'time'
-require 'timeout'
 require 'uri'
 require 'zlib'
 

data/spec/elastic/transport/opentelemetry_spec.rb

@@ -320,6 +320,22 @@ if defined?(::OpenTelemetry)
           end
         end
       end
+
+      context 'sanitize in URL' do
+        let(:client) {
+          Elastic::Transport::Client.new(host: 'http://elastic:changeme@localhost:9250')
+        }
+
+        it 'sanitizes URL' do
+          client.perform_request(
+            'GET', '/', {}, nil, {}
+          )
+
+          span = exporter.finished_spans.find { |s| s.name == 'GET' }
+          expect(span.name).to eql('GET')
+          expect(span.attributes['url.full']).to match(/http:\/\/elastic:\*+@localhost:9250/)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.3.5
+  version: 8.3.6
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -257,8 +256,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - ".github/check_license_headers.rb"
 - ".github/license-header.txt"
@@ -324,7 +323,6 @@ metadata:
   changelog_uri: https://github.com/elastic/elastic-transport-ruby/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/elastic/elastic-transport-ruby
   bug_tracker_uri: https://github.com/elastic/elastic-transport-ruby/issues
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -340,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
 test_files: