opentelemetry-instrumentation-rack 0.7.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191bfe0d331f53008ff34cc03eab66439601c8d4ddf5a22d7f465d292958141c
-  data.tar.gz: 17d4406f6f34e8139fc4ec2800c5d914918b399c3edfca3df4b4c5a8ffa3da79
+  metadata.gz: d807b0d0959c63f9b11afc65ebfe0d884cd00c542dfa1697034d36e89b20482d
+  data.tar.gz: 46ba63906072535a57d486df9eb739e75d240b488d49334c74db8084d53780d9
 SHA512:
-  metadata.gz: b252c52e9f68ab707d56bc2d372244ae29a7d5c620744f3bf7c89fd3b76394a052fc6ddb5e10752117bf77e831296e20b0364622347abbe564a43d8a8c64740a
-  data.tar.gz: 1f688dd5befebb804cb384bd1bb3bda4b36d126e2bae90c699e55ea639a7e39099251a67b0611f013100685b2721c701696895a12afa61e4b26114251ee4ce53
+  metadata.gz: '0418569456c79e8303a52c2eec0618f6593f095bfd576733e4704fe4b1ca7670370fc5ede468be187683baa91eaa477ce181b3f28f2dd1b25a2057be5c295ede'
+  data.tar.gz: ccf0115a270a3afa84e3f02c9ab3bfd64f373d36540d9c633343a815168bfc978644b58d201c8a5b8c05c308a8ba04aa43e6cbcbd2b06396db3fefc7288314dd

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Release History: opentelemetry-instrumentation-rack
 
+### v0.11.0 / 2020-12-11
+
+* FIXED: Copyright comments to not reference year 
+
+### v0.10.1 / 2020-12-09
+
+* FIXED: Rack current_span 
+
+### v0.10.0 / 2020-12-03
+
+* (No significant changes)
+
+### v0.9.0 / 2020-11-27
+
+* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+
+* ADDED: Instrument rails 
+* ADDED: Add timeout for force_flush and shutdown 
+
+### v0.8.0 / 2020-10-27
+
+* BREAKING CHANGE: Move context/span methods to Trace module 
+* BREAKING CHANGE: Remove 'canonical' from status codes 
+
+* FIXED: Move context/span methods to Trace module 
+* FIXED: Remove 'canonical' from status codes 
+
 ### v0.7.0 / 2020-10-07
 
 * FIXED: Remove superfluous file from Rack gem 

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/lib/opentelemetry-instrumentation-rack.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/rack.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -10,6 +10,40 @@ module OpenTelemetry
   module Instrumentation
     # Contains the OpenTelemetry instrumentation for the Rack gem
     module Rack
+      extend self
+
+      CURRENT_SPAN_KEY = Context.create_key('current-span')
+
+      private_constant :CURRENT_SPAN_KEY
+
+      # Returns the current span from the current or provided context
+      #
+      # @param [optional Context] context The context to lookup the current
+      #   {Span} from. Defaults to Context.current
+      def current_span(context = nil)
+        context ||= Context.current
+        context.value(CURRENT_SPAN_KEY) || OpenTelemetry::Trace::Span::INVALID
+      end
+
+      # Returns a context containing the span, derived from the optional parent
+      # context, or the current context if one was not provided.
+      #
+      # @param [optional Context] context The context to use as the parent for
+      #   the returned context
+      def context_with_span(span, parent_context: Context.current)
+        parent_context.set_value(CURRENT_SPAN_KEY, span)
+      end
+
+      # Activates/deactivates the Span within the current Context, which makes the "current span"
+      # available implicitly.
+      #
+      # On exit, the Span that was active before calling this method will be reactivated.
+      #
+      # @param [Span] span the span to activate
+      # @yield [span, context] yields span and a context containing the span to the block.
+      def with_span(span)
+        Context.with_value(CURRENT_SPAN_KEY, span) { |c, s| yield s, c }
+      end
     end
   end
 end

data/lib/opentelemetry/instrumentation/rack/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/rack/middlewares/tracer_middleware.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -51,7 +51,7 @@ module OpenTelemetry
             @app = app
           end
 
-          def call(env)
+          def call(env) # rubocop:disable Metrics/AbcSize
             original_env = env.dup
             extracted_context = OpenTelemetry.propagation.http.extract(env)
             frontend_context = create_frontend_span(env, extracted_context)
@@ -63,8 +63,10 @@ module OpenTelemetry
               tracer.in_span(request_span_name,
                              attributes: request_span_attributes(env: env),
                              kind: request_span_kind) do |request_span|
-                @app.call(env).tap do |status, headers, response|
-                  set_attributes_after_request(request_span, status, headers, response)
+                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)
+                  end
                 end
               end
             end
@@ -87,15 +89,11 @@ module OpenTelemetry
                                      },
                                      kind: :server)
 
-            extracted_context.set_value(current_span_key, span)
+            OpenTelemetry::Trace.context_with_span(span, parent_context: extracted_context)
           end
 
           def finish_span(context)
-            context[current_span_key]&.finish if context
-          end
-
-          def current_span_key
-            OpenTelemetry::Trace::Propagation::ContextKeys.current_span_key
+            OpenTelemetry::Trace.current_span(context).finish if context
           end
 
           def tracer
@@ -107,7 +105,8 @@ module OpenTelemetry
               'http.method' => env['REQUEST_METHOD'],
               'http.host' => env['HTTP_HOST'] || 'unknown',
               'http.scheme' => env['rack.url_scheme'],
-              'http.target' => fullpath(env)
+              'http.target' => fullpath(env),
+              'http.user_agent' => env['HTTP_USER_AGENT']
             }.merge(allowed_request_headers(env))
           end
 

data/lib/opentelemetry/instrumentation/rack/util/queue_time.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/rack/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 Rack
-      VERSION = '0.7.0'
+      VERSION = '0.11.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-rack
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.11.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,11 @@ files:
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rack/v0.11.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/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.11.0
 post_install_message: 
 rdoc_options: []
 require_paths: