opentelemetry-instrumentation-mongo 0.17.0 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30814818cff85acd7f96eb672243a031795bf864b7d5af7198bbfe8601ade57
-  data.tar.gz: 99e17a520388944e5d58ecad18c9047eb72e9c36f03994d1cc196513c24a2bd5
+  metadata.gz: da0f8cafdadc51eb770d7d9348ebaefc26bd2a3b214e80e244c436037fc4818a
+  data.tar.gz: 8b3124ed58dff5c2f88bd259ef8386c295a566a8de47771687fc1eeec7456113
 SHA512:
-  metadata.gz: 712045008dc942d63f359a2fb7b3841ad7f284bc2739e41743a015af4a87f7ba8f37737a0197d98e9661109dd64f26ef2c55210726ab376c29f3d4687c5987a3
-  data.tar.gz: f3427445fbc8bbd10f7a5e923b00d075539ddeb60d8dd6ad2e6a15f708ed05830eed98d6a0eab79a8348637d0f9a3b97cde7df3175b9d9a737d4899f3424f5c9
+  metadata.gz: 3aad0a67e9bd65dd7080207e64fbf392a90587e14dd0734a440aed2999ff410428e9e4292dac1f5fd80b889fa7b1cc7cf9b74bb0ab35def8cf7207fcb55f0c5a
+  data.tar.gz: e47f6d70b0c6da744ecacf08cd6b16a70d2088fec04adc5c0188f4015e63858aa6599addd5672c37eae7cff1b8f04525d34155f79bd1146d0e6d225d512ee0ed

data/CHANGELOG.md

@@ -1,15 +1,35 @@
 # Release History: opentelemetry-instrumentation-mongo
 
+### v0.18.3 / 2021-09-29
+
+* (No significant changes)
+
+### v0.18.2 / 2021-08-12
+
+* FIXED: Flakey mongo test 
+
+### v0.18.1 / 2021-06-23
+
+* (No significant changes)
+
+### v0.18.0 / 2021-05-21
+
+* BREAKING CHANGE: Replace Time.now with Process.clock_gettime
+
+* ADDED: Updated API depedency for 1.0.0.rc1
+* FIXED: Replace Time.now with Process.clock_gettime
+* FIXED: Mongodb test asserting error message
+
 ### v0.17.0 / 2021-04-22
 
-* ADDED: Mongo instrumentation accepts peer service config attribute. 
-* FIXED: Fix Mongo instrumentation example. 
-* FIXED: Refactor propagators to add #fields 
+* ADDED: Mongo instrumentation accepts peer service config attribute.
+* FIXED: Fix Mongo instrumentation example.
+* FIXED: Refactor propagators to add #fields
 
 ### v0.16.0 / 2021-03-17
 
-* FIXED: Example scripts now reference local common lib 
-* DOCS: Replace Gitter with GitHub Discussions 
+* FIXED: Example scripts now reference local common lib
+* DOCS: Replace Gitter with GitHub Discussions
 
 ### v0.15.0 / 2021-02-18
 
@@ -17,13 +37,13 @@
 
 ### v0.14.0 / 2021-02-03
 
-* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators 
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
 
-* ADDED: Replace getter and setter callables and remove rack specific propagators 
+* ADDED: Replace getter and setter callables and remove rack specific propagators
 
 ### v0.13.0 / 2021-01-29
 
-* FIXED: Mongo Instrumenter: Do not send nil attributes 
+* FIXED: Mongo Instrumenter: Do not send nil attributes
 
 ### v0.12.0 / 2020-12-24
 
@@ -31,7 +51,7 @@
 
 ### v0.11.0 / 2020-12-11
 
-* FIXED: Copyright comments to not reference year 
+* FIXED: Copyright comments to not reference year
 
 ### v0.10.0 / 2020-12-03
 
@@ -39,4 +59,4 @@
 
 ### v0.9.0 / 2020-11-03
 
-* Initial release of Mongo instrumenter (ported from Datadog)
+* Initial release of Mongo instrumenter (ported from Datadog)

data/lib/opentelemetry/instrumentation/mongo/instrumentation.rb

@@ -25,6 +25,7 @@ module OpenTelemetry
         end
 
         option :peer_service, default: nil, validate: :string
+        option :db_statement, default: :include, validate: ->(opt) { %I[omit include].include?(opt) }
 
         private
 

data/lib/opentelemetry/instrumentation/mongo/subscriber.rb

@@ -13,15 +13,30 @@ module OpenTelemetry
       class Subscriber
         THREAD_KEY = :__opentelemetry_mongo_spans__
 
-        def started(event)
+        def started(event) # rubocop:disable Metrics/AbcSize
           # start a trace and store it in the current thread; using the `operation_id`
           # is safe since it's a unique id used to link events together. Also only one
           # thread is involved in this execution so thread-local storage should be safe. Reference:
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring.rb#L70
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring/publishable.rb#L38-L56
+
           collection = get_collection(event.command)
-          attributes = build_attributes(event)
+
+          attributes = {
+            'db.system' => 'mongodb',
+            'db.name' => event.database_name,
+            'db.operation' => event.command_name,
+            'net.peer.name' => event.address.host,
+            'net.peer.port' => event.address.port
+          }
+
+          config = Mongo::Instrumentation.instance.config
+          attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+          # attributes['db.statement'] = CommandSerializer.new(event.command).serialize
+          attributes['db.statement'] = CommandSerializer.new(event.command).serialize if config[:db_statement] == :include
           attributes['db.mongodb.collection'] = collection if collection
+          attributes.compact!
+
           span = tracer.start_span(span_name(collection, event.command_name), attributes: attributes, kind: :client)
           set_span(event, span)
         end
@@ -63,21 +78,6 @@ module OpenTelemetry
           "#{collection}.#{command_name}"
         end
 
-        def build_attributes(event)
-          attrs = {
-            'db.system' => 'mongodb',
-            'db.name' => event.database_name,
-            'db.operation' => event.command_name,
-            'db.statement' => CommandSerializer.new(event.command).serialize,
-            'net.peer.name' => event.address.host,
-            'net.peer.port' => event.address.port
-          }
-          config = Mongo::Instrumentation.instance.config
-          attrs['peer.service'] = config[:peer_service] if config[:peer_service]
-          attrs.compact!
-          attrs
-        end
-
         def get_collection(command)
           collection = command.values.first
           collection if collection.is_a?(String)

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Mongo
-      VERSION = '0.17.0'
+      VERSION = '0.18.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-mongo
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.3
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.3
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-byebug
+  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: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -214,10 +242,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-mongo/v0.17.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-mongo/v0.18.3/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/mongo
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-mongo/v0.17.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-mongo/v0.18.3
 post_install_message: 
 rdoc_options: []
 require_paths: