update vendor and go.modadd_contact_groups

1 files changed, 17 insertions, 12 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go
index 0b5571a..c7008d8 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go
@@ -10,11 +10,6 @@ import (
         "github.com/aws/aws-sdk-go/aws/request"
 )
 
-const (
-        // DefaultPort is used when no port is specified
-        DefaultPort = "31000"
-)
-
 // Reporter will gather metrics of API requests made and
 // send those metrics to the CSM endpoint.
 type Reporter struct {
@@ -96,7 +91,7 @@ func getMetricException(err awserr.Error) metricException {
 
         switch code {
         case "RequestError",
-                "SerializationError",
+                request.ErrCodeSerialization,
                 request.CanceledErrorCode:
                 return sdkException{
                         requestException{exception: code, message: msg},
@@ -123,7 +118,7 @@ func (rep *Reporter) sendAPICallMetric(r *request.Request) {
                 Type:               aws.String("ApiCall"),
                 AttemptCount:       aws.Int(r.RetryCount + 1),
                 Region:             r.Config.Region,
-                Latency:            aws.Int(int(time.Now().Sub(r.Time) / time.Millisecond)),
+                Latency:            aws.Int(int(time.Since(r.Time) / time.Millisecond)),
                 XAmzRequestID:      aws.String(r.RequestID),
                 MaxRetriesExceeded: aws.Int(boolIntValue(r.RetryCount >= r.MaxRetries())),
         }
@@ -190,8 +185,9 @@ func (rep *Reporter) start() {
         }
 }
 
-// Pause will pause the metric channel preventing any new metrics from
-// being added.
+// Pause will pause the metric channel preventing any new metrics from being
+// added. It is safe to call concurrently with other calls to Pause, but if
+// called concurently with Continue can lead to unexpected state.
 func (rep *Reporter) Pause() {
         lock.Lock()
         defer lock.Unlock()
@@ -203,8 +199,9 @@ func (rep *Reporter) Pause() {
         rep.close()
 }
 
-// Continue will reopen the metric channel and allow for monitoring
-// to be resumed.
+// Continue will reopen the metric channel and allow for monitoring to be
+// resumed. It is safe to call concurrently with other calls to Continue, but
+// if called concurently with Pause can lead to unexpected state.
 func (rep *Reporter) Continue() {
         lock.Lock()
         defer lock.Unlock()
@@ -219,10 +216,18 @@ func (rep *Reporter) Continue() {
         rep.metricsCh.Continue()
 }
 
+// Client side metric handler names
+const (
+        APICallMetricHandlerName        = "awscsm.SendAPICallMetric"
+        APICallAttemptMetricHandlerName = "awscsm.SendAPICallAttemptMetric"
+)
+
 // InjectHandlers will will enable client side metrics and inject the proper
 // handlers to handle how metrics are sent.
 //
-//      Example:
+// InjectHandlers is NOT safe to call concurrently. Calling InjectHandlers
+// multiple times may lead to unexpected behavior, (e.g. duplicate metrics).
+//
 //              // Start must be called in order to inject the correct handlers
 //              r, err := csm.Start("clientID", "127.0.0.1:8094")
 //              if err != nil {