opentelemetry-instrumentation-redis 0.9.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1920f7074fc5c2fd6af2d2ecdda802d5206e5badfd43ad5ac645af1d0cac5a0e
-  data.tar.gz: af34ef6574c6425486f273b6d219f89314ea001575fb1057eb94e60a4f47b6df
+  metadata.gz: 0a5cd190659e00aace1df688dce3ac8f38f2ac40d7efa19cbb5aca0806dce096
+  data.tar.gz: 7f9caf155420b96cbd635f38ee80edef4edb2eec2be16f09ad4e3edcf50500aa
 SHA512:
-  metadata.gz: 4cabad81823ae23a7355bf9eb22611eaa6b86b646741651e72f49e08acb42efd196d5a8a1f4adde5b6c63415208ded15697f4869e70a29b0e629973955ba67ad
-  data.tar.gz: 4bd86b68fc024dddd1f91f6f1fa430a54696f4b63fff102a14d3badc6920bd3ab28df32c2632636b173e52074792fc1df4a88d3317b91f9f17d84f35d1d9385a
+  metadata.gz: 753997ce1412b22461cb5ab347a42aad85242643c281a0222f75a32e148c4e9a2d36befb2a926827cc2741d6d692b6528ae008c6f6f9d983b86b2d8089de7382
+  data.tar.gz: dde075a5056b9067d8692a3fec46a8e0f48bb120526a85558210a6b80f14daeac87c6f9271b2fc452318610894dd3489f50285a3d7795dd52f6ff3176acb23a7

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Release History: opentelemetry-instrumentation-redis
 
+### v0.13.0 / 2021-01-29
+
+* (No significant changes)
+
+### v0.12.0 / 2020-12-24
+
+* (No significant changes)
+
+### v0.11.0 / 2020-12-11
+
+* ADDED: Accept config for redis peer service attribute 
+* ADDED: Move utf8 encoding to common utils 
+* FIXED: Copyright comments to not reference year 
+
+### v0.10.1 / 2020-12-09
+
+* FIXED: Semantic conventions db.type -> db.system 
+
+### v0.10.0 / 2020-12-03
+
+* (No significant changes)
+
 ### v0.9.0 / 2020-11-27
 
 * BREAKING CHANGE: Add timeout for force_flush and shutdown 

data/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 OpenTelemetry Authors
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -43,7 +43,7 @@ end
 
 ## Example
 
-An example of usage can be seen in [`example/redis.rb`](https://github.com/open-telemetry/opentelemetry-ruby/blob/master/instrumentation/redis/example/redis.rb).
+An example of usage can be seen in [`example/redis.rb`](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/redis/example/redis.rb).
 
 ## How can I get involved?
 
@@ -58,7 +58,7 @@ Apache 2.0 license. See [LICENSE][license-github] for more information.
 [redis-home]: https://redis.io
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [ruby-gitter]: https://gitter.im/open-telemetry/opentelemetry-ruby

data/lib/opentelemetry-instrumentation-redis.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 

data/lib/opentelemetry/instrumentation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 

data/lib/opentelemetry/instrumentation/redis.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry'
+require 'opentelemetry/common'
 
 module OpenTelemetry
   module Instrumentation

data/lib/opentelemetry/instrumentation/redis/instrumentation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 

data/lib/opentelemetry/instrumentation/redis/patches/client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -48,18 +48,24 @@ module OpenTelemetry
             host = options[:host]
             port = options[:port]
 
-            OpenTelemetry::Instrumentation::Redis.attributes.merge(
-              'db.type' => 'redis',
+            attributes = {
+              'db.system' => 'redis',
               'db.instance' => options[:db].to_s,
               'db.url' => "redis://#{host}:#{port}",
               'net.peer.name' => host,
               'net.peer.port' => port
-            )
+            }
+            attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+            attributes.merge(OpenTelemetry::Instrumentation::Redis.attributes)
           end
 
           def tracer
             Redis::Instrumentation.instance.tracer
           end
+
+          def config
+            Redis::Instrumentation.instance.config
+          end
         end
       end
     end

data/lib/opentelemetry/instrumentation/redis/utils.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -11,7 +11,6 @@ module OpenTelemetry
       module Utils
         extend self
 
-        STRING_PLACEHOLDER = ''.encode(::Encoding::UTF_8).freeze
         PLACEHOLDER = '?'
         VALUE_MAX_LEN = 50
         CMD_MAX_LEN = 500
@@ -36,7 +35,7 @@ module OpenTelemetry
 
         def format_arg(arg)
           str = arg.is_a?(Symbol) ? arg.to_s.upcase : arg.to_s
-          str = utf8_encode(str, binary: true, placeholder: PLACEHOLDER)
+          str = OpenTelemetry::Common::Utilities.utf8_encode(str, binary: true)
           truncate(str, VALUE_MAX_LEN)
         rescue StandardError => e
           OpenTelemetry.logger.debug("non formattable Redis arg #{str}: #{e}")
@@ -60,24 +59,6 @@ module OpenTelemetry
         def truncate(string, size)
           string.size > size ? "#{string[0...size - 3]}..." : string
         end
-
-        def utf8_encode(str, options = {})
-          str = str.to_s
-
-          if options[:binary]
-            # This option is useful for "gracefully" displaying binary data that
-            # often contains text such as marshalled objects
-            str.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-          elsif str.encoding == ::Encoding::UTF_8
-            str
-          else
-            str.encode(::Encoding::UTF_8)
-          end
-        rescue StandardError => e
-          OpenTelemetry.logger.debug("Error encoding string in UTF-8: #{e}")
-
-          options.fetch(:placeholder, STRING_PLACEHOLDER)
-        end
       end
     end
   end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
 module OpenTelemetry
   module Instrumentation
     module Redis
-      VERSION = '0.9.0'
+      VERSION = '0.13.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-redis
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.13.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -186,10 +200,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-redis/v0.9.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/redis
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-redis/v0.13.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/redis
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-redis/v0.9.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-redis/v0.13.0
 post_install_message: 
 rdoc_options: []
 require_paths: