mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge pull request #1208 from mikehale/cloud_watch_instrumentor
[aws|cloud_watch] Add instrumentation support.
This commit is contained in:
commit
9bda38a5dc
1 changed files with 15 additions and 1 deletions
|
@ -6,7 +6,7 @@ module Fog
|
|||
extend Fog::AWS::CredentialFetcher::ServiceMethods
|
||||
|
||||
requires :aws_access_key_id, :aws_secret_access_key
|
||||
recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
|
||||
recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
|
||||
|
||||
request_path 'fog/aws/requests/cloud_watch'
|
||||
|
||||
|
@ -94,6 +94,10 @@ module Fog
|
|||
setup_credentials(options)
|
||||
|
||||
@connection_options = options[:connection_options] || {}
|
||||
|
||||
@instrumentor = options[:instrumentor]
|
||||
@instrumentor_name = options[:instrumentor_name] || 'fog.aws.cloud_watch'
|
||||
|
||||
options[:region] ||= 'us-east-1'
|
||||
@host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
|
||||
@path = options[:path] || '/'
|
||||
|
@ -136,6 +140,16 @@ module Fog
|
|||
}
|
||||
)
|
||||
|
||||
if @instrumentor
|
||||
@instrumentor.instrument("#{@instrumentor_name}.request", params) do
|
||||
_request(body, idempotent, parser)
|
||||
end
|
||||
else
|
||||
_request(body, idempotent, parser)
|
||||
end
|
||||
end
|
||||
|
||||
def _request(body, idempotent, parser)
|
||||
@connection.request({
|
||||
:body => body,
|
||||
:expects => 200,
|
||||
|
|
Loading…
Reference in a new issue