sequel-honeycomb 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b4b58cc0b669df320f3d0ed02002b65df1456a956845de5985894a1e35903c
-  data.tar.gz: 3ef61613425170120459d6d37f2bcf76a16140388cfb6ab3819e1d2b098cb66f
+  metadata.gz: dd6bba551d991b93f6d674181f560d1da0b1d0029e91af6c031efe3a30aedb81
+  data.tar.gz: afe106f001b62a578d2aa790c48e326229ae6d0ebee80faef75bccc2790915df
 SHA512:
-  metadata.gz: 8e44054feb8392fc11b889387da001de855cb2a7bfd0cbc231fb7c6432dfde2caef51a780b97db1c83f1381a173230d53c4018a2ac3b97854255123e761e84b8
-  data.tar.gz: 0e8a9d092b3961b58facdffcae89406e9b0e0e8099e86b7bd30353bb5f66b6f3a299ac031c448ff66305db3882492d4d6f4c61affc2a5313d4c271f4ae942196
+  metadata.gz: 2ea2a4bbfa77eb08d9538bf00ee453bb273ade0b8cbdd45cb99c489812172caeb1c56044018b76608d5bb42be048ca06a107091b0f305f27c58a53a319741512
+  data.tar.gz: 73120d7414a2d93d382cf41f6bb214beb80400f98636c234f153de4b996f57488ccf05210d3caf5c0f09d8f0760d23b0fa6ebaa25c271252c7bc92b31e71a5a3

data/lib/sequel-honeycomb/auto_install.rb

@@ -12,7 +12,7 @@ module Sequel
         def auto_install!(honeycomb_client:, logger: nil)
           require 'sequel/honeycomb'
 
-          Sequel::Honeycomb.register!(honeycomb_client: honeycomb_client)
+          Sequel::Honeycomb.register!(client: honeycomb_client, logger: logger)
         end
       end
     end

data/lib/sequel/extensions/honeycomb.rb

@@ -14,49 +14,58 @@ module Sequel
             end
           end
           mod.class_exec(@client) do |honeycomb_|
-            define_method(:honeycomb) { honeycomb_ }
+            define_method(:builder) do
+              honeycomb_.builder.add(
+                'meta.package' => 'sequel',
+                'meta.package_version' => Sequel::VERSION,
+                'type' => 'db',
+              )
+            end
           end
         end
       end
 
       def execute(sql, opts=OPTS, &block)
-        raise 'something went horribly wrong' unless honeycomb # TODO
+        raise 'something went horribly wrong' unless builder # TODO
 
-        event = honeycomb.event
+        event = builder.event
 
-        event.add_field :table, first_source_table rescue nil
-        event.add_field :sql, sql
+        event.add_field 'db.table', first_source_table.to_s rescue nil
+        event.add_field 'db.sql', sql
+        event.add_field 'name', query_name(sql)
         start = Time.now
         adding_span_metadata_if_available(event) do
           super
         end
       rescue Exception => e
         if event
-          event.add_field :exception_class, e.class
-          event.add_field :exception_message, e.message
+          event.add_field 'db.error', e.class.name
+          event.add_field 'db.error_detail', e.message
         end
         raise
       ensure
         if start && event
           finish = Time.now
           duration = finish - start
-          event.add_field :durationMs, duration * 1000
+          event.add_field 'duration_ms', duration * 1000
           event.send
         end
       end
 
       private
+      def query_name(sql)
+        sql.sub(/\s+.*/, '').upcase
+      end
+
       def adding_span_metadata_if_available(event)
         return yield unless defined?(::Honeycomb.trace_id)
 
         trace_id = ::Honeycomb.trace_id
-        name = first_source_table rescue 'sql'
 
         event.add_field :traceId, trace_id if trace_id
         span_id = SecureRandom.uuid
         event.add_field :id, span_id
         event.add_field :serviceName, 'sequel'
-        event.add_field :name, name if name
 
         ::Honeycomb.with_span_id(span_id) do |parent_span_id|
           event.add_field :parentId, parent_span_id

data/lib/sequel/honeycomb.rb

@@ -4,9 +4,9 @@ require 'sequel/extensions/honeycomb'
 module Sequel
   module Honeycomb
     class << self
-      def register!(honeycomb_client: nil)
-        if honeycomb_client
-          Sequel::Extensions::Honeycomb.client = honeycomb_client
+      def register!(client: nil)
+        if client
+          Sequel::Extensions::Honeycomb.client = client
         end
 
         Sequel::Database.extension :honeycomb

data/lib/sequel/honeycomb/version.rb

@@ -1,6 +1,6 @@
 module Sequel
   module Honeycomb
     GEM_NAME = 'sequel-honeycomb'
-    VERSION = '0.0.2'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sequel-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: libhoney
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement