opentelemetry-instrumentation-sinatra 0.13.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a768ba11a59a82591f8ae526721074e9946c847d67a784705aabe62e5e30f7
-  data.tar.gz: db3cefa7e443d635e4dd2bee00375aa3805ea7b8e417904238ee985366230580
+  metadata.gz: 9e487da27ae850207f0eeb2f6c8a75b2c56411b55eb4034efb56dbef36525243
+  data.tar.gz: a6eb41a1d9722a6a8a1edd8d55966f54898a29b8a4a7c93c379cb5eba5720f1d
 SHA512:
-  metadata.gz: d051da96921410dbe601468b561f537956b0dd16572741b56e2a4c3b1d93801304f9cf545aedb041f887ba518b1a3ebfdcb6dc5726788ee2cc43ada16e1a2b39
-  data.tar.gz: bd2906376362fd0ece1e52a582e5590ad7dc12d9bae2e8f79869f282eebe1c656c617b0a2a871910417ec406e6e188ca95ff069381e7140502bb00e38e726eaf
+  metadata.gz: 21fa3604acd21cb0412a98afb4deabab82b7067e2b1e3a7b9fcd7377a434ce31b694ae5420662e707ed8ad697272361633e9bf88898e703a57c2703f4ac93b9a
+  data.tar.gz: d7a6be83743e6136d599c63156b0bc3c7e668971711fbcda75b9b18337110289f39ecd1f368d6b1957d7e9019b420c83a327e1088f21b23d6a7bd1fec3de8558

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Release History: opentelemetry-instrumentation-sinatra
 
+### 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
+
+### v0.15.0 / 2021-02-18
+
+* (No significant changes)
+
+### v0.14.0 / 2021-02-03
+
+* BREAKING CHANGE: 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
 
 * (No significant changes)
@@ -10,7 +37,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
 
@@ -18,24 +45,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/README.md

@@ -45,7 +45,7 @@ end
 
 The `opentelemetry-instrumentation-sinatra` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`.
 
-The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us on our [gitter channel][ruby-gitter] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
+The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
 
 ## License
 
@@ -57,4 +57,4 @@ The `opentelemetry-instrumentation-sinatra` gem is distributed under the Apache
 [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
+[discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions

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,25 +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) }
+            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
 
-          attr_reader :app
-
-          def parent_context(env)
-            OpenTelemetry.propagation.http.extract(env)
-          end
-
           def tracer
             OpenTelemetry::Instrumentation::Sinatra::Instrumentation.instance.tracer
           end
@@ -42,7 +41,6 @@ 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)

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sinatra
-      VERSION = '0.13.0'
+      VERSION = '0.18.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.18.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-05-21 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.13.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !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.13.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.18.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.13.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.18.0
 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