opentelemetry-instrumentation-sinatra 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c585cb6aa76c6f48a9a2ba23283424225b40b212ec46eb22c7e081e8f9691704
-  data.tar.gz: 558b1dcce70ca645efd462397f4c6492cf7fab92dd141e4c39885449535fb747
+  metadata.gz: 9c7d376bbb2c7c26b8d8435fa46ee6ef90c2dbdcaadce31717e306f0d198819d
+  data.tar.gz: 0f9f053e330585985409f99ed5d9b1b208a0d54f5a4fc72a524724125bcdbe23
 SHA512:
-  metadata.gz: ce8e4397f78d8f3ff21270678e11852ce2af405fdb1e519160a83ccdaf3043b8758c8573f9f670546fbfa970a0e544c98cbdb92b9a984cf13dcb666164ad73f9
-  data.tar.gz: c1bcd8b89dd8b49f22e88b32923717e57209ac6be8a7eeba0038c1018af9ae0301396df595e02871606c3dd32fbcc829df65af7a6e640530ff83434e2e32c517
+  metadata.gz: 52646010860ca1c248545dbc6918ff62a340180ee04a5d5b6177150532d75412f0e757da34de94b4cb40b4fed7e0507f32f9ab2347c78a6d172ce85a9bbb6bcd
+  data.tar.gz: 19b3b48eac5170a3b6283736cf29f8269e6a0cb9fd511b0186eeef14f92699c74fb021f4060cee4eadad5a604a987147435de85aad1f97317a77b0e29cde66b9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-sinatra
 
+### v0.21.0 / 2022-10-12
+
+* ADDED: Use rack middleware in sinatra middleware 
+* FIXED: Add exceptions to sinatra spans. 
+
 ### v0.20.0 / 2022-06-09
 
 * Upgrading Base dependency version

data/README.md

@@ -54,7 +54,7 @@ The `opentelemetry-instrumentation-sinatra` gem is distributed under the Apache
 [sinatra-home]: http://sinatrarb.com
 [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/sinatra/extensions/tracer_extension.rb

@@ -28,7 +28,7 @@ module OpenTelemetry
                 end
               end
             end
-
+            app.use OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware
             app.use Middlewares::TracerMiddleware
           end
         end

data/lib/opentelemetry/instrumentation/sinatra/instrumentation.rb

@@ -13,6 +13,8 @@ module OpenTelemetry
       # instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         install do |_|
+          OpenTelemetry::Instrumentation::Rack::Instrumentation.instance.install({})
+
           ::Sinatra::Base.register Extensions::TracerExtension
         end
 

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

@@ -3,6 +3,7 @@
 # Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
+require 'opentelemetry-instrumentation-rack'
 
 module OpenTelemetry
   module Instrumentation
@@ -15,35 +16,23 @@ module OpenTelemetry
           end
 
           def call(env)
-            extracted_context = OpenTelemetry.propagation.extract(
-              env,
-              getter: OpenTelemetry::Common::Propagation.rack_env_getter
-            )
-            OpenTelemetry::Context.with_current(extracted_context) do
-              tracer.in_span(
-                env['PATH_INFO'],
-                attributes: { 'http.method' => env['REQUEST_METHOD'],
-                              'http.url' => env['PATH_INFO'] },
-                kind: :server
-              ) do |span|
-                @app.call(env).tap { |resp| trace_response(span, env, resp) }
-              end
-            end
+            response = @app.call(env)
+          ensure
+            trace_response(env, response)
           end
 
-          private
+          def trace_response(env, response)
+            span = OpenTelemetry::Instrumentation::Rack.current_span
+            return unless span.recording?
 
-          def tracer
-            OpenTelemetry::Instrumentation::Sinatra::Instrumentation.instance.tracer
-          end
-
-          def trace_response(span, env, resp)
-            status, _headers, _response_body = resp
-
-            span.set_attribute('http.status_code', status)
             span.set_attribute('http.route', env['sinatra.route'].split.last) if env['sinatra.route']
             span.name = env['sinatra.route'] if env['sinatra.route']
-            span.status = OpenTelemetry::Trace::Status.error unless (100..499).include?(status.to_i)
+
+            sinatra_response = ::Sinatra::Response.new([], response.first)
+            return unless sinatra_response.server_error?
+
+            span.record_exception(env['sinatra.error'])
+            span.status = OpenTelemetry::Trace::Status.error
           end
         end
       end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sinatra
-      VERSION = '0.20.0'
+      VERSION = '0.21.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,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
@@ -238,14 +252,14 @@ files:
 - lib/opentelemetry/instrumentation/sinatra/instrumentation.rb
 - lib/opentelemetry/instrumentation/sinatra/middlewares/tracer_middleware.rb
 - lib/opentelemetry/instrumentation/sinatra/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-sinatra/v0.20.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/sinatra
-  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.20.0
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-sinatra/v0.21.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/sinatra
+  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-sinatra/v0.21.0
 post_install_message: 
 rdoc_options: []
 require_paths: