opentelemetry-instrumentation-net_http 0.19.2 → 0.19.5

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 +13 -0
  3. data/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb +16 -14
  4. data/lib/opentelemetry/instrumentation/net/http/version.rb +1 -1
  5. metadata +23 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4c135e54ab0a4ad44827783e431644b99136173e975f01654568794e49dd6933
4
- data.tar.gz: 952a1f2a03698ae2847522a0c0715fec2cc01bce3668544218e0616f524752aa
3
+ metadata.gz: 7c3f2f5457894fe09c0d599c0bf74f62af69c1187007034f557a1e7b0cd0002e
4
+ data.tar.gz: c765db50d54c2ac983f9f64153ff63547939ec7b7a66b5123000a00b26561b6d
5
5
  SHA512:
6
- metadata.gz: 2f931d1bc2a856b16b662c9a9d9b24670c0bf729b4b4f8ed2327137df2b72abd0dab48777011035166a49f209db98a7238222b104a53897cc70ce3115249c7f4
7
- data.tar.gz: 132fdc39a7eab6d5213b6b1e433ee19e98d5d54333c6a48a21b3e4f35c4aebcb9dd81cc5ce3a3b4bb998457f5719f35eb652be25f502bb0261233a7130227291
6
+ metadata.gz: 3437a1919d8872b4fad115cf5acfa730a44477fa0c45c20aab6add0fb8b9d97cfae0518fd19dc397fe4b5bf7cba6198107dfc4a248197bc9ccb12336fdbca72e
7
+ data.tar.gz: 55e96bb9f90a7bfd740eb84a9fb41035cfea3e05a45c1d86142b24e70cf50c573c19b2f8d41c18dcee144f16ec41d0da8f8ba7971f74eb842ce512d1293c499d
data/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # Release History: opentelemetry-instrumentation-net_http
2
2
 
3
+ ### v0.19.5 / 2022-05-05
4
+
5
+ * (No significant changes)
6
+
7
+ ### v0.19.4 / 2022-02-02
8
+
9
+ * FIXED: Clientcontext attrs overwrite in net::http
10
+ * FIXED: Excessive hash creation on context attr merging
11
+
12
+ ### v0.19.3 / 2021-12-01
13
+
14
+ * FIXED: Change net attribute names to match the semantic conventions spec for http
15
+
3
16
  ### v0.19.2 / 2021-09-29
4
17
 
5
18
  * (No significant changes)
data/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb CHANGED
@@ -18,16 +18,17 @@ module OpenTelemetry
18
18
  # Do not trace recursive call for starting the connection
19
19
  return super(req, body, &block) unless started?
20
20
 
21
- attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes
21
+ attributes = {
22
+ OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => req.method,
23
+ OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => USE_SSL_TO_SCHEME[use_ssl?],
24
+ OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => req.path,
25
+ OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => @address,
26
+ OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => @port
27
+ }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
28
+
22
29
  tracer.in_span(
23
30
  HTTP_METHODS_TO_SPAN_NAMES[req.method],
24
- attributes: attributes.merge(
25
- 'http.method' => req.method,
26
- 'http.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
27
- 'http.target' => req.path,
28
- 'peer.hostname' => @address,
29
- 'peer.port' => @port
30
- ),
31
+ attributes: attributes,
31
32
  kind: :client
32
33
  ) do |span|
33
34
  OpenTelemetry.propagation.inject(req)
@@ -49,11 +50,12 @@ module OpenTelemetry
49
50
  conn_port = port
50
51
  end
51
52
 
52
- attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes
53
- tracer.in_span('HTTP CONNECT', attributes: attributes.merge(
54
- 'peer.hostname' => conn_address,
55
- 'peer.port' => conn_port
56
- )) do
53
+ attributes = {
54
+ OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
55
+ OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
56
+ }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
57
+
58
+ tracer.in_span('HTTP CONNECT', attributes: attributes) do
57
59
  super
58
60
  end
59
61
  end
@@ -63,7 +65,7 @@ module OpenTelemetry
63
65
 
64
66
  status_code = response.code.to_i
65
67
 
66
- span.set_attribute('http.status_code', status_code)
68
+ span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
67
69
  span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(status_code.to_i)
68
70
  end
69
71
 
data/lib/opentelemetry/instrumentation/net/http/version.rb CHANGED
@@ -8,7 +8,7 @@ module OpenTelemetry
8
8
  module Instrumentation
9
9
  module Net
10
10
  module HTTP
11
- VERSION = '0.19.2'
11
+ VERSION = '0.19.5'
12
12
  end
13
13
  end
14
14
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opentelemetry-instrumentation-net_http
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.19.2
4
+ version: 0.19.5
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-09-30 00:00:00.000000000 Z
11
+ date: 2022-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opentelemetry-api
@@ -30,28 +30,28 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.19.2
33
+ version: 0.19.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.19.2
40
+ version: 0.19.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: opentelemetry-instrumentation-base
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.18.3
47
+ version: 0.20.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.18.3
54
+ version: 0.20.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '1.0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: opentelemetry-test-helpers
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: rake
99
113
  requirement: !ruby/object:Gem::Requirement
@@ -199,10 +213,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
199
213
  licenses:
200
214
  - Apache-2.0
201
215
  metadata:
202
- changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.2/file.CHANGELOG.html
216
+ changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.5/file.CHANGELOG.html
203
217
  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/net_http
204
218
  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
205
- documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.2
219
+ documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.5
206
220
  post_install_message:
207
221
  rdoc_options: []
208
222
  require_paths:
@@ -211,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
211
225
  requirements:
212
226
  - - ">="
213
227
  - !ruby/object:Gem::Version
214
- version: 2.5.0
228
+ version: 2.6.0
215
229
  required_rubygems_version: !ruby/object:Gem::Requirement
216
230
  requirements:
217
231
  - - ">="