opentelemetry-instrumentation-mongo 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a5248c360c56ea13c8d7145cb733a26e7bb1f5abc7b717acc86f4b0c36697a
-  data.tar.gz: e35a28ace8e4b22fa14d62355cf75fb1285d5a03cb0b25a70d386dd7937df909
+  metadata.gz: 24bf5fab8314c837b21a92ce2e00d248873f3ccaa6e77491bcac0e212a0c75e1
+  data.tar.gz: f09676d1b97f859520a814bfb4ecaee0b26da7584d4a809310a863fab5dcb47f
 SHA512:
-  metadata.gz: cb3e6bef3ed07047b472358da9d67735746583f96f6ad24e4b22465bbf6df09202f05f26ed38509e8dd71751c40864408e8adf696449d1d95831c30b2b95ac1a
-  data.tar.gz: e70eabe8e28bff63396be6eafe62a7a1334899ee0022f8cd85d29afd3c637db043360437368d24711e06a8d437022bf14346c53866acd0fd35ac47bfec7b12fd
+  metadata.gz: b47188d748b610b4296b2286acd93164f41d56b5462beee805c4347cc85613f997601df98472922405cbb8fe785315438700071ba3e0a06693680bced1d3731f
+  data.tar.gz: '0090d4aee3839e7938a25ecff4739a42bc6e6bcb6721799b427c53b1b3f75f4f89da6489d05e48dc2bd5937f4b66ecbd75b43462e8f4069fdbb77e82a0330f0e'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-mongo
 
+### v0.18.2 / 2021-08-12
+
+* FIXED: Flakey mongo test 
+
 ### v0.18.1 / 2021-06-23
 
 * (No significant changes)

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.18.1'
+      VERSION = '0.18.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-mongo
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-08-16 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.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0.rc1
+- !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.18.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-mongo/v0.18.2/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.18.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-mongo/v0.18.2
 post_install_message: 
 rdoc_options: []
 require_paths: