elastic-transport 8.5.1 → 8.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9697d896f72f8c7b17a78fadaf46850be17eddb10e23b52d4ded197d9d157f2b
-  data.tar.gz: 8d843d8d6e06f1d035310a9c729167f5f593dbf1b13a4c6c29a8a95d00f9a360
+  metadata.gz: d1367aa286a53be8c0c3f93320afebd83849057b5aef6bead07660876cfbffc2
+  data.tar.gz: 2c795f10b5863477f782690af3791a50abdb8d05eeb4e40c5ba901a49f2ecf38
 SHA512:
-  metadata.gz: 552bb0b98adf66097f9b48c4ae7fabdc6eee854cfa2382ac383f09858ce52b248e8e57fded3b484a5abdaa352515fb7d2b0a98f4acc60784d824b4c93f50227e
-  data.tar.gz: f5b3d737c0e3c614d4f9234be0e21d07e80b6a545dcca60a735a7762308e34bf75888d731b7860bc938c8c1f1e5238e3bb2343cce543bcec49ba2cd92a571404
+  metadata.gz: 62b1b3175922a1999e8bace0eb9acbf7d3de89e3e12acc34d93f7bbe89353fae797fb39fa345d363d12d5ca1557ddbefdf7252aa3dd5e356bffffd764439e374
+  data.tar.gz: a34e264fd4f799322b737bcaa8647676367e823377c90cc3fa4b3979298bdb62ce2969c17d5aca4dfa6d95988b27ff209c77079f60001c03d449d983b2d1f403

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 8.5.3
+
+- Locks oj development dependency to >= 3.17.3 due to CVE
+- Checks if @otel is defined
+- Removes outdated Oj code
+
+## 8.5.2
+
+- Minor refactor to `curb` implementation.
+- Updated `yard` development dependency to `> 0.9.42`.
+- Fix `multi_json` deprecation warnings. Some deprecations [were introduced in `multi_json` 1.21.0](https://github.com/sferik/multi_json/blob/main/CHANGELOG.md#1210). Pull Request: [#112](https://github.com/elastic/elastic-transport-ruby/pull/112).
+- Reduced gem size. Pull Request: [#114](https://github.com/elastic/elastic-transport-ruby/pull/114).
+- Addresses duplicate `content-type` header in Manticore. Pull Request: [#115](https://github.com/elastic/elastic-transport-ruby/pull/115).
+
 ## 8.5.1
 
 - Fixes setting OpenTelemetry response status code only if available.

data/lib/elastic/transport/client.rb

@@ -169,7 +169,7 @@ module Elastic
       def perform_request(method, path, params = {}, body = nil, headers = nil, opts = {})
         method = @send_get_body_as if method == 'GET' && body
         validate_ca_fingerprints if @ca_fingerprint
-        if @otel
+        if defined?(@otel) && !@otel.nil?
           # If no endpoint is specified in the opts, use the HTTP method name
           span_name = opts[:endpoint] || method
           @otel.tracer.in_span(span_name) do |span|

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

@@ -356,15 +356,10 @@ module Elastic
           end
 
           if response.body &&
-            !response.body.empty? &&
-            response.headers &&
-            response.headers["content-type"] =~ /json/
-
-            # Prevent Float value from automatically becoming BigDecimal when using Oj
-            load_options = {}
-            load_options[:mode] = :compat if ::MultiJson.adapter.to_s == "MultiJson::Adapters::Oj"
-
-            json = serializer.load(response.body, load_options)
+             !response.body.empty? &&
+             response.headers &&
+             response.headers['content-type'] =~ /json/
+            json = serializer.load(response.body)
           end
           took = (json['took'] ? sprintf('%.3fs', json['took'] / 1000.0) : 'n/a') rescue 'n/a'
           __log_response(method, path, params, body, url, response, json, took, duration) unless ignore.include?(response.status.to_i)
@@ -396,7 +391,7 @@ module Elastic
         ACCEPT_ENCODING = 'Accept-Encoding'.freeze
         CONTENT_ENCODING = 'Content-Encoding'.freeze
         CONTENT_TYPE_STR = 'Content-Type'.freeze
-        CONTENT_TYPE_REGEX = /content-?_?type/.freeze
+        CONTENT_TYPE_REGEX = /content-?_?type/i.freeze
         DEFAULT_CONTENT_TYPE = 'application/json'.freeze
         GZIP = 'gzip'.freeze
         GZIP_FIRST_TWO_BYTES = '1f8b'.freeze

data/lib/elastic/transport/transport/http/manticore.rb

@@ -64,11 +64,10 @@ module Elastic
 
           def initialize(arguments = {}, &block)
             @request_options = {
-              headers: (
+              headers:
                 arguments.dig(:transport_options, :headers) ||
                 arguments.dig(:options, :transport_options, :headers) ||
                 {}
-              )
             }
             @manticore = build_client(arguments[:options] || {})
             super(arguments, &block)
@@ -78,7 +77,6 @@ module Elastic
           def build_client(options = {})
             client_options = options[:transport_options] || {}
             client_options[:ssl] = options[:ssl] || {}
-
             @manticore = ::Manticore::Client.new(client_options)
           end
 
@@ -120,7 +118,6 @@ module Elastic
           #
           def __build_connections
             apply_headers(options)
-
             Connections::Collection.new(
               connections: hosts.map do |host|
                 host[:protocol] = host[:scheme] || DEFAULT_PROTOCOL
@@ -169,7 +166,12 @@ module Elastic
 
           def apply_headers(options)
             headers = options[:headers].clone || options.dig(:transport_options, :headers).clone || {}
-            headers[CONTENT_TYPE_STR] = find_value(headers, CONTENT_TYPE_REGEX) || DEFAULT_CONTENT_TYPE
+            if (value = find_value(headers, CONTENT_TYPE_REGEX))
+              @request_options[:headers].reject! { |k, _| k.match? CONTENT_TYPE_REGEX }
+              headers[CONTENT_TYPE_STR] = value
+            else
+              headers[CONTENT_TYPE_STR] = DEFAULT_CONTENT_TYPE
+            end
             headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || find_value(@request_options[:headers], USER_AGENT_REGEX) || user_agent_header
             headers[ACCEPT_ENCODING] = GZIP if use_compression?
             @request_options[:headers].merge!(headers)

data/lib/elastic/transport/transport/serializer/multi_json.rb

@@ -37,13 +37,27 @@ module Elastic
           # De-serialize a Hash from JSON string
           #
           def load(string, options = {})
-            ::MultiJson.load(string, options)
+            if deprecated_gem_version_loaded?
+              ::MultiJson.load(string, options)
+            else
+              ::MultiJSON.parse(string, options)
+            end
           end
 
           # Serialize a Hash to JSON string
           #
           def dump(object, options = {})
-            ::MultiJson.dump(object, options)
+            if deprecated_gem_version_loaded?
+              ::MultiJson.dump(object, options)
+            else
+              ::MultiJSON.generate(object, options)
+            end
+          end
+
+          private
+
+          def deprecated_gem_version_loaded?
+            Gem.loaded_specs['multi_json'].version < Gem::Version.create('1.21.0')
           end
         end
       end

data/lib/elastic/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.5.1'.freeze
+    VERSION = '8.5.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.5.1
+  version: 8.5.3
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
@@ -37,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -237,16 +223,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.42
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.42
 description: 'Low level Ruby client for Elastic. See the `elasticsearch` or `elastic-enterprise-search`
   gems for full integration.
 
@@ -259,20 +245,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- ".github/check_license_headers.rb"
-- ".github/license-header.txt"
-- ".github/workflows/license.yml"
-- ".github/workflows/otel.yml"
-- ".github/workflows/tests.yml"
-- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
-- Gemfile-faraday1.gemfile
 - LICENSE
 - README.md
-- Rakefile
-- elastic-transport.gemspec
 - lib/elastic-transport.rb
 - lib/elastic/transport.rb
 - lib/elastic/transport/client.rb
@@ -292,29 +268,6 @@ files:
 - lib/elastic/transport/transport/serializer/multi_json.rb
 - lib/elastic/transport/transport/sniffer.rb
 - lib/elastic/transport/version.rb
-- spec/elastic/connections/collection_spec.rb
-- spec/elastic/connections/selector_spec.rb
-- spec/elastic/transport/base_spec.rb
-- spec/elastic/transport/client_spec.rb
-- spec/elastic/transport/http/curb_spec.rb
-- spec/elastic/transport/http/faraday_spec.rb
-- spec/elastic/transport/http/manticore_spec.rb
-- spec/elastic/transport/meta_header_spec.rb
-- spec/elastic/transport/opentelemetry_spec.rb
-- spec/elastic/transport/sniffer_spec.rb
-- spec/spec_helper.rb
-- test/integration/jruby_test.rb
-- test/integration/transport_test.rb
-- test/profile/client_benchmark_test.rb
-- test/test_helper.rb
-- test/unit/adapters_test.rb
-- test/unit/connection_test.rb
-- test/unit/response_test.rb
-- test/unit/serializer_test.rb
-- test/unit/transport_base_test.rb
-- test/unit/transport_curb_test.rb
-- test/unit/transport_faraday_test.rb
-- test/unit/transport_manticore_test.rb
 homepage: https://github.com/elastic/elastic-transport-ruby
 licenses:
 - Apache-2.0
@@ -338,30 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.12
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
-test_files:
-- spec/elastic/connections/collection_spec.rb
-- spec/elastic/connections/selector_spec.rb
-- spec/elastic/transport/base_spec.rb
-- spec/elastic/transport/client_spec.rb
-- spec/elastic/transport/http/curb_spec.rb
-- spec/elastic/transport/http/faraday_spec.rb
-- spec/elastic/transport/http/manticore_spec.rb
-- spec/elastic/transport/meta_header_spec.rb
-- spec/elastic/transport/opentelemetry_spec.rb
-- spec/elastic/transport/sniffer_spec.rb
-- spec/spec_helper.rb
-- test/integration/jruby_test.rb
-- test/integration/transport_test.rb
-- test/profile/client_benchmark_test.rb
-- test/test_helper.rb
-- test/unit/adapters_test.rb
-- test/unit/connection_test.rb
-- test/unit/response_test.rb
-- test/unit/serializer_test.rb
-- test/unit/transport_base_test.rb
-- test/unit/transport_curb_test.rb
-- test/unit/transport_faraday_test.rb
-- test/unit/transport_manticore_test.rb
+test_files: []

data/.github/check_license_headers.rb

@@ -1,33 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-LICENSE = File.read('./.github/license-header.txt')
-files = `git ls-files | grep -E '\.rb|Rakefile|\.rake|\.erb|Gemfile|gemspec'`.split("\n")
-errors = []
-
-files.each do |file|
-  unless File.read(file).include?(LICENSE)
-    errors << file
-    puts "#{file} doesn't contain the correct license header"
-  end
-end
-
-if errors.empty?
-  puts 'All checked files have the correct license header'
-else
-  exit 1
-end

data/.github/license-header.txt

@@ -1,16 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.

data/.github/workflows/license.yml

@@ -1,13 +0,0 @@
-name: License headers
-on: [pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '4.0'
-    - name: Check license headers
-      run: |
-        ruby ./.github/check_license_headers.rb

data/.github/workflows/otel.yml

@@ -1,48 +0,0 @@
-name: opentelemetry
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-jobs:
-  test-otel:
-    name: 'Test Open Telemetry'
-    env:
-      TEST_ES_SERVER: http://localhost:9250
-      PORT: 9250
-      TEST_WITH_OTEL: true
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['4.0', 'jruby-9.4']
-        es_version: ['9.4.0-SNAPSHOT']
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Increase system limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-      - uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: ${{ matrix.es_version }}
-          security-enabled: false
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Build and test with Rake
-        run: |
-          sudo apt-get update
-          sudo apt-get install libcurl4-openssl-dev
-          ruby -v
-          bundle install
-      - name: unit tests
-        run: bundle exec rake test:unit
-      - name: specs
-        run: bundle exec rake test:spec
-      - name: integration tests
-        run: bundle exec rake test:integration

data/.github/workflows/tests.yml

@@ -1,86 +0,0 @@
-name: 8.5 tests
-on:
-  push:
-    branches:
-      - 8.5
-  pull_request:
-    branches:
-      - 8.5
-  workflow_dispatch:
-jobs:
-  test:
-    name: 'Main tests'
-    env:
-      TEST_ES_SERVER: http://localhost:9250
-      PORT: 9250
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['3.2', '3.3', '3.4', '4.0', 'jruby-9.3', 'jruby-9.4', 'jruby-10.0']
-        es_version: ['8.19.14-SNAPSHOT', '9.2.8-SNAPSHOT', '9.3.3-SNAPSHOT', '9.4.0-SNAPSHOT']
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Increase system limits
-      run: |
-        sudo swapoff -a
-        sudo sysctl -w vm.swappiness=1
-        sudo sysctl -w fs.file-max=262144
-        sudo sysctl -w vm.max_map_count=262144
-    - uses: elastic/elastic-github-actions/elasticsearch@master
-      with:
-        stack-version: ${{ matrix.es_version }}
-        security-enabled: false
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Build and test with Rake
-      run: |
-        sudo apt-get update
-        sudo apt-get install libcurl4-openssl-dev
-        ruby -v
-        bundle install
-    - name: unit tests
-      run: bundle exec rake test:unit
-    - name: specs
-      run: bundle exec rake test:spec
-    - name: integration tests
-      run: bundle exec rake test:integration
-  test-faraday1:
-    name: 'Test Faraday 1'
-    env:
-      TEST_ES_SERVER: http://localhost:9250
-      PORT: 9250
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3', 'jruby-9.3']
-        es_version: ['8.19.14-SNAPSHOT']
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Increase system limits
-      run: |
-        sudo swapoff -a
-        sudo sysctl -w vm.swappiness=1
-        sudo sysctl -w fs.file-max=262144
-        sudo sysctl -w vm.max_map_count=262144
-    - uses: elastic/elastic-github-actions/elasticsearch@master
-      with:
-        stack-version: ${{ matrix.es_version }}
-        security-enabled: false
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Build and test with Rake
-      run: |
-        sudo apt-get update
-        sudo apt-get install libcurl4-openssl-dev
-        ruby -v
-        BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle install
-    - name: faraday1 unit tests
-      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:unit
-    - name: specs
-      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:spec
-    - name: integration tests
-      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:integration

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-*.log
-.byebug_history
-.bundle
-.config
-.yardoc
-Gemfile*.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,39 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in elasticsearch-transport.gemspec
-gemspec
-
-group :development, :test do
-  gem 'faraday-excon'
-  gem 'faraday-httpclient'
-  gem 'faraday-net_http_persistent'
-  gem 'faraday-typhoeus'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
-  gem 'opentelemetry-sdk', require: false if RUBY_VERSION >= '3.0'
-  if defined?(JRUBY_VERSION)
-    gem 'pry-nav'
-  else
-    gem 'async-http-faraday'
-    gem 'faraday-patron'
-    gem 'oj'
-    gem 'debug'
-  end
-  gem 'rspec'
-end

data/Gemfile-faraday1.gemfile

@@ -1,40 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-source 'https://rubygems.org'
-
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle install
-# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:unit
-
-gem 'faraday', '~> 1'
-gemspec
-
-group :development, :test do
-  gem 'httpclient'
-  gem 'net-http-persistent'
-  gem 'rspec'
-  gem 'typhoeus'
-  if defined?(JRUBY_VERSION)
-    gem 'pry-nav'
-  else
-    gem 'debug'
-    gem 'oj'
-    gem 'patron'
-  end
-end