sequel-honeycomb 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4042e85e0c6237a77ab7d6407083dcac6a2fd6b41d78f2a44280166bd05b4f4
-  data.tar.gz: f21f29c964a3eb2ab394fbe3fdb1c800a12b2776c02f7636053f85fdb3b704a4
+  metadata.gz: f8f158b6fe32110c76ae6edf709a2024ca4a873e6a10093aaaf208fa1cc7c237
+  data.tar.gz: df8bbb68b69f9874ccec57a6584ace05db3f248088138e986da8e0365184f530
 SHA512:
-  metadata.gz: bd8e40d43187e4a8f5ba35a747d27a2ae268336a3145b90d64815a1cf8a4bb8042c1e7b0c802b078438c9f35a8ca205560850b0d1c65da642130025d6c9f54ef
-  data.tar.gz: fc01b130330120ac34dba9ed3de11358590682e9eb2f771f3530a16e2b0cb1b974f07d54e844c8ea00a4027951b820b6848831f15b3d556a7e1f0268a19ed727
+  metadata.gz: 537aca7e0e18d62dfb3e308628f2225916cca2145c2b3bb24a7f68b4da42ef63445234cda9bbfac7263ff26570bbc5d8728b15b7a759adc9ea53f1e65451be18
+  data.tar.gz: 2e7993ddcd5546af557337395cc3625b0c9c73a3543a3160dbfffc7b1c9b6fad8a1eee7eca90c8af68808548d352d47e59b866d96a1d78ec1ef5988c3d2eab97

data/README.md

@@ -0,0 +1,30 @@
+# Honeycomb Tracing for Sequel
+
+[![Build Status](https://travis-ci.org/honeycombio/sequel-honeycomb.svg?branch=master)](https://travis-ci.org/honeycombio/sequel-honeycomb)
+[![Gem Version](https://badge.fury.io/rb/sequel-honeycomb.svg)](https://badge.fury.io/rb/sequel-honeycomb)
+
+This package makes it easy to instrument your Sequel database calls in your ruby application to send useful events to [Honeycomb](https://www.honeycomb.io), a service for debugging your software in production.
+- [Usage and Examples](https://docs.honeycomb.io/getting-data-in/beelines/ruby-beeline/)
+
+Sign up for a [Honeycomb
+trial](https://ui.honeycomb.io/signup) to obtain an API key before starting.
+
+## Compatible with
+
+Requires Ruby version 2.2 or later
+
+[Sequel](https://github.com/jeremyevans/sequel/)
+
+## Get in touch
+
+Please reach out to [support@honeycomb.io](mailto:support@honeycomb.io) or ping
+us with the chat bubble on [our website](https://www.honeycomb.io) for any
+assistance. We also welcome [bug reports](https://github.com/honeycombio/sequel-honeycomb/issues).
+
+## Contributions
+
+Features, bug fixes and other changes to `sequel-honeycomb` are gladly accepted. Please
+open issues or a pull request with your change. Remember to add your name to the
+CONTRIBUTORS file!
+
+All contributions will be released under the Apache License 2.0.

data/lib/sequel/extensions/honeycomb.rb

@@ -42,7 +42,7 @@ module Sequel
         event.add_field 'db.sql', sql
         event.add_field 'name', query_name(sql)
         start = Time.now
-        adding_span_metadata_if_available(event) do
+        with_tracing_if_available(event) do
           super
         end
       rescue Exception => e
@@ -65,17 +65,27 @@ module Sequel
         sql.sub(/\s+.*/, '').upcase
       end
 
-      def adding_span_metadata_if_available(event)
-        return yield unless defined?(::Honeycomb.trace_id)
+      def with_tracing_if_available(event)
+        # return if we are not using the ruby beeline
+        return yield unless defined?(::Honeycomb)
 
-        trace_id = ::Honeycomb.trace_id
-
-        event.add_field 'trace.trace_id', trace_id if trace_id
-        span_id = SecureRandom.uuid
-        event.add_field 'trace.span_id', span_id
-
-        ::Honeycomb.with_span_id(span_id) do |parent_span_id|
-          event.add_field 'trace.parent_id', parent_span_id
+        # beeline version <= 0.5.0
+        if ::Honeycomb.respond_to? :trace_id
+          trace_id = ::Honeycomb.trace_id
+          event.add_field 'trace.trace_id', trace_id if trace_id
+          span_id = SecureRandom.uuid
+          event.add_field 'trace.span_id', span_id
+          ::Honeycomb.with_span_id(span_id) do |parent_span_id|
+            event.add_field 'trace.parent_id', parent_span_id
+            yield
+          end
+        # beeline version > 0.5.0
+        elsif ::Honeycomb.respond_to? :span_for_existing_event
+          ::Honeycomb.span_for_existing_event(event, name: nil, type: 'db') do
+            yield
+          end
+        # fallback if we don't detect any known beeline tracing methods
+        else
           yield
         end
       end

data/lib/sequel/honeycomb/version.rb

@@ -1,6 +1,5 @@
 module Sequel
   module Honeycomb
-    GEM_NAME = 'sequel-honeycomb'
-    VERSION = '0.3.3'
+    VERSION = File.read(File.join(File.dirname(__FILE__), "../../VERSION")).strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -115,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/honeycomb/version.rb
+- README.md
 - lib/sequel-honeycomb.rb
 - lib/sequel-honeycomb/auto_install.rb
 - lib/sequel/extensions/honeycomb.rb
@@ -123,7 +123,7 @@ files:
 - lib/sequel/honeycomb/version.rb
 homepage: https://github.com/honeycombio/sequel-honeycomb
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/honeycomb/version.rb

@@ -1,4 +0,0 @@
-module Honeycomb
-  GEM_NAME = 'honeycomb'
-  VERSION = '0.0.1'
-end