fluent-plugin-sentry-ruby 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44619e33813ada7fe9fa8cf9f0b2ee452275e1ad26180cebfdd838cda7b5fb18
-  data.tar.gz: e603a483d51b2e8bca1ea54c74f9572b101935fd491aa2e93b741e5ddf37f38b
+  metadata.gz: 204e60b022ba9c4103a3960941f917f3c2f6bb6d3dd2cc5bbc5351384f395612
+  data.tar.gz: ea604c23453f76c502c17c3e5a7749c591ebf4a52618221053edf375989e658e
 SHA512:
-  metadata.gz: ea43d73b015beba89cff6e3b56267b3e09b142abd2b3ba25775db2ef086c04771b275ec279e56bd2729f70e7826dad98ff4cbb86df934d16a34ab0eba0159adc
-  data.tar.gz: f0636ae8d3c958864d78bbe2096a0041e36333bf8ba4012b044a13617944cbe07a8b6bb357f18cc4d882dd29d0b2c05fd3fbfb79bef7149596bc777e71b5d53f
+  metadata.gz: 271dc81cd18564dfbd72cfab382e94255b356b7faf17d8fafcb1160900f144ab723535c66a69126a6f3429ac68b7583b7e310c7f0fc00fea08893a7cbf24788d
+  data.tar.gz: 1f0d10204414fa185a76726ace2e5efcb5363a9708efbe46aaf0950b03afd145c1c8e986a3f3f08d951d6f00081a131481456cef55bf034a1dbc0a6cb1b97133

data/.devcontainer/Dockerfile

@@ -0,0 +1,17 @@
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
+ARG VARIANT=2-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional gems.
+# RUN gem install <your-gem-names-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

data/.devcontainer/base.Dockerfile

@@ -0,0 +1,43 @@
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
+ARG VARIANT=2-bullseye
+FROM ruby:${VARIANT}
+
+# Copy library scripts to execute
+COPY library-scripts/*.sh library-scripts/*.env /tmp/library-scripts/
+
+# [Option] Install zsh
+ARG INSTALL_ZSH="true"
+# [Option] Upgrade OS packages to their latest versions
+ARG UPGRADE_PACKAGES="true"
+# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
+    && apt-get purge -y imagemagick imagemagick-6-common \
+    # Install common packages, non-root user, rvm, core build tools
+    && bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
+    && bash /tmp/library-scripts/ruby-debian.sh "none" "${USERNAME}" "true" "true" \
+    && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+ENV NVM_DIR=/usr/local/share/nvm
+ENV NVM_SYMLINK_CURRENT=true \
+    PATH=${NVM_DIR}/current/bin:${PATH}
+RUN bash /tmp/library-scripts/node-debian.sh "${NVM_DIR}" "${NODE_VERSION}" "${USERNAME}" \
+    && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+
+ # Remove library scripts for final image
+RUN rm -rf /tmp/library-scripts
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional gems.
+# RUN gem install <your-gem-names-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

data/.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/ruby
+{
+	"name": "Ruby",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": { 
+			// Update 'VARIANT' to pick a Ruby version: 3, 3.0, 2, 2.7, 2.6
+			// Append -bullseye or -buster to pin to an OS version.
+			// Use -bullseye variants on local on arm64/Apple Silicon.
+			"VARIANT": "3-bullseye",
+			// Options
+			"NODE_VERSION": "lts/*"
+		}
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"rebornix.Ruby"
+	],
+	
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+
+}

data/.gitignore

@@ -0,0 +1,4 @@
+log
+pkg
+tmp
+fluent.conf

data/fluent-plugin-sentry.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-sentry-ruby"
-  spec.version = "0.2.1"
+  spec.version = "0.3.0"
   spec.authors = ["buffalo"]
   spec.email   = ["buffalobigboy@gmail.com"]
 

data/lib/fluent/plugin/out_sentry.rb

@@ -10,13 +10,17 @@ module Fluent
       config_param :title, :string, :default => 'test'
       config_param :level, :enum, list: [:fatal, :error, :warning, :info, :debug], :default => 'info'
       config_param :environment, :string, :default => 'local'
-      config_param :type, :enum, list: [ :event, :exception], :default => :event
+      config_param :type, :enum, list: [:event, :exception], :default => :event
       # for event
       config_param :user_keys, :array, :default => [], value_type: :string
       config_param :tag_keys, :array, :default => [], value_type: :string
       config_param :keys, :array, :default => [], value_type: :string
       # for exception
-      config_param :lang, :string, :default => 'php'
+      config_param :e_message, :string, :default => 'message'
+      config_param :e_describe, :string, :default => 'describe'
+      config_param :e_filename, :string, :default => 'filename'
+      config_param :e_stack, :string, :default => 'stack'
+      config_param :e_line, :string, :default => 'line'
 
 
       def initialize
@@ -41,11 +45,11 @@ module Fluent
           begin
             event = Sentry::Event.new(configuration: @client.configuration)
 
-            event.message = record['message'] || @title
             event.level = (record['level'] || @level).downcase
             event.environment = record['env'] || @environment
 
             if @type === :event
+              event.message = record['message'] || @title
               event.user = record.select{ |key| @user_keys.include?(key) }
               event.extra = @keys.length() > 0 ? record.select{ |key| @keys.include?(key) } : record
               event.contexts = {'data' => { origin_data: record }}
@@ -55,15 +59,17 @@ module Fluent
             elsif @type === :exception
               event = event.to_hash
               event['exception'] = Sentry::CustomExceptionInterface.new(
-                type: @title,
-                message: record['message'],
+                type: record['message'] || @title,
+                message: (record[@e_describe] + (record[@e_line] ? (' on line:' + record[@e_line]) : '')) || '',
                 stacktrace: Sentry::StacktraceInterface.new(frames: [Sentry::CustomStacktraceFrame.new(
-                  filename: 'index' + '.' + @lang,
-                  context_line: record['message'],
-                  post_context: record['stack']
+                  filename: record[@e_filename] || '',
+                  context_line: (record[@e_describe] + (record[@e_line] ? (' on line:' + record[@e_line]) : '')) || '',
+                  post_context: record[@e_stack] || (record[@e_describe] || ''),
                 )])
               ).to_hash
-              event['tags'] = { :timestamp => Time.strptime(record['timestamp'], '%d-%b-%Y %H:%M:%S %Z') }
+              event['tags'] = { :log_tag => tag }
+                .merge({ :timestamp => Time.at(time).strftime('%d-%b-%Y %H:%M:%S %Z') })
+                .merge(record.select{ |key| (@tag_keys + @user_keys).include?(key) })
             end
 
             @client.send_event(event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sentry-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - buffalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/base.Dockerfile"
+- ".devcontainer/devcontainer.json"
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md