opentelemetry-instrumentation-rack 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78d05a138b397d0d31dd63cb7cf153ba441636a5954814e0174c6bbd48d7e81f
-  data.tar.gz: 5db210af2bc4c76f0cae594d4eb1b5e943729aac2929e27e9156f5a323c52917
+  metadata.gz: adec146f5413f600be2f53c5a8ae9d2dd9388611c253886d60b0c2831546d711
+  data.tar.gz: 180d5b75cc9895b3d4aa9c01cf8c12d4e545c60fa477384a13350a8d4c93a6c8
 SHA512:
-  metadata.gz: b978ef942d1b47a623fbccd032d034d5fbe9995d4796fe8abd75eb6f3a10a12dd6853a260e7c420b7d6260ab972d1b1cfd0cf5d20635021cceb053a8cd173db4
-  data.tar.gz: 31ba609152a353b5f5dd2807aacdf0809657ea9b993fc895629cdc932fc9dbb88e77b1a0e07fb9ddeb4a810448965186f540765df048855e2ab5356072d73996
+  metadata.gz: c738d928bbf2ae2cfce23cb1235958817e7c5923ab8d45a8454679f300b835ee64e3e4c21026b35edfa258bb4ca8073ea77328df0195fca40fd68617ffc7e738
+  data.tar.gz: 2bbbe8be64060776b3afa9ea2d6ef675ccf7c0b74e3f44a52501d5346a2f460b36c2c8d63c0314448321057d075d864669d88bcffd986a4ba28ece3250f59ea7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-rack
 
+### v0.22.0 / 2022-11-16
+
+* ADDED: Add experimental traceresponse propagator to Rack instrumentation
+
+### v0.21.1 / 2022-10-04
+
+* FIXED: Bring http.request.header and http.response.header in line with semconv
+
 ### v0.21.0 / 2022-06-09
 
 * Upgrading Base dependency version

data/README.md

@@ -37,7 +37,7 @@ By default we will set the rack span name to match the format "HTTP #{method}" (
 
 We surface a hook to easily retrieve the rack span within the context of a request so that you can add information to or rename your server span.
 
-This is how the rails controller instrumentation is able to rename the span names to match the controller and action that process the request. See https://github.com/open-telemetry/opentelemetry-ruby/blob/f6fb025bef69f839078748f56516ce38c7d51eb8/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/patches/action_controller/metal.rb#L15-L16 for an example.
+This is how the rails controller instrumentation is able to rename the span names to match the controller and action that process the request. See https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/patches/action_controller/metal.rb#L15-L16 for an example.
 
 ### High cardinality example
 
@@ -51,7 +51,7 @@ end
 
 ## Examples
 
-Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/rack/example/trace_demonstration.rb)
+Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/rack/example/trace_demonstration.rb)
 
 ## How can I get involved?
 
@@ -66,7 +66,7 @@ The `opentelemetry-instrumentation-rack` gem is distributed under the Apache 2.0
 [rack-home]: https://github.com/rack/rack
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions

data/lib/opentelemetry/instrumentation/rack/instrumentation.rb

@@ -30,6 +30,7 @@ module OpenTelemetry
         option :untraced_endpoints,       default: [],    validate: :array
         option :url_quantization,         default: nil,   validate: :callable
         option :untraced_requests,        default: nil,   validate: :callable
+        option :response_propagators,     default: [],    validate: :array
 
         private
 

data/lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb

@@ -21,17 +21,17 @@ module OpenTelemetry
                 key = header.to_s.upcase.gsub(/[-\s]/, '_')
                 case key
                 when 'CONTENT_TYPE', 'CONTENT_LENGTH'
-                  memo[key] = build_attribute_name('http.request.headers.', header)
+                  memo[key] = build_attribute_name('http.request.header.', header)
                 else
-                  memo["HTTP_#{key}"] = build_attribute_name('http.request.headers.', header)
+                  memo["HTTP_#{key}"] = build_attribute_name('http.request.header.', header)
                 end
               end
             end
 
             def allowed_response_headers
               @allowed_response_headers ||= Array(config[:allowed_response_headers]).each_with_object({}) do |header, memo|
-                memo[header] = build_attribute_name('http.response.headers.', header)
-                memo[header.to_s.upcase] = build_attribute_name('http.response.headers.', header)
+                memo[header] = build_attribute_name('http.response.header.', header)
+                memo[header.to_s.upcase] = build_attribute_name('http.response.header.', header)
               end
             end
 
@@ -58,7 +58,7 @@ module OpenTelemetry
             @untraced_endpoints = config[:untraced_endpoints]
           end
 
-          def call(env) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def call(env) # rubocop:disable Metrics/MethodLength
             if untraced_request?(env)
               OpenTelemetry::Common::Utilities.untraced do
                 return @app.call(env)
@@ -82,6 +82,7 @@ module OpenTelemetry
                 OpenTelemetry::Instrumentation::Rack.with_span(request_span) do
                   @app.call(env).tap do |status, headers, response|
                     set_attributes_after_request(request_span, status, headers, response)
+                    config[:response_propagators].each { |propagator| propagator.inject(headers) }
                   end
                 end
               end

data/lib/opentelemetry/instrumentation/rack/util/queue_time.rb

@@ -16,7 +16,7 @@ module OpenTelemetry
 
           module_function
 
-          def get_request_start(env, now = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def get_request_start(env, now = nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
             header = env[REQUEST_START] || env[QUEUE_START]
             return unless header
 

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rack
-      VERSION = '0.21.0'
+      VERSION = '0.22.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-rack
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-sdk-experimental
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-test-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -252,14 +266,14 @@ files:
 - lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb
 - lib/opentelemetry/instrumentation/rack/util/queue_time.rb
 - lib/opentelemetry/instrumentation/rack/version.rb
-homepage: https://github.com/open-telemetry/opentelemetry-ruby
+homepage: https://github.com/open-telemetry/opentelemetry-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rack/v0.21.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/rack
-  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rack/v0.21.0
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-rack/v0.22.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/rack
+  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-rack/v0.22.0
 post_install_message: 
 rdoc_options: []
 require_paths: