Merge pull request #211 from scality/dev/ft/pushMetricObjCopy

FT: Push metrics for object copy
scality · Sep 17, 2016 · d3ba43b · d3ba43b
2 parents b410c76 + 17893dd
commit d3ba43b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/lib/api/objectCopy.js b/lib/api/objectCopy.js
@@ -275,11 +275,15 @@ function objectCopy(authInfo, request, sourceBucket,
                             logger.newRequestLoggerFromSerializedUids(
                             log.getSerializedUids()));
                     }
+                    const sourceObjSize = storeMetadataParams.size;
+                    const destObjPrevSize = destObjMD ?
+                        destObjMD['content-length'] : null;
                     return next(null, storeMetadataParams,
-                        serverSideEncryption);
+                        serverSideEncryption, sourceObjSize, destObjPrevSize);
                 });
         },
-    ], (err, storeMetadataParams, serverSideEncryption) => {
+    ], (err, storeMetadataParams, serverSideEncryption, sourceObjSize,
+        destObjPrevSize) => {
         if (err) {
             return callback(err);
         }
@@ -304,6 +308,7 @@ function objectCopy(authInfo, request, sourceBucket,
         // TODO: Add version headers for response
         // (if source or destination is version).
         // Add expiration header if lifecycle enabled
-        return callback(null, xml, additionalHeaders);
+        return callback(null, xml, additionalHeaders, sourceObjSize,
+            destObjPrevSize);
     });
 }
diff --git a/lib/routes/routePUT.js b/lib/routes/routePUT.js
@@ -104,10 +104,12 @@ export default function routePUT(request, response, log, utapi) {
             });
         } else if (request.headers['x-amz-copy-source']) {
             return api.callApiMethod('objectCopy', request, log, (err, xml,
-                additionalHeaders) =>
+                additionalHeaders, sourceObjSize, destObjPrevSize) => {
+                pushMetrics(err, log, utapi, 'objectCopy', sourceObjSize,
+                    destObjPrevSize);
                 routesUtils.responseXMLBody(err, xml, response, log,
-                    additionalHeaders)
-            );
+                    additionalHeaders);
+            });
         } else {
             if (!request.headers['content-length']) {
                 return routesUtils.responseNoBody(errors.MissingContentLength,

diff --git a/lib/utilities/pushMetrics.js b/lib/utilities/pushMetrics.js
@@ -19,6 +19,10 @@ export default function pushMetrics(err, log, utapi, action, resource,
             utapi.pushMetricPutObject(reqUid, resource, contentLength,
                 prevContentLen);
             break;
+        case 'objectCopy':
+            utapi.pushMetricCopyObject(reqUid, resource, contentLength,
+                prevContentLen);
+            break;
         case 'bucketGetACL':
             utapi.pushMetricGetBucketAcl(reqUid, resource);
             break;