opentelemetry-instrumentation-sinatra 0.16.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e581ff21037acdb81c9427e97a28cf02f5d87dca1f6f6692080630c2645cbc5
-  data.tar.gz: 487ddd768c8ddd8577396f0c9943a43dd8c68d796e04950785d8a452f266a36e
+  metadata.gz: 2811441d3c47e629d646343d4f6d7bf6f54a262ad94a407a63f4d1faf6986001
+  data.tar.gz: ffe61de5ac46cd38521787dd8cbfccc4f397ed98334b9542025de364532e50fc
 SHA512:
-  metadata.gz: 1b236075ad10a5c4ea740a0e4277bea67620ccbcd68e7389fdbc4de66eec38ab83f4623437f4710d6feea60a43a8df618ee3582d3a74292d4847d9abebd8d3e1
-  data.tar.gz: 5ad1ee56bf4b90ca235dc2181cb3644e92184af7a40793df29e6a97363b79dd328f74333cdcff942a6d6fb98f9e1a10615313d630610a0e23bef63d05be3497e
+  metadata.gz: 9cb021ec39cd10918b42d02eceb042b50982e1d62c15a91a8dcd559c7195bd6922233a15e5f29a6b8192565d12705e9345185e59127ec618ce98311528006921
+  data.tar.gz: 9de0c4f3f09d4dd55d2b477d9260f4ccf78196d72f10a7ae98fb5582ce7714a15c15aa5acdb4f6526e1c62fd351dd30de1271cdc7a37bf8df69fd6276486a1f0

data/CHANGELOG.md

@@ -1,9 +1,31 @@
 # Release History: opentelemetry-instrumentation-sinatra
 
+### v0.19.1 / 2021-08-12
+
+* DOCS: Update docs to rely more on environment variable configuration 
+
+### v0.19.0 / 2021-06-23
+
+* BREAKING CHANGE: Total order constraint on span.status= 
+
+* FIXED: Total order constraint on span.status= 
+
+### v0.18.0 / 2021-05-21
+
+* ADDED: Updated API depedency for 1.0.0.rc1
+* BREAKING CHANGE: Remove optional parent_context from in_span
+
+* FIXED: Remove optional parent_context from in_span
+* FIXED: Removed http.status_text attribute #750
+
+### v0.17.0 / 2021-04-22
+
+* (No significant changes)
+
 ### v0.16.0 / 2021-03-17
 
-* FIXED: Example scripts now reference local common lib 
-* DOCS: Replace Gitter with GitHub Discussions 
+* FIXED: Example scripts now reference local common lib
+* DOCS: Replace Gitter with GitHub Discussions
 
 ### v0.15.0 / 2021-02-18
 
@@ -11,9 +33,9 @@
 
 ### v0.14.0 / 2021-02-03
 
-* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators 
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
 
-* ADDED: Replace getter and setter callables and remove rack specific propagators 
+* ADDED: Replace getter and setter callables and remove rack specific propagators
 
 ### v0.13.0 / 2021-01-29
 
@@ -25,7 +47,7 @@
 
 ### v0.11.0 / 2020-12-11
 
-* FIXED: Copyright comments to not reference year 
+* FIXED: Copyright comments to not reference year
 
 ### v0.10.0 / 2020-12-03
 
@@ -33,24 +55,24 @@
 
 ### v0.9.0 / 2020-11-27
 
-* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+* BREAKING CHANGE: Add timeout for force_flush and shutdown
 
-* ADDED: Add timeout for force_flush and shutdown 
+* ADDED: Add timeout for force_flush and shutdown
 
 ### v0.8.0 / 2020-10-27
 
-* BREAKING CHANGE: Remove 'canonical' from status codes 
+* BREAKING CHANGE: Remove 'canonical' from status codes
 
-* FIXED: Remove 'canonical' from status codes 
+* FIXED: Remove 'canonical' from status codes
 
 ### v0.7.1 / 2020-10-08
 
-* FIXED: Set span name to sinatra.route 
+* FIXED: Set span name to sinatra.route
 
 ### v0.7.0 / 2020-10-07
 
-* FIXED: Default to sinatra.route for span name 
-* DOCS: Standardize toplevel docs structure and readme 
+* FIXED: Default to sinatra.route for span name
+* DOCS: Standardize toplevel docs structure and readme
 
 ### v0.6.0 / 2020-09-10
 

data/lib/opentelemetry/instrumentation/sinatra.rb

@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry'
+require 'opentelemetry-instrumentation-base'
 
 module OpenTelemetry
   module Instrumentation

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

@@ -15,28 +15,24 @@ module OpenTelemetry
           end
 
           def call(env)
-            tracer.in_span(
-              env['PATH_INFO'],
-              attributes: { 'http.method' => env['REQUEST_METHOD'],
-                            'http.url' => env['PATH_INFO'] },
-              kind: :server,
-              with_parent: parent_context(env)
-            ) do |span|
-              app.call(env).tap { |resp| trace_response(span, env, resp) }
-            end
-          end
-
-          private
-
-          attr_reader :app
-
-          def parent_context(env)
-            OpenTelemetry.propagation.extract(
+            extracted_context = OpenTelemetry.propagation.extract(
               env,
               getter: OpenTelemetry::Context::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
           end
 
+          private
+
           def tracer
             OpenTelemetry::Instrumentation::Sinatra::Instrumentation.instance.tracer
           end
@@ -45,10 +41,9 @@ module OpenTelemetry
             status, _headers, _response_body = resp
 
             span.set_attribute('http.status_code', status)
-            span.set_attribute('http.status_text', ::Rack::Utils::HTTP_STATUS_CODES[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.http_to_status(status)
+            span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(status.to_i)
           end
         end
       end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sinatra
-      VERSION = '0.16.0'
+      VERSION = '0.19.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-08-16 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.16.0
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc3
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -200,10 +214,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-sinatra/v0.16.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.19.1/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.16.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.19.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -219,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Sinatra instrumentation for the OpenTelemetry framework