fluent-plugin-google-cloud 0.12.10 → 0.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +99 -71
  3. data/Rakefile +6 -5
  4. data/fluent-plugin-google-cloud.gemspec +17 -21
  5. data/lib/fluent/plugin/common.rb +42 -29
  6. data/lib/fluent/plugin/filter_add_insert_ids.rb +1 -14
  7. data/lib/fluent/plugin/filter_analyze_config.rb +65 -47
  8. data/lib/fluent/plugin/in_object_space_dump.rb +1 -1
  9. data/lib/fluent/plugin/monitoring.rb +34 -23
  10. data/lib/fluent/plugin/out_google_cloud.rb +269 -213
  11. data/lib/fluent/plugin/statusz.rb +10 -10
  12. data/test/helper.rb +6 -0
  13. data/test/plugin/base_test.rb +199 -136
  14. data/test/plugin/constants.rb +21 -28
  15. data/test/plugin/test_driver.rb +2 -1
  16. data/test/plugin/test_filter_add_insert_ids.rb +5 -3
  17. data/test/plugin/test_filter_analyze_config.rb +32 -17
  18. data/test/plugin/test_out_google_cloud.rb +37 -25
  19. data/test/plugin/test_out_google_cloud_grpc.rb +45 -30
  20. data/test/plugin/utils.rb +9 -8
  21. metadata +53 -39
data/test/plugin/utils.rb CHANGED
@@ -36,8 +36,7 @@ module Utils
36
36
  end
37
37
 
38
38
  def stub_metadata_request(metadata_path, response_body)
39
- stub_request(:get, 'http://169.254.169.254/computeMetadata/v1/' +
40
- metadata_path)
39
+ stub_request(:get, "http://169.254.169.254/computeMetadata/v1/#{metadata_path}")
41
40
  .to_return(body: response_body, status: 200,
42
41
  headers: { 'Content-Length' => response_body.length })
43
42
  end
@@ -61,8 +60,7 @@ module Utils
61
60
  "attribute1\nattribute2\nattribute3")
62
61
 
63
62
  # Used by 'googleauth' to fetch the default service account credentials.
64
- stub_request(:get, 'http://169.254.169.254/computeMetadata/v1/' \
65
- 'instance/service-accounts/default/token')
63
+ stub_request(:get, %r{http://169.254.169.254/computeMetadata/v1/instance/service-accounts/default/token(?:\?.*)})
66
64
  .to_return(body: %({"access_token": "#{FAKE_AUTH_TOKEN}"}),
67
65
  status: 200,
68
66
  headers: { 'Content-Length' => FAKE_AUTH_TOKEN.length,
@@ -101,7 +99,8 @@ module Utils
101
99
  def setup_managed_vm_metadata_stubs
102
100
  stub_metadata_request(
103
101
  'instance/attributes/',
104
- "attribute1\ngae_backend_name\ngae_backend_version\nlast_attribute")
102
+ "attribute1\ngae_backend_name\ngae_backend_version\nlast_attribute"
103
+ )
105
104
  stub_metadata_request('instance/attributes/gae_backend_name',
106
105
  MANAGED_VM_BACKEND_NAME)
107
106
  stub_metadata_request('instance/attributes/gae_backend_version',
@@ -112,13 +111,14 @@ module Utils
112
111
  if should_respond
113
112
  stub_metadata_request(
114
113
  'instance/attributes/',
115
- "attribute1\ncluster-location\ncluster-name\nlast_attribute")
114
+ "attribute1\ncluster-location\ncluster-name\nlast_attribute"
115
+ )
116
116
  stub_metadata_request('instance/attributes/cluster-location',
117
117
  K8S_LOCATION2)
118
118
  stub_metadata_request('instance/attributes/cluster-name',
119
119
  K8S_CLUSTER_NAME)
120
120
  else
121
- ['cluster-location', 'cluster-name'].each do |metadata_name|
121
+ %w[cluster-location cluster-name].each do |metadata_name|
122
122
  stub_request(:get, %r{.*instance/attributes/#{metadata_name}.*})
123
123
  .to_return(status: 404,
124
124
  body: 'The requested URL /computeMetadata/v1/instance/' \
@@ -131,7 +131,8 @@ module Utils
131
131
  def setup_dataproc_metadata_stubs
132
132
  stub_metadata_request(
133
133
  'instance/attributes/',
134
- "attribute1\ndataproc-cluster-uuid\ndataproc-cluster-name")
134
+ "attribute1\ndataproc-cluster-uuid\ndataproc-cluster-name"
135
+ )
135
136
  stub_metadata_request('instance/attributes/dataproc-cluster-name',
136
137
  DATAPROC_CLUSTER_NAME)
137
138
  stub_metadata_request('instance/attributes/dataproc-cluster-uuid',
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-google-cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.10
4
+ version: 0.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stackdriver Agents Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-20 00:00:00.000000000 Z
11
+ date: 2023-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -24,104 +24,118 @@ dependencies:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.13.3
27
+ - !ruby/object:Gem::Dependency
28
+ name: google-api-client
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - '='
32
+ - !ruby/object:Gem::Version
33
+ version: 0.53.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - '='
39
+ - !ruby/object:Gem::Version
40
+ version: 0.53.0
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: googleapis-common-protos
29
43
  requirement: !ruby/object:Gem::Requirement
30
44
  requirements:
31
45
  - - '='
32
46
  - !ruby/object:Gem::Version
33
- version: 1.3.10
47
+ version: 1.4.0
34
48
  type: :runtime
35
49
  prerelease: false
36
50
  version_requirements: !ruby/object:Gem::Requirement
37
51
  requirements:
38
52
  - - '='
39
53
  - !ruby/object:Gem::Version
40
- version: 1.3.10
54
+ version: 1.4.0
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: googleauth
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - '='
46
60
  - !ruby/object:Gem::Version
47
- version: 0.9.0
61
+ version: 1.3.0
48
62
  type: :runtime
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - '='
53
67
  - !ruby/object:Gem::Version
54
- version: 0.9.0
68
+ version: 1.3.0
55
69
  - !ruby/object:Gem::Dependency
56
- name: google-api-client
70
+ name: google-cloud-logging
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
73
  - - '='
60
74
  - !ruby/object:Gem::Version
61
- version: 0.30.8
75
+ version: 2.3.2
62
76
  type: :runtime
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
80
  - - '='
67
81
  - !ruby/object:Gem::Version
68
- version: 0.30.8
82
+ version: 2.3.2
69
83
  - !ruby/object:Gem::Dependency
70
- name: google-cloud-logging
84
+ name: google-cloud-monitoring-v3
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - '='
74
88
  - !ruby/object:Gem::Version
75
- version: 1.6.6
89
+ version: 0.10.0
76
90
  type: :runtime
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - '='
81
95
  - !ruby/object:Gem::Version
82
- version: 1.6.6
96
+ version: 0.10.0
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: google-protobuf
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - '='
88
102
  - !ruby/object:Gem::Version
89
- version: 3.20.0
103
+ version: 3.22.1
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - '='
95
109
  - !ruby/object:Gem::Version
96
- version: 3.20.0
110
+ version: 3.22.1
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: grpc
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - '='
102
116
  - !ruby/object:Gem::Version
103
- version: 1.45.0
117
+ version: 1.52.0
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - '='
109
123
  - !ruby/object:Gem::Version
110
- version: 1.45.0
124
+ version: 1.52.0
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: json
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - '='
116
130
  - !ruby/object:Gem::Version
117
- version: 2.2.0
131
+ version: 2.6.3
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - '='
123
137
  - !ruby/object:Gem::Version
124
- version: 2.2.0
138
+ version: 2.6.3
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: opencensus
127
141
  requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
164
178
  - - '='
165
179
  - !ruby/object:Gem::Version
166
180
  version: 1.9.0
181
+ - !ruby/object:Gem::Dependency
182
+ name: coveralls
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - '='
186
+ - !ruby/object:Gem::Version
187
+ version: 0.8.23
188
+ type: :development
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - '='
193
+ - !ruby/object:Gem::Version
194
+ version: 0.8.23
167
195
  - !ruby/object:Gem::Dependency
168
196
  name: prometheus-client
169
197
  requirement: !ruby/object:Gem::Requirement
@@ -184,28 +212,28 @@ dependencies:
184
212
  requirements:
185
213
  - - '='
186
214
  - !ruby/object:Gem::Version
187
- version: 10.5.0
215
+ version: 13.0.6
188
216
  type: :development
189
217
  prerelease: false
190
218
  version_requirements: !ruby/object:Gem::Requirement
191
219
  requirements:
192
220
  - - '='
193
221
  - !ruby/object:Gem::Version
194
- version: 10.5.0
222
+ version: 13.0.6
195
223
  - !ruby/object:Gem::Dependency
196
224
  name: rubocop
197
225
  requirement: !ruby/object:Gem::Requirement
198
226
  requirements:
199
227
  - - '='
200
228
  - !ruby/object:Gem::Version
201
- version: 0.39.0
229
+ version: 1.48.1
202
230
  type: :development
203
231
  prerelease: false
204
232
  version_requirements: !ruby/object:Gem::Requirement
205
233
  requirements:
206
234
  - - '='
207
235
  - !ruby/object:Gem::Version
208
- version: 0.39.0
236
+ version: 1.48.1
209
237
  - !ruby/object:Gem::Dependency
210
238
  name: test-unit
211
239
  requirement: !ruby/object:Gem::Requirement
@@ -226,28 +254,14 @@ dependencies:
226
254
  requirements:
227
255
  - - '='
228
256
  - !ruby/object:Gem::Version
229
- version: 3.6.2
257
+ version: 3.17.1
230
258
  type: :development
231
259
  prerelease: false
232
260
  version_requirements: !ruby/object:Gem::Requirement
233
261
  requirements:
234
262
  - - '='
235
263
  - !ruby/object:Gem::Version
236
- version: 3.6.2
237
- - !ruby/object:Gem::Dependency
238
- name: coveralls
239
- requirement: !ruby/object:Gem::Requirement
240
- requirements:
241
- - - '='
242
- - !ruby/object:Gem::Version
243
- version: 0.8.23
244
- type: :development
245
- prerelease: false
246
- version_requirements: !ruby/object:Gem::Requirement
247
- requirements:
248
- - - '='
249
- - !ruby/object:Gem::Version
250
- version: 0.8.23
264
+ version: 3.17.1
251
265
  description: |2
252
266
  Fluentd plugins for the Stackdriver Logging API, which will make logs
253
267
  viewable in the Stackdriver Logs Viewer and can optionally store them
@@ -302,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
302
316
  requirements:
303
317
  - - ">="
304
318
  - !ruby/object:Gem::Version
305
- version: '2.2'
319
+ version: '2.6'
306
320
  required_rubygems_version: !ruby/object:Gem::Requirement
307
321
  requirements:
308
322
  - - ">="