logstash-filter-elastic_integration 0.1.4-java → 0.1.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc62139a23aa300f55f6b999e10f879964255c073a970a4bd9270f12fb10f1cd
-  data.tar.gz: 55e373e0f1dcd5b51bc71947f9e2c819918b6ccdecbbdea5fcd3d0c8690ee800
+  metadata.gz: 42064e629d840e1dde24f44a4ec639e5afd3b1a371933e566324b9ccee02b5fd
+  data.tar.gz: 152eb97750aaff4203adb509d5b2bd603f122f587ac47f6e34830ac9d6850b32
 SHA512:
-  metadata.gz: 710c901f9047b62c5622590471d3d5659f7491a4733c59d8ca4b3605abce6a5778439b1c361b9d0e575204bd3ee7b9c3e69da14384223d0c3d66e1b248a64b64
-  data.tar.gz: b392b6cda55d16313dd9aeb62a69c3b03c7c845e3df8ebae8785079b67da1162746ddcc2358fc61101dd9a8080e3d6d0d35f4001baa682c1338876ba25d1adf0
+  metadata.gz: 7a130149b460b772bac9038862ad57527df69d7b91d849b16c443f31da0e19a74b139ae96554b3da34b3385179468252ada90ace1c3301d3ef83b371db9ae166
+  data.tar.gz: 420425f9ba131bbc5206fe429c629265cdc73871a4bdb2c75fa71c61679bbb8b5ee38b468420c5b82efb1cf65120cb36555d0aab617192abbbe09e6fa1269d52

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/lib/logstash/filters/elastic_integration/jar_dependencies.rb

@@ -8,4 +8,4 @@
 ########################################################################
 
 require 'jar_dependencies'
-require_jar('co/elastic', 'logstash-filter-elastic_integration', '0.1.4')
+require_jar('co/elastic', 'logstash-filter-elastic_integration', '0.1.6')

data/lib/logstash/filters/elastic_integration/version.rb

@@ -0,0 +1,10 @@
+# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
+
+########################################################################
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V.
+# under one or more contributor license agreements. Licensed under the
+# Elastic License 2.0; you may not use this file except in compliance
+# with the Elastic License 2.0.
+########################################################################
+
+LogStash::Filters::ElasticIntegration::VERSION='0.1.6'

data/lib/logstash/filters/elastic_integration.rb

@@ -20,6 +20,9 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   HTTPS_PROTOCOL = "https".freeze
   ELASTIC_API_VERSION = "2023-10-31".freeze
 
+  require_relative "elastic_integration/version"
+  USER_AGENT_HEADER_VALUE = "Logstash/v#{LOGSTASH_VERSION} (ElasticIntegration/v#{VERSION})"
+
   # Sets the host(s) of the remote instance. If given an array it will load balance
   # requests across the hosts specified in the `hosts` parameter. Hosts can be any of
   # the forms:
@@ -337,24 +340,27 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def initialize_elasticsearch_rest_client!
-    java_import('co.elastic.logstash.filters.elasticintegration.ElasticsearchRestClientBuilder')
-    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
-
     config = extract_immutable_config
-    @elasticsearch_rest_client = ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
-                                                               .map(&:build)
-                                                               .orElseThrow() # todo: ruby/java bridge better exception
+    @elasticsearch_rest_client = _elasticsearch_rest_client(config)
 
     if serverless?
-      @elasticsearch_rest_client = ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
-                                                                 .map do |builder|
-                                                                    builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
-                                                                  end
-                                                                 .map(&:build)
-                                                                 .orElseThrow()
+      @elasticsearch_rest_client = _elasticsearch_rest_client(config) do |builder|
+                                    builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
+                                  end
     end
   end
 
+  def _elasticsearch_rest_client(config, &builder_interceptor)
+    java_import('co.elastic.logstash.filters.elasticintegration.ElasticsearchRestClientBuilder')
+    java_import('java.util.function.Function')
+
+    ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
+                                  .map { |builder| builder.setUserAgentHeaderValue(USER_AGENT_HEADER_VALUE) }
+                                  .map(&(builder_interceptor || Function::identity.method(:apply)))
+                                  .map(&:build)
+                                  .orElseThrow() # todo: ruby/java bridge better exception
+  end
+
   def initialize_event_processor!
     java_import('co.elastic.logstash.filters.elasticintegration.EventProcessorBuilder')
     java_import('co.elastic.logstash.filters.elasticintegration.geoip.GeoIpProcessorFactory')
@@ -368,13 +374,12 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def perform_preflight_check!
-    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
-
     check_user_privileges!
     check_es_cluster_license!
   end
 
   def check_user_privileges!
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).checkUserPrivileges
   rescue => e
     security_error_message = "no handler found for uri [/_security/user/_has_privileges]"
@@ -398,12 +403,14 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def check_es_cluster_license!
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).checkLicense
   rescue => e
     raise_config_error!(e.message)
   end
 
   def serverless?
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).isServerless
   rescue => e
     raise_config_error!(e.message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elastic_integration
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -73,8 +73,9 @@ files:
 - lib/logstash/filters/elastic_integration/event_api_bridge.rb
 - lib/logstash/filters/elastic_integration/geoip_database_provider_bridge.rb
 - lib/logstash/filters/elastic_integration/jar_dependencies.rb
+- lib/logstash/filters/elastic_integration/version.rb
 - logstash-filter-elastic_integration.gemspec
-- vendor/jar-dependencies/co/elastic/logstash-filter-elastic_integration/0.1.4/logstash-filter-elastic_integration-0.1.4.jar
+- vendor/jar-dependencies/co/elastic/logstash-filter-elastic_integration/0.1.6/logstash-filter-elastic_integration-0.1.6.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - ELv2