opentelemetry-instrumentation-sinatra 0.17.0 → 0.19.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +34 -12
  3. data/lib/opentelemetry/instrumentation/sinatra/middlewares/tracer_middleware.rb +14 -19
  4. data/lib/opentelemetry/instrumentation/sinatra/version.rb +1 -1
  5. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e29ed7224841bea915f0c896f7747748a4c5ef6953be2a54f374e46ad111b116
4
- data.tar.gz: 921c951d81d0904400059ad5d9345f2afc444b1eab244dbcfca1148ca959b296
3
+ metadata.gz: 071a3d2ca318909d869f9baf51b827c8b399c08f739ef136e94230ab1ed3083e
4
+ data.tar.gz: eb4ff077c883e1eb0484a7b8f5612a2bf2be3fc64a7dd1a3496ef9c71f215be4
5
5
  SHA512:
6
- metadata.gz: 237c2b3af2bcd4af41fcfd22b6e083056c5ae3b0c7faa0ac02e7743e0d4b8b87aa0bb90e58e44b3ea7d78e25c74c5a09c3ae9804a134e5d9697eeb16b2e77355
7
- data.tar.gz: 55ace07677e85882527c2ff82054be4714ac91d417fa13a525a185a7ffd3ae76e0e88191462b1f49a4a876ac2832a37f36b5a1cb68fa064097c0a497fba2a919
6
+ metadata.gz: 85db8eae51bed2d62a5c5555bca0601bfc223842ea68c8de4b1e97934324292faffc9d70eba053a05def6992618eed8fff64d225635ede04cb53bb88fff8ebf4
7
+ data.tar.gz: 33d6360b15231934f1af3300c0f40026d6b0b13cb7d9bb134e4ae508d331836b9fd3e21233325ec692d49d4535f8c747411c598405b0146f5a40787fd45810c1
data/CHANGELOG.md CHANGED
@@ -1,13 +1,35 @@
1
1
  # Release History: opentelemetry-instrumentation-sinatra
2
2
 
3
+ ### v0.19.2 / 2021-09-29
4
+
5
+ * (No significant changes)
6
+
7
+ ### v0.19.1 / 2021-08-12
8
+
9
+ * DOCS: Update docs to rely more on environment variable configuration
10
+
11
+ ### v0.19.0 / 2021-06-23
12
+
13
+ * BREAKING CHANGE: Total order constraint on span.status=
14
+
15
+ * FIXED: Total order constraint on span.status=
16
+
17
+ ### v0.18.0 / 2021-05-21
18
+
19
+ * ADDED: Updated API depedency for 1.0.0.rc1
20
+ * BREAKING CHANGE: Remove optional parent_context from in_span
21
+
22
+ * FIXED: Remove optional parent_context from in_span
23
+ * FIXED: Removed http.status_text attribute #750
24
+
3
25
  ### v0.17.0 / 2021-04-22
4
26
 
5
27
  * (No significant changes)
6
28
 
7
29
  ### v0.16.0 / 2021-03-17
8
30
 
9
- * FIXED: Example scripts now reference local common lib
10
- * DOCS: Replace Gitter with GitHub Discussions
31
+ * FIXED: Example scripts now reference local common lib
32
+ * DOCS: Replace Gitter with GitHub Discussions
11
33
 
12
34
  ### v0.15.0 / 2021-02-18
13
35
 
@@ -15,9 +37,9 @@
15
37
 
16
38
  ### v0.14.0 / 2021-02-03
17
39
 
18
- * BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
40
+ * BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
19
41
 
20
- * ADDED: Replace getter and setter callables and remove rack specific propagators
42
+ * ADDED: Replace getter and setter callables and remove rack specific propagators
21
43
 
22
44
  ### v0.13.0 / 2021-01-29
23
45
 
@@ -29,7 +51,7 @@
29
51
 
30
52
  ### v0.11.0 / 2020-12-11
31
53
 
32
- * FIXED: Copyright comments to not reference year
54
+ * FIXED: Copyright comments to not reference year
33
55
 
34
56
  ### v0.10.0 / 2020-12-03
35
57
 
@@ -37,24 +59,24 @@
37
59
 
38
60
  ### v0.9.0 / 2020-11-27
39
61
 
40
- * BREAKING CHANGE: Add timeout for force_flush and shutdown
62
+ * BREAKING CHANGE: Add timeout for force_flush and shutdown
41
63
 
42
- * ADDED: Add timeout for force_flush and shutdown
64
+ * ADDED: Add timeout for force_flush and shutdown
43
65
 
