logstash-mixin-rabbitmq_connection 5.0.2-java → 5.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a83e28c89d845adb27fba7b0704e4d51d538e10c1afff0fcf0ecea9f414265d9
-  data.tar.gz: e30669ac8c6e1adecc15d3d6a31d809865ea79e83a43b3f929be91e437e9f334
+  metadata.gz: 818efc953a67373bc805010913c45d885adf6ddc65f9e4488fe015593a776d13
+  data.tar.gz: 3ef95cd4c7adbecfda0c8082bf63d936b4b14c2bfd44d3669f69467fa215fd0e
 SHA512:
-  metadata.gz: 959a2c58bb14181ba9b95c30d2dae840b2d50c9d18446b7a86f62e036873187da4cc58f5ecd1e49f11fddb704ce8a1ec7666dc4cd4b3e333c544183468913449
-  data.tar.gz: a292cb3169a52fdf54bac75e4bd8c3b95b2789335453003f3e1bb4d010213ff74606742d7472fa982ee666ef2813b55bb3a289f31b5f7a240191f5c9eea562a8
+  metadata.gz: 9f6a6561d2a2e2ea97802f4473f2b7b77ae6ce71dbd23163d1ea1ede42dd7484ee78617594057163757aeea0846254b21dc377da0be2ea1677c119ba90c4c58f
+  data.tar.gz: 4f72684a92ce299c13b8d9f507bd8168190ffb334be3a2e0c4c58e574ab149d596345bd874c0fbd193b00941adff2481074f1ce32095c0847bc199db454f27ea

data/.travis.yml

@@ -1,18 +1,16 @@
 ---
-sudo: false
-language: ruby
-cache: bundler
+sudo: required
+services: docker
+addons:
+  apt:
+    packages:
+      - docker-ce
 matrix:
   include:
-  - rvm: jruby-9.1.13.0
-    env: LOGSTASH_BRANCH=master
-  - rvm: jruby-9.1.13.0
-    env: LOGSTASH_BRANCH=6.x
-  - rvm: jruby-9.1.13.0
-    env: LOGSTASH_BRANCH=6.0
-  - rvm: jruby-1.7.27
-    env: LOGSTASH_BRANCH=5.6
+    - env: ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
+    - env: ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
+    - env: ELASTIC_STACK_VERSION=7.x
+    - env: ELASTIC_STACK_VERSION=6.x
   fast_finish: true
-install: true
-script: ci/build.sh
-jdk: oraclejdk8
+install: ci/unit/docker-setup.sh
+script: ci/unit/docker-run.sh

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1.0
+   - Updated `march_hare` dependency to `4.x`, which enables consumers to reliably manage a connection blocked/unblocked state machine that survives connection recovery.
+   - Removed support for Logstash 5.x since `march_hare` >= 3.x is not compatible.
 ## 5.0.2
    - Bug Fix: undefined method `value' for nil:NilClass with SSL enabled, but no certificates provided [#109](https://github.com/logstash-plugins/logstash-input-rabbitmq/issues/109)
 ## 5.0.1

data/ci/unit/Dockerfile

@@ -0,0 +1,11 @@
+ARG ELASTIC_STACK_VERSION
+FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION
+COPY --chown=logstash:logstash Gemfile /usr/share/plugins/plugin/Gemfile
+COPY --chown=logstash:logstash *.gemspec /usr/share/plugins/plugin/
+RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml
+ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin"
+ENV LOGSTASH_SOURCE="1"
+RUN gem install bundler -v '< 2'
+WORKDIR /usr/share/plugins/plugin
+RUN bundle install
+COPY --chown=logstash:logstash . /usr/share/plugins/plugin

data/ci/unit/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3'
+
+# run tests:  cd ci/unit; docker-compose up --build --force-recreate
+# manual:  cd ci/unit; docker-compose run logstash bash
+services:
+
+  logstash:
+    build:
+      context: ../../
+      dockerfile: ci/unit/Dockerfile
+      args:
+        - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
+    command: /usr/share/plugins/plugin/ci/unit/run.sh
+    environment:
+      LS_JAVA_OPTS: "-Xmx256m -Xms256m"
+      LOGSTASH_SOURCE: 1
+    tty: true

data/ci/unit/docker-run.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ # This is intended to be run inside the docker container as the command of the docker-compose.
+set -ex
+docker-compose -f ci/unit/docker-compose.yml up --exit-code-from logstash

data/ci/unit/docker-setup.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+ # This is intended to be run the plugin's root directory. `ci/unit/docker-test.sh`
+# Ensure you have Docker installed locally and set the ELASTIC_STACK_VERSION environment variable.
+set -e
+
+ VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logstash_releases.json"
+
+ if [ -z "${ELASTIC_STACK_VERSION}" ]; then
+    echo "Please set the ELASTIC_STACK_VERSION environment variable"
+    echo "For example: export ELASTIC_STACK_VERSION=6.2.4"
+    exit 1
+fi
+
+ echo "Fetching versions from $VERSION_URL"
+VERSIONS=$(curl $VERSION_URL)
+
+ if [[ "$SNAPSHOT" = "true" ]]; then
+  ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.snapshots."'"$ELASTIC_STACK_VERSION"'"')
+  echo $ELASTIC_STACK_RETRIEVED_VERSION
+else
+  ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.releases."'"$ELASTIC_STACK_VERSION"'"')
+fi
+
+ if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then
+  # remove starting and trailing double quotes
+  ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION%\"}"
+  ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}"
+  echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}"
+  export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION
+fi
+
+ echo "Testing against version: $ELASTIC_STACK_VERSION"
+
+ if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
+    cd /tmp
+
+    jq=".build.projects.logstash.packages.\"logstash-$ELASTIC_STACK_VERSION-docker-image.tar.gz\".url"
+    result=$(curl --silent https://artifacts-api.elastic.co/v1/versions/$ELASTIC_STACK_VERSION/builds/latest | jq -r $jq)
+    echo $result
+    curl $result > logstash-docker-image.tar.gz
+    tar xfvz logstash-docker-image.tar.gz  repositories
+    echo "Loading docker image: "
+    cat repositories
+    docker load < logstash-docker-image.tar.gz
+    rm logstash-docker-image.tar.gz
+    cd -
+fi
+
+ if [ -f Gemfile.lock ]; then
+    rm Gemfile.lock
+fi
+
+ docker-compose -f ci/unit/docker-compose.yml down
+docker-compose -f ci/unit/docker-compose.yml build

data/ci/unit/run.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+ # This is intended to be run inside the docker container as the command of the docker-compose.
+set -ex
+
+ #bundle exec rspec -fd --pattern spec/**/*_spec.rb,spec/**/*_specs.rb
+bundle exec rspec -fd

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '5.0.2'
+  s.version         = '5.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -17,7 +17,12 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.platform = RUBY_PLATFORM
-  s.add_runtime_dependency 'march_hare', ['~> 3.0'] #(MIT license)
+
+  # MarchHare 3.x+ includes ruby syntax from 2.x
+  # This effectively requires Logstash >= 6.x
+  s.required_ruby_version = '>= 2.0.0'
+
+  s.add_runtime_dependency 'march_hare', ['~> 4.0'] #(MIT license)
   s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   name: march_hare
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -97,8 +97,11 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- ci/build.sh
-- ci/setup.sh
+- ci/unit/Dockerfile
+- ci/unit/docker-compose.yml
+- ci/unit/docker-run.sh
+- ci/unit/docker-setup.sh
+- ci/unit/run.sh
 - lib/logstash/plugin_mixins/rabbitmq_connection.rb
 - logstash-mixin-rabbitmq_connection.gemspec
 - spec/fixtures/README.md
@@ -142,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ci/build.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# version: 1
-########################################################
-#
-# AUTOMATICALLY GENERATED! DO NOT EDIT
-#
-########################################################
-set -e
-
-echo "Starting build process in: `pwd`"
-source ./ci/setup.sh
-
-if [[ -f "ci/run.sh" ]]; then
-    echo "Running custom build script in: `pwd`/ci/run.sh"
-    source ./ci/run.sh
-else
-    echo "Running default build scripts in: `pwd`/ci/build.sh"
-    bundle install
-    bundle exec rake vendor
-    bundle exec rspec spec
-fi

data/ci/setup.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-# version: 1
-########################################################
-#
-# AUTOMATICALLY GENERATED! DO NOT EDIT
-#
-########################################################
-set -e
-if [ "$LOGSTASH_BRANCH" ]; then
-    echo "Building plugin using Logstash source"
-    BASE_DIR=`pwd`
-    echo "Checking out branch: $LOGSTASH_BRANCH"
-    git clone -b $LOGSTASH_BRANCH https://github.com/elastic/logstash.git ../../logstash --depth 1
-    printf "Checked out Logstash revision: %s\n" "$(git -C ../../logstash rev-parse HEAD)"
-    cd ../../logstash
-    echo "Building plugins with Logstash version:"
-    cat versions.yml
-    echo "---"
-    # We need to build the jars for that specific version
-    echo "Running gradle assemble in: `pwd`"
-    ./gradlew assemble
-    cd $BASE_DIR
-    export LOGSTASH_SOURCE=1
-else
-    echo "Building plugin using released gems on rubygems"
-fi