sqreen-kit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67cce2a578e0176e7a85af0013cfb61f0e5f30ab1dcde1197c7c877acd90ecf3
-  data.tar.gz: a18cbf0ab05f032f31d0f0344398707aaf62509ec1721577c53c18c78d09c245
+  metadata.gz: '09939c2b1e179a32121dafa7f96c9e1af87c40369894a8809bdd165aa2412388'
+  data.tar.gz: 59500cef9fd4048141ffca62431661150732575841e5c8a896c85d39c8f66279
 SHA512:
-  metadata.gz: 2dfca3ba84d92439af41a71db9c50c6e0ee0d7d8cc2bc4a6b27edf02ec42f5ed706500bc3e5672363668afda771cbf78ba45b1ad1e5da91c1bd580e2f940c74f
-  data.tar.gz: 27dbf1dab9407774ce58f2ba79d9a0d1adba95097ee086b31972b35c621d8b6e60bb555eb43021b1bf729d631a8236c8c87850164b8355542cb30c2d9a311177
+  metadata.gz: 74ffacce1b772023b8ee9fb460a4569ccd5865f91b4782ec04d0266aba3f4ccf1c8076afb405e752dc3bd82899347e7657f610b9d89ef44675b0f1bfb5d20ef7
+  data.tar.gz: a9a6ad2cd45e96689329bc6091a09015c50b6a55c6271c083f2f4ba47d75bf099fc504194ac26cfbfe4ddb07611e7e1a9081321ad028033b84e9ccecbbc2532b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.0
+
+* Add configurable source information
+* Fix wire-level formats
+
 ## 0.1.1
 
 * Fixed a potential conflict prefenting agent startup

data/lib/sqreen/kit.rb

@@ -3,6 +3,7 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/kit/version'
 require 'sqreen/kit/configuration'
 require 'sqreen/kit/retry_policy'
 require 'sqreen/kit/http_client'
@@ -17,10 +18,6 @@ module Sqreen
   module Kit
     # Factories using the global configuration
     class << self
-      def version
-        @version ||= Gem.loaded_specs['sqreen-kit'].version
-      end
-
       def auth_signals_client
         @auth_signals_client ||=
           Signals::AuthSignalsClient.new(

data/lib/sqreen/kit/configuration.rb

@@ -4,6 +4,7 @@
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'logger'
+require 'sqreen/kit/version'
 
 module Sqreen
   module Kit
@@ -34,6 +35,11 @@ module Sqreen
                       :batch_flush_size,
                       :batch_max_size
 
+        # Default value for source in signals taking a generic value
+        # Something like 'sqreen:agent:ruby:1.11.1'
+        # XXX: do not provide default and force user to explicitly set source?
+        attr_accessor :default_source
+
         # @param [String] url
         def proxy_url=(url)
           if url.nil?
@@ -64,6 +70,8 @@ module Sqreen
         logger.progname = 'sqreen-kit'
 
         self.ingestion_url = 'https://ingestion.sqreen.com/'
+
+        self.default_source = "sqreen:kit:#{Sqreen::Kit.version}"
       end
 
       set_defaults

data/lib/sqreen/kit/signals/dto_helper.rb

@@ -14,6 +14,8 @@ module Sqreen
           NilClass, Hash, Array, Numeric, TrueClass, FalseClass
         ].freeze
 
+        RFC_3339_FMT = '%Y-%m-%dT%H:%M:%S.%3N%:z'.freeze
+
         module ClassMethods
           # method should have been defined initially in an ancestor
           def validate_str_attr(attr, regex)
@@ -54,8 +56,17 @@ module Sqreen
             @self_mandatory_attrs += args
           end
 
+          def readonly_attrs(*attrs)
+            attrs.each do |attr|
+              define_method :"#{attr}=" do |value|
+                raise "Attribute #{attr} is read-only" unless public_send(attr).nil?
+                super(value)
+              end
+            end
+          end
+
           def self_mandatory_attrs
-            @self_mandatory_attrs || []
+            @self_mandatory_attrs ||= []
           end
 
           def mandatory_attrs
@@ -81,11 +92,14 @@ module Sqreen
             end
 
             define_method attr do
-              cur_val = instance_variable_get("@#{attr}")
+              var = "@#{attr}"
+              return nil unless instance_variable_defined?(var)
+
+              cur_val = instance_variable_get(var)
 
               return nil if cur_val.nil?
               return cur_val if cur_val.is_a?(String)
-              cur_val.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+              cur_val.strftime(RFC_3339_FMT)
             end
           end
 
@@ -133,7 +147,9 @@ module Sqreen
         end
 
         def to_json
-          res = (@filters || []).reduce(to_h) { |accum, filter| filter[accum] }
+          return to_h.to_json unless instance_variable_defined?(:@filters)
+
+          res = @filters.reduce(to_h) { |accum, filter| filter[accum] }
           res.to_json
         end
 

data/lib/sqreen/kit/signals/signal_attributes.rb

@@ -100,8 +100,10 @@ module Sqreen
 
         def to_h
           {
-            agent_type: 'ruby',
-          }.merge(super())
+            infra: {
+              agent_type: 'ruby',
+            }.merge(super()),
+          }
         end
       end
     end # module Signals

data/lib/sqreen/kit/version.rb

@@ -0,0 +1,13 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+# Split to avoid a circular dependency between kit.rb and configuration.rb
+module Sqreen
+  module Kit
+    class << self
+      def version
+        @version ||= Gem.loaded_specs['sqreen-kit'].version
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqreen-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Loic Nageleisen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport
@@ -54,6 +54,7 @@ files:
 - lib/sqreen/kit/signals/stack_trace.rb
 - lib/sqreen/kit/signals/trace.rb
 - lib/sqreen/kit/string_sanitizer.rb
+- lib/sqreen/kit/version.rb
 homepage: https://sqreen.com
 licenses:
 - Sqreen