44
66
  ### v0.8.0 / 2020-10-27
45
67
 
46
- * BREAKING CHANGE: Remove 'canonical' from status codes
68
+ * BREAKING CHANGE: Remove 'canonical' from status codes
47
69
 
48
- * FIXED: Remove 'canonical' from status codes
70
+ * FIXED: Remove 'canonical' from status codes
49
71
 
50
72
  ### v0.7.1 / 2020-10-08
51
73
 
52
- * FIXED: Set span name to sinatra.route
74
+ * FIXED: Set span name to sinatra.route
53
75
 
54
76
  ### v0.7.0 / 2020-10-07
55
77
 
56
- * FIXED: Default to sinatra.route for span name
57
- * DOCS: Standardize toplevel docs structure and readme
78
+ * FIXED: Default to sinatra.route for span name
79
+ * DOCS: Standardize toplevel docs structure and readme
58
80
 
59
81
  ### v0.6.0 / 2020-09-10
60
82
 
data/lib/opentelemetry/instrumentation/sinatra/middlewares/tracer_middleware.rb CHANGED
@@ -15,28 +15,24 @@ module OpenTelemetry
15
15
  end
16
16
 
17
17
  def call(env)
18
- tracer.in_span(
19
- env['PATH_INFO'],
20
- attributes: { 'http.method' => env['REQUEST_METHOD'],
21
- 'http.url' => env['PATH_INFO'] },
22
- kind: :server,
23
- with_parent: parent_context(env)
24
- ) do |span|
25
- app.call(env).tap { |resp| trace_response(span, env, resp) }
26
- end
27
- end
28
-
29
- private
30
-
31
- attr_reader :app
32
-
33
- def parent_context(env)
34
- OpenTelemetry.propagation.extract(
18
+ extracted_context = OpenTelemetry.propagation.extract(
35
19
  env,
36
20
  getter: OpenTelemetry::Context::Propagation.rack_env_getter
37
21
  )
22
+ OpenTelemetry::Context.with_current(extracted_context) do
23
+ tracer.in_span(
24
+ env['PATH_INFO'],
25
+ attributes: { 'http.method' => env['REQUEST_METHOD'],
26
+ 'http.url' => env['PATH_INFO'] },
27
+ kind: :server
28
+ ) do |span|
29
+ @app.call(env).tap { |resp| trace_response(span, env, resp) }
30
+ end
31
+ end
38
32
  end
39
33
 
34
+ private
35
+
40
36
  def tracer
41
37
  OpenTelemetry::Instrumentation::Sinatra::Instrumentation.instance.tracer
42
38
  end
@@ -45,10 +41,9 @@ module OpenTelemetry
45
41
  status, _headers, _response_body = resp
46
42
 
47
43
  span.set_attribute('http.status_code', status)
48
- span.set_attribute('http.status_text', ::Rack::Utils::HTTP_STATUS_CODES[status])
49
44
  span.set_attribute('http.route', env['sinatra.route'].split.last) if env['sinatra.route']
50
45
  span.name = env['sinatra.route'] if env['sinatra.route']
51
- span.status = OpenTelemetry::Trace::Status.http_to_status(status)
46
+ span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(status.to_i)
52
47
  end
53
48
  end
54
49
  end
data/lib/opentelemetry/instrumentation/sinatra/version.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  module OpenTelemetry
8
8
  module Instrumentation
9
9
  module Sinatra
10
- VERSION = '0.17.0'
10
+ VERSION = '0.19.2'
11
11
  end
12
12
  end
13
13
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opentelemetry-instrumentation-sinatra
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.0
4
+ version: 0.19.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenTelemetry Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-23 00:00:00.000000000 Z
11
+ date: 2021-09-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opentelemetry-api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.17.0
19
+ version: '1.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.17.0
26
+ version: '1.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: opentelemetry-instrumentation-base
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.17.0
33
+ version: 0.18.3
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.17.0
40
+ version: 0.18.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: appraisal
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '0.0'
89
+ version: '1.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '0.0'
96
+ version: '1.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rack-test
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -214,10 +214,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
214
214
  licenses:
215
215
  - Apache-2.0
216
216
  metadata:
217
- changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.17.0/file.CHANGELOG.html
217
+ changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.19.2/file.CHANGELOG.html
218
218
  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/sinatra
219
219
  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
220
- documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.17.0
220
+ documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sinatra/v0.19.2
221
221
  post_install_message:
222
222
  rdoc_options: []
223
223
  require_paths: