Merge branch 'master' into next

bugsnag · Jun 20, 2018 · 327dd01 · 327dd01
2 parents ae02477 + 56f387e
commit 327dd01
Show file tree

Hide file tree

Showing 358 changed files with 7,858 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ vendor
 # For rubinius:
 #*.rbc
 bin
+
+# For Bugsnag-Maze-Runner:
+maze_output
diff --git a/.travis.yml b/.travis.yml
@@ -56,6 +56,46 @@ jobs:
     - GEMSETS="test rubocop"
     rvm: 2.4.1
     script: bundle exec ./bin/rubocop lib/
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/plain_features
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/sidekiq.feature
+  # - stage: test
+  #   addons:
+  #     apt:
+  #       packages:
+  #       - docker-ce
+  #   sudo: required
+  #   sevices:
+  #   - docker
+  #   env:
+  #   - BUNDLE_VERSION=1.12.0
+  #   - GEMSETS="test maze"
+  #   - MAX_MAZE_CONNECT_ATTEMPTS=20
+  #   rmv: 2.4.1
+  #   script: bundle exec bugsnag-maze-runner -c features/rails_features
   - stage: deploy
     env:
     - BUNDLE_VERSION=1.12.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## 6.7.3 (18 May 2018)
+
+### Fixes
+
+* Apply metadata filters to HTTP referer fields
+  | [#460](https://github.com/bugsnag/bugsnag-ruby/pull/460)
+  | [Renee Balmert](https://github.com/tremlab)
+
 ## 6.7.2 (24 Apr 2018)
 
 ### Fixes

diff --git a/Gemfile b/Gemfile
@@ -12,20 +12,24 @@ group :test, optional: true do
 end
 
 group :coverage, optional: true do
-    gem 'simplecov'
-    gem 'coveralls'
+  gem 'simplecov'
+  gem 'coveralls'
 end
 
 group :rubocop, optional: true do
-    gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 0.52.1'
 end
 
 group :sidekiq, optional: true do
-    gem 'sidekiq', '~> 5.0.4'
+  gem 'sidekiq', '~> 5.0.4'
 end
 
 group :doc, optional: true do
   gem 'hanna-nouveau'
 end
 
+group :maze, optional: true do
+  gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner' if RUBY_VERSION >= '2.0.0'
+end
+
 gemspec
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.7.2
+6.7.3
diff --git a/example/rails-51/config/initializers/bugsnag.rb b/example/rails-51/config/initializers/bugsnag.rb
@@ -1,5 +1,3 @@
 Bugsnag.configure do |config|
-  config.api_key = "12312312312312312312312312312312"
-  config.auto_capture_sessions = false
-  config.endpoint = "http://localhost:62000"
+  config.api_key = "YOUR_API_KEY_HERE"
 end
diff --git a/features/fixtures/delayed_job/.dockerignore b/features/fixtures/delayed_job/.dockerignore
@@ -0,0 +1 @@
+Gemfile.lock
diff --git a/features/fixtures/delayed_job/Dockerfile b/features/fixtures/delayed_job/Dockerfile
@@ -0,0 +1,12 @@
+ARG ruby_version
+FROM ruby:$ruby_version
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY Gemfile /usr/src/app/
+RUN bundle install
+
+COPY . /usr/src/app
+
+CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"]
diff --git a/features/fixtures/delayed_job/Gemfile b/features/fixtures/delayed_job/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'bugsnag'
+gem 'delayed_job'
diff --git a/features/fixtures/docker-compose.yml b/features/fixtures/docker-compose.yml
@@ -0,0 +1,247 @@
+version: '3.4'
+services:
+  # dep for job systems
+  redis:
+    image: redis
+
+  plain-ruby:
+    build:
+      context: plain
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+    environment:
+      - BUGSNAG_API_KEY
+      - http_proxy
+      - https_proxy
+      - MAZE_API_KEY
+      - MAZE_APP_TYPE
+      - MAZE_APP_VERSION
+      - MAZE_AUTO_CAPTURE_SESSIONS
+      - MAZE_AUTO_NOTIFY
+      - MAZE_ENDPOINT
+      - MAZE_IGNORE_CLASS
+      - MAZE_IGNORE_MESSAGE
+      - MAZE_META_DATA_FILTERS
+      - MAZE_NOTIFY_RELEASE_STAGE
+      - MAZE_PROJECT_ROOT
+      - MAZE_PROXY_HOST
+      - MAZE_PROXY_PASSWORD
+      - MAZE_PROXY_PORT
+      - MAZE_PROXY_USER
+      - MAZE_RELEASE_STAGE
+      - MAZE_SEND_CODE
+      - MAZE_SEND_ENVIRONMENT
+      - MAZE_SESSION_ENDPOINT
+      - MAZE_TIMEOUT
+      - CALLBACK_INITIATOR
+    restart: "no"
+
+  delayed_job:
+    build:
+      context: delayed_job
+      args:
+        ruby_version: 2.0
+    depends_on:
+      - redis
+    environment:
+      - endpoint
+    restart: "no"
+
+  rack1:
+    build:
+      context: rack1
+      args:
+        - ruby_version
+    environment:
+      - endpoint
+    ports:
+      - "3001:3000"
+    restart: "no"
+  rack2:
+    build:
+      context: rack2
+      args:
+        - ruby_version
+    environment:
+      - endpoint
+    ports:
+      - "3002:3000"
+    restart: "no"
+
+  rails3:
+    build:
+      context: rails3
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+    environment:
+      - BUGSNAG_API_KEY
+      - http_proxy
+      - RAILS_ENV
+      - MAZE_API_KEY
+      - MAZE_APP_TYPE
+      - MAZE_APP_VERSION
+      - MAZE_AUTO_CAPTURE_SESSIONS
+      - MAZE_AUTO_NOTIFY
+      - MAZE_ENDPOINT
+      - MAZE_IGNORE_CLASS
+      - MAZE_IGNORE_MESSAGE
+      - MAZE_META_DATA_FILTERS
+      - MAZE_NOTIFY_RELEASE_STAGE
+      - MAZE_PROJECT_ROOT
+      - MAZE_PROXY_HOST
+      - MAZE_PROXY_PASSWORD
+      - MAZE_PROXY_PORT
+      - MAZE_PROXY_USER
+      - MAZE_RELEASE_STAGE
+      - MAZE_SEND_CODE
+      - MAZE_SEND_ENVIRONMENT
+      - MAZE_SESSION_ENDPOINT
+      - MAZE_TIMEOUT
+      - CALLBACK_INITIATOR
+    ports:
+      - target: 3000
+        published: 61283
+    restart: "no"
+
+  rails4:
+    build:
+      context: rails4
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+    environment:
+      - BUGSNAG_API_KEY
+      - http_proxy
+      - RAILS_ENV
+      - MAZE_API_KEY
+      - MAZE_APP_TYPE
+      - MAZE_APP_VERSION
+      - MAZE_AUTO_CAPTURE_SESSIONS
+      - MAZE_AUTO_NOTIFY
+      - MAZE_ENDPOINT
+      - MAZE_IGNORE_CLASS
+      - MAZE_IGNORE_MESSAGE
+      - MAZE_META_DATA_FILTERS
+      - MAZE_NOTIFY_RELEASE_STAGE
+      - MAZE_PROJECT_ROOT
+      - MAZE_PROXY_HOST
+      - MAZE_PROXY_PASSWORD
+      - MAZE_PROXY_PORT
+      - MAZE_PROXY_USER
+      - MAZE_RELEASE_STAGE
+      - MAZE_SEND_CODE
+      - MAZE_SEND_ENVIRONMENT
+      - MAZE_SESSION_ENDPOINT
+      - MAZE_TIMEOUT
+      - CALLBACK_INITIATOR
+    ports:
+      - target: 3000
+        published: 61284
+    restart: "no"
+
+  rails5:
+    build:
+      context: rails5
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+    environment:
+      - BUGSNAG_API_KEY
+      - http_proxy
+      - RAILS_ENV
+      - MAZE_API_KEY
+      - MAZE_APP_TYPE
+      - MAZE_APP_VERSION
+      - MAZE_AUTO_CAPTURE_SESSIONS
+      - MAZE_AUTO_NOTIFY
+      - MAZE_ENDPOINT
+      - MAZE_IGNORE_CLASS
+      - MAZE_IGNORE_MESSAGE
+      - MAZE_META_DATA_FILTERS
+      - MAZE_NOTIFY_RELEASE_STAGE
+      - MAZE_PROJECT_ROOT
+      - MAZE_PROXY_HOST
+      - MAZE_PROXY_PASSWORD
+      - MAZE_PROXY_PORT
+      - MAZE_PROXY_USER
+      - MAZE_RELEASE_STAGE
+      - MAZE_SEND_CODE
+      - MAZE_SEND_ENVIRONMENT
+      - MAZE_SESSION_ENDPOINT
+      - MAZE_TIMEOUT
+      - CALLBACK_INITIATOR
+    ports:
+      - target: 3000
+        published: 61285
+    restart: "no"
+
+  resque:
+    build:
+      context: resque
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+    depends_on:
+      - redis
+    environment:
+      - endpoint
+    restart: "no"
+
+  sidekiq:
+    build:
+      context: sidekiq
+      args:
+        - RUBY_VERSION
+        - APP_PATH
+        - SIDEKIQ_VERSION
+    depends_on:
+      - redis
+    environment:
+      - BUGSNAG_API_KEY
+      - http_proxy
+      - MAZE_API_KEY
+      - MAZE_APP_TYPE
+      - MAZE_APP_VERSION
+      - MAZE_AUTO_CAPTURE_SESSIONS
+      - MAZE_AUTO_NOTIFY
+      - MAZE_ENDPOINT
+      - MAZE_IGNORE_CLASS
+      - MAZE_IGNORE_MESSAGE
+      - MAZE_META_DATA_FILTERS
+      - MAZE_NOTIFY_RELEASE_STAGE
+      - MAZE_PROJECT_ROOT
+      - MAZE_PROXY_HOST
+      - MAZE_PROXY_PASSWORD
+      - MAZE_PROXY_PORT
+      - MAZE_PROXY_USER
+      - MAZE_RELEASE_STAGE
+      - MAZE_SEND_CODE
+      - MAZE_SEND_ENVIRONMENT
+      - MAZE_SESSION_ENDPOINT
+      - MAZE_TIMEOUT
+      - CALLBACK_INITIATOR
+    restart: "no"
+
+  sinatra1:
+    build:
+      context: sinatra1
+      args:
+        - ruby_version
+    environment:
+      - endpoint
+    ports:
+      - "3006:3000"
+    restart: "no"
+
+  sinatra2:
+    build:
+      context: sinatra2
+      args:
+        - ruby_version
+    environment:
+      - endpoint
+    ports:
+      - "3007:3000"
+    restart: "no"
diff --git a/features/fixtures/plain/.dockerignore b/features/fixtures/plain/.dockerignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+reportExamples
diff --git a/features/fixtures/plain/Dockerfile b/features/fixtures/plain/Dockerfile
@@ -0,0 +1,12 @@
+ARG RUBY_VERSION
+FROM ruby:$RUBY_VERSION
+
+ARG APP_PATH
+
+RUN mkdir -p $APP_PATH
+WORKDIR $APP_PATH
+
+COPY app/Gemfile $APP_PATH
+RUN bundle install
+
+COPY app $APP_PATH
diff --git a/features/fixtures/plain/app/Gemfile b/features/fixtures/plain/app/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'bugsnag'