opentelemetry-instrumentation-que 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1704f5e2fdd57330cd6c2d5da1d522bf224d8d0b97c33a713bf258b66d8bffb5
-  data.tar.gz: ec7f743861ee2f30a75e70f96c5c161c2fd692b49a7199f1146ec546f97dc5b2
+  metadata.gz: dd8e6bbe8626885116f2b2724f83e418f8efcef5fcdb47b0df9b0622c3fd516a
+  data.tar.gz: 0f9d98681ddd62d620d05b1932b69157e10276c9097b3a860504873435657999
 SHA512:
-  metadata.gz: 321b908a1eb46a075e69bca045e5a347615f9b72334e9cd3e3d3df0eb01a462f108054f9adc8cc10b6ae43fd64023d179e51a08424e5350b3dc7da2e8ee3e4ee
-  data.tar.gz: 12413bbe07dda7e8ebe5130945efdf3f4cb3b880dc18cf350788b4f773ca3e5e0e3e1cd4e56f24cfb61811515bc559892b8a03796a35c094f2d732a20f0f7774
+  metadata.gz: 4995b1559a32a4abfaeac6d3cb9ce3bfc257e54e2061fbb943dbfe551153d6e8ce140f13bb875b7b884989d8d728b0c9e8a195d06a4566893eae2bf81388e37f
+  data.tar.gz: 98215ceb201baa7a51bde6eb63efe3b26170f463c25e42af4641f7edcd3cbfb3ecc6e87df1d7a9b89cb13b0400ea0192f5d467d43e70efe362e40de839336326

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Release History: opentelemetry-instrumentation-que
 
+### v0.3.0 / 2022-05-02
+
+* ADDED: Validate Using Enums 
+* FIXED: RubyGems Fallback 
+
+### v0.2.0 / 2021-12-01
+
+* ADDED: Instrument Que poller 
+
+### v0.1.1 / 2021-09-29
+
+* (No significant changes)
+
 ### v0.1.0 / 2021-09-15
 
 * Initial release.

data/lib/opentelemetry/instrumentation/que/instrumentation.rb

@@ -39,12 +39,14 @@ module OpenTelemetry
         #     direct child of the span that enqueued the job.
         #   - :none - the job's execution will not be explicitly linked to the
         #     span that enqueued the job.
+        # trace_poller: controls whether Que Poller is traced or not.
         #
         # Note that in all cases, we will store Que's Job ID as the
         # `messaging.message_id` attribute, so out-of-band correlation may
         # still be possible depending on your backend system.
         #
-        option :propagation_style, default: :link, validate: ->(opt) { %i[link child none].include?(opt) }
+        option :propagation_style, default: :link, validate: %i[link child none]
+        option :trace_poller,      default: false, validate: :boolean
 
         private
 
@@ -52,14 +54,16 @@ module OpenTelemetry
           require_relative 'tag_setter'
           require_relative 'middlewares/server_middleware'
           require_relative 'patches/que_job'
+          require_relative 'patches/poller'
         end
 
         def gem_version
-          Gem.loaded_specs['que'].version
+          Gem::Version.new(::Que::VERSION)
         end
 
         def patch
           ::Que::Job.prepend(Patches::QueJob)
+          ::Que::Poller.prepend(Patches::Poller)
         end
       end
     end

data/lib/opentelemetry/instrumentation/que/patches/poller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Que
+      module Patches
+        # Instrumentation for the Que::Poller module
+        module Poller
+          def poll(*args, **kwargs)
+            # Avoid tracing when should_poll? returns true. This is also used
+            # in Poller#poll to decide if the actual poll should be executed or
+            # not. Without this we would generate a lot of unnecessary spans.
+            return unless should_poll?
+
+            if Que::Instrumentation.instance.config[:trace_poller]
+              Que::Instrumentation.instance.tracer.in_span('Que::Poller#poll') { super(*args, **kwargs) }
+            else
+              OpenTelemetry::Common::Utilities.untraced { super(*args, **kwargs) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/que/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Que
-      VERSION = '0.1.0'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-que
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +236,7 @@ files:
 - lib/opentelemetry/instrumentation/que.rb
 - lib/opentelemetry/instrumentation/que/instrumentation.rb
 - lib/opentelemetry/instrumentation/que/middlewares/server_middleware.rb
+- lib/opentelemetry/instrumentation/que/patches/poller.rb
 - lib/opentelemetry/instrumentation/que/patches/que_job.rb
 - lib/opentelemetry/instrumentation/que/tag_setter.rb
 - lib/opentelemetry/instrumentation/que/version.rb
@@ -229,10 +244,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-que/v0.1.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-que/v0.3.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/que
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-que/v0.1.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-que/v0.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: