opentelemetry-instrumentation-dalli 0.10.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ca025a0ce6e513ec46ad73b86dcea19f78a7994e789f455025f57ea7a4e1bb
-  data.tar.gz: c3f5aff73ba46c9d51e87cfd83f071586d9d57515bf1ce8431271c9f33575632
+  metadata.gz: c6c9db5a7422bb49b6c63efd5ea6f0349ccf9f9d04afdaf9fce2af88f22d24bb
+  data.tar.gz: 9ff108724035220879c7ba5b69cdecdf8880eaaaa71ac53fd8ba65d29a300624
 SHA512:
-  metadata.gz: 96873727f1e2e4f0398c8c42197a24ad0bf424c72babe9219f70e3b1951364159247331845bb5105a322e61fc9697bf45d62e591d678dfba29fef4b51bf9da3e
-  data.tar.gz: 072c4d761acf7e2b76d12113e468ae69a17c8fa77f6136b5241d72683dd71f4df3485d90d044b9eace39fb1da878e3c2170d3d7adafb11c9cdd25276b5288eff
+  metadata.gz: 7b1d2a36a3e4185a4be4280c61620813607d56a3f55f5f2572d1b8d1145198b3ae51507f53c9a8604ff459bf4a9f7ed44b1cffe4dc71495e2bf0e1660c2c0154
+  data.tar.gz: 8c2bead45ee2bf79b72671e8e0abe37ffc352eaea045574ac68beb9636bec65c2f61e20b3d34983cb1e9d8e4a01e3cb11e4acf969c7a6ef9a32abdb4d024ea6e

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Release History: opentelemetry-instrumentation-dalli
 
+### v0.15.0 / 2021-02-18
+
+* ADDED: Add instrumentation config validation 
+
+### v0.14.0 / 2021-02-03
+
+* (No significant changes)
+
+### 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: Add peer service config to dalli 
+* ADDED: Move utf8 encoding to common utils 
+* FIXED: Copyright comments to not reference year 
+
 ### v0.10.0 / 2020-12-03
 
 * (No significant changes)

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 @@ Apache 2.0 license. See [LICENSE][license-github] for more information.
 [dalli-home]: https://github.com/petergoldstein/dalli
 [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-dalli.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/dalli.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/dalli/instrumentation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -19,6 +19,8 @@ module OpenTelemetry
           defined?(::Dalli)
         end
 
+        option :peer_service, default: nil, validate: :string
+
         private
 
         def require_dependencies

data/lib/opentelemetry/instrumentation/dalli/patches/server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -18,7 +18,7 @@ module OpenTelemetry
               'net.peer.name' => hostname,
               'net.peer.port' => port
             }
-
+            attributes['peer.service'] = config[:peer_service] if config[:peer_service]
             tracer.in_span(operation, attributes: attributes, kind: :client) do
               super
             end
@@ -29,6 +29,10 @@ module OpenTelemetry
           def tracer
             Dalli::Instrumentation.instance.tracer
           end
+
+          def config
+            Dalli::Instrumentation.instance.config
+          end
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -47,7 +47,7 @@ module OpenTelemetry
       def format_command(operation, args)
         placeholder = "#{operation} BLOB (OMITTED)"
         command = [operation, *args].join(' ').strip
-        command = utf8_encode(command, binary: true, placeholder: placeholder)
+        command = OpenTelemetry::Common::Utilities.utf8_encode(command, binary: true, placeholder: placeholder)
         truncate(command, CMD_MAX_LEN)
       rescue StandardError => e
         OpenTelemetry.logger.debug("Error sanitizing Dalli operation: #{e}")
@@ -57,24 +57,6 @@ module OpenTelemetry
       def truncate(string, size)
         string.size > size ? "#{string[0...size - 3]}..." : string
       end
-
-      def utf8_encode(str, binary: false, placeholder: STRING_PLACEHOLDER)
-        str = str.to_s
-
-        if 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}")
-
-        placeholder
-      end
     end
   end
 end

data/lib/opentelemetry/instrumentation/dalli/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 Dalli
-      VERSION = '0.10.0'
+      VERSION = '0.15.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-dalli
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.15.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-02-18 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.10.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -172,10 +186,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-dalli/v0.10.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/dalli
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.15.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/dalli
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.10.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.15.0
 post_install_message: 
 rdoc_options: []
 require_paths: