fluent-plugin-newrelic 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb4af63cf04a60335e50efdc0861bb8207a8486abf19c119f19622c0d36f523
-  data.tar.gz: c64ccd499c958400b1be3459c7ec9c864515baa7155839f817a6627e5bef14a5
+  metadata.gz: e7132fae0051be2d81093419b87196ecc3b2b07047ab40dae17998f0951ab61f
+  data.tar.gz: 86bb2c5967400fc48f8ccbae6fcb392b3900a55565d0f788d91d4dd53c679701
 SHA512:
-  metadata.gz: da6b7569f2f5555c902673beff340926993167cb68b8f11f6154c80fe48a82158ff7eb41c86828517ee56f1957417822ad25a8203ef18e9a9c4b4121222f93cd
-  data.tar.gz: e7bbc86ca57b5c20df3e81c7ff61750b0a8e0cad1424ec22ca1cab875de2159fabb8becb768600b7959cab7cd48a4c69a51af4ba3204fc79ae656932dfac4ead
+  metadata.gz: 58b0684282ed9d718483f986f6bdd8d3be52179ceb7c754fd1a5483661d25596f2063592db1c6d7bbc9bb3773aff22fa7e6533f602f220aab5ff7b71b12b4f75
+  data.tar.gz: cba6c35190cc781d3ecc083981faf08e4adac7daf2a3ad7b3afe6c3c47ea0babb012db0bba82fa7e88bb56415342d0894e6492223b5699d630faec546e0df59f

data/.gitignore

@@ -5,7 +5,7 @@
 /coverage/
 /doc/
 /pkg/
-/spec/reports/
+/test/reports/
 /tmp/
 .DS_Store
 .ruby-version

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "rspec"
+  gem "ci_reporter_test_unit"
 end

data/README.md

@@ -34,11 +34,11 @@ Exactly one of the following:
 
 | Property | Description | Default value |
 |---|---|---|
-| base_uri | New Relic ingestion endpoint | 'https://log-api.newrelic.com/log/v1' |
+| base_uri | New Relic ingestion endpoint | `https://log-api.newrelic.com/log/v1` |
 
 ### EU plugin configuration
 
-If you are running this plugin in the eu set the `base_uri` to `http://log-api.eu.newrelic.com/log/v1`.
+If you are running this plugin in the eu set the `base_uri` to `https://log-api.eu.newrelic.com/log/v1`.
 
 ### Fields
 

data/Rakefile

@@ -1,2 +1,19 @@
-require "bundler/gem_tasks"
+require "bundler"
+Bundler::GemHelper.install_tasks
+
+require "rake/testtask"
+require 'ci/reporter/rake/test_unit'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs.push("lib", "test")
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = true
+  t.warning = true
+end
+
+namespace :ci do
+  task :all => ['ci:setup:testunit', 'test']
+end
+
+task default: ["ci:all"]
 

data/lib/fluent/plugin/out_newrelic.rb

@@ -50,16 +50,15 @@ module Fluent
       def configure(conf)
         super
         if @api_key.nil? && @license_key.nil?
-          raise Fluent::ConfigError.new("'api_key' or `license_key` parameter is required") 
+          raise Fluent::ConfigError.new("'api_key' or 'license_key' parameter is required") 
         end
 
         # create initial sockets hash and socket based on config param
         @end_point = URI.parse(@base_uri)
         auth = {
           @api_key.nil? ? 'X-License-Key' : 'X-Insert-Key' =>
-          @api_key.nil? ? @license_key : @api_key 
+          @api_key.nil? ? @license_key : @api_key
         }
-        puts auth
         @header = {
             'X-Event-Source' => 'logs',
             'Content-Encoding' => 'gzip'
@@ -130,7 +129,6 @@ module Fluent
         http = Net::HTTP.new(@end_point.host, 443)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        puts @header
         request = Net::HTTP::Post.new(@end_point.request_uri, @header)
         request.body = payload
         handle_response(http.request(request))

data/lib/newrelic-fluentd-output/version.rb

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/merge-to-master-pipeline.yml

@@ -0,0 +1,57 @@
+# Run any time a commit is merged to the 'master' branch
+trigger:
+  - master
+
+# There is a separate pipeline for PRs (it does not do deploys)
+pr: none
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+  - task: DownloadSecureFile@1
+    name: "rubyGemsCredentials"
+    inputs:
+      secureFile: 'credentials'
+
+  - task: UseRubyVersion@0
+    inputs:
+      versionSpec: '>= 2.5'
+
+  - script: |
+      gem install bundler
+      bundle update
+      bundle install --retry=3 --jobs=4
+    displayName: 'bundle install'
+
+  - task: Bash@3
+    displayName: 'Run tests'
+    inputs:
+      targetType: 'inline'
+      script: |
+        bundle exec rake
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: 'JUnit'
+      testResultsFiles: '**/TEST-*.xml'
+      mergeTestResults: true
+      failTaskOnFailedTests: true
+      testRunTitle: 'Publish tests'
+
+  - task: Bash@3
+    displayName: 'Build gem'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gem build newrelic-fluentd-output.gemspec
+
+  - task: Bash@3
+    displayName: 'Publish gem to RubyGems'
+    inputs:
+      targetType: 'inline'
+      script: |
+        eval "$(rbenv init -)"
+        mv $(rubyGemsCredentials.secureFilePath) ~/.gem/credentials
+        sudo chmod 600 ~/.gem/credentials
+        gem push fluent-plugin-newrelic-*.gem

data/newrelic-fluentd-output.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rspec_junit_formatter"
 end

data/pr-pipeline.yml

@@ -0,0 +1,33 @@
+pr:
+  branches:
+    include:
+      - '*'
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+  - task: UseRubyVersion@0
+    inputs:
+      versionSpec: '>= 2.5'
+
+  - script: |
+      gem install bundler
+      bundle update
+      bundle install --retry=3 --jobs=4
+    displayName: 'bundle install'
+
+  - task: Bash@3
+    displayName: 'Run tests'
+    inputs:
+      targetType: 'inline'
+      script: |
+        bundle exec rake
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: 'JUnit'
+      testResultsFiles: '**/TEST-*.xml'
+      mergeTestResults: true
+      failTaskOnFailedTests: true
+      testRunTitle: 'Publish tests'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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'
 description: 
 email:
 - logging-team@newrelic.com
@@ -89,17 +103,16 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
-- ".rspec"
-- DEVELOPER.md
 - Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- grandcentral.yml
 - lib/fluent/plugin/out_newrelic.rb
 - lib/newrelic-fluentd-output/version.rb
+- merge-to-master-pipeline.yml
 - newrelic-fluentd-output.gemspec
+- pr-pipeline.yml
 homepage: https://github.com/newrelic/newrelic-fluentd-output
 licenses:
 - Apache-2.0
@@ -119,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sends FluentD events to New Relic

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/DEVELOPER.md

@@ -1,77 +0,0 @@
-# Developing the plugin
-
-## Developing
-
-* Install Bundler gem: `gem install bundler`
-* Install dependencies: `bundle install`
-* Write tests and production code!
-* Bump version: edit version file `version.rb`
-* Run tests: `bundle exec rspec`
-* Build the gem: `gem build newrelic-fluentd-output.gemspec`
-
-**NOTE**: Be mindful that if you are using 'match **', that using `log.info` in the plugin can cause an unintended 
-Sorcerer's Apprentice Syndrome issue where exponentially larger copies of log messages are sent until the 
-td-agent is unloaded. To prevent this, use match tags specific to your source (so use `<match tag_from_your_source>`
-instead of `<match **>`), so that your output plugin does not also pick up things that Fluentd logs.
-
-## Testing on MacOS
-
-### Install Fluentd
-* `brew cask install td-agent`
-
-### Configure Fluentd
-* `sudo vi /etc/td-agent/td-agent.conf`
-* Add the following:
-```
-<source>
-  @type tail
-  format none
-  path /usr/local/var/log/test.log
-  tag test
-</source>
-
-<match test>
-  @type newrelic
-  api_key (your-api-key)
-</match>
-```
-
-### Testing plugin
-* Stop Fluentd: `sudo launchctl unload /Library/LaunchDaemons/td-agent.plist`
-* Remove previous version: `sudo /opt/td-agent/usr/sbin/td-agent-gem uninstall fluent-plugin-newrelic`
-* Add new version: `sudo /opt/td-agent/usr/sbin/td-agent-gem install fluent-plugin-newrelic-<version>.gem`
-* Start Fluentd: `sudo launchctl load /Library/LaunchDaemons/td-agent.plist`
-* Make sure things start up OK: `tail -f /var/log/td-agent/td-agent.log`
-* Cause a change that you've configured Fluentd to pick up: (`echo "FluentdTest" >> /usr/local/var/log/test.log`
-* Look in `https://one.newrelic.com/launcher/logger.log-launcher` for your log message ("FluentdTest")
-
-## Pushing changes to the public repo
-
-After updating the New Relic repo with changes, changes will need to be pushed to the public GitHub repo 
-at: https://github.com/newrelic/newrelic-fluentd-output
-
-Make sure you have the public set up as a remote called `public`:
-```
-git remote add public git@github.com:newrelic/newrelic-fluentd-output.git
-```
-
-Sync:
-```
-git checkout --orphan single-commit-for-public-sync && \
-    # Remove things we don't want sent to the public-sync repo \
-    rm grandcentral.yml DEVELOPER.md && \
-    # Create a single commit and force push it, overwriting the remote master \
-    git commit -am "Mirrored commit" && \
-    git push --force public single-commit-for-public-sync:master && \
-    # Clean up \
-    git checkout master && \
-    git branch -D single-commit-for-public-sync
-```
-
-# Push changes to RubyGems
-After updating the source code and gem version in `version.rb`, push the changes to RubyGems. 
-Note, you must be a gem owner to publish changes on [RubyGems.org](https://rubygems.org/profiles/NR-LOGGING)
-
-* Build the gem: `gem build newrelic-fluentd-output.gemspec`
-* Publish the gem: `gem push fluent-plugin-newrelic-<VERSION>.gem` 
-  with the updated version (example: `gem push fluent-plugin-newrelic-0.2.2.gem`)

data/grandcentral.yml

@@ -1,29 +0,0 @@
-slack_channel: logging-notifications
-deploy_mechanism: none
-test_suites:
-- command: |
-    mkdir -p ~/.gem
-    curl -u $ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD https://artifacts.datanerd.us/api/gems/newrelic-gems-local/api/v1/api_key.yaml -o ~/.gem/credentials
-    chmod 0600 ~/.gem/credentials
-    bundle install && bundle exec rspec
-  environment:
-    dockerfile: Dockerfile
-  name: Unit Tests
-build:
-  environment:
-    dockerfile: Dockerfile
-    secret_env_vars:
-    - name: ARTIFACTORY_USERNAME
-      shared_path: artifactory
-    - name: ARTIFACTORY_PASSWORD
-      shared_path: artifactory
-  publish:
-    command: |
-      mkdir -p ~/.gem
-      curl -u $ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD https://artifacts.datanerd.us/api/gems/newrelic-gems-local/api/v1/api_key.yaml -o ~/.gem/credentials
-      chmod 0600 ~/.gem/credentials
-      bundle install
-      gem release --host https://artifacts.datanerd.us/api/gems/newrelic-gems-local
-  read_version:
-    command: cat ./lib/newrelic-fluentd-output/version.rb | grep VERSION | awk '{
-      gsub("\"", "", $3); print $3 }'