- Add a log entry for repo verb handling and make the container usage calculation take it into account

- Move all the repo push/pull/verb logging into a central track_and_log method
- Readd images accidentally deleted in the last CL
- Make the uncompressed size migration script better handle exceptions

endpoints/common.py

@@ -11,9 +11,10 @@ from random import SystemRandom
 
 from data import model
 from data.database import db
-from app import app, login_manager, dockerfile_build_queue, notification_queue
+from app import analytics, app, login_manager, dockerfile_build_queue, notification_queue
 from auth.permissions import QuayDeferredPermissionUser
 from auth import scopes
+from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token
 from endpoints.api.discovery import swagger_route_data
 from werkzeug.routing import BaseConverter
 from functools import wraps
@@ -275,3 +276,42 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
                      pathargs=['build', build_request.uuid])
   return build_request
 
+
+def track_and_log(event_name, repo, **kwargs):
+  repository = repo.name
+  namespace = repo.namespace_user.username
+  metadata = {
+    'repo': repository,
+    'namespace': namespace,
+  }
+  metadata.update(kwargs)
+
+  analytics_id = 'anonymous'
+
+  profile.debug('Logging the %s to Mixpanel and the log system', event_name)
+  if get_validated_oauth_token():
+    oauth_token = get_validated_oauth_token()
+    metadata['oauth_token_id'] = oauth_token.id
+    metadata['oauth_token_application_id'] = oauth_token.application.client_id
+    metadata['oauth_token_application'] = oauth_token.application.name
+    analytics_id = 'oauth:' + oauth_token.id
+  elif get_authenticated_user():
+    metadata['username'] = get_authenticated_user().username
+    analytics_id = get_authenticated_user().username
+  elif get_validated_token():
+    metadata['token'] = get_validated_token().friendly_name
+    metadata['token_code'] = get_validated_token().code
+    analytics_id = 'token:' + get_validated_token().code
+  else:
+    metadata['public'] = True
+    analytics_id = 'anonymous'
+
+  extra_params = {
+    'repository': '%s/%s' % (namespace, repository),
+  }
+
+  analytics.track(analytics_id, event_name, extra_params)
+  model.log_action(event_name, namespace,
+                   performer=get_authenticated_user(),
+                   ip=request.remote_addr, metadata=metadata,
+                   repository=repo)