add and parse the language field in repository.yaml (#2)

* add and parse the language field in repository.yaml

* add sevice names in an array fields

Author: Tomcli

README.md

@@ -51,6 +51,7 @@ services:
   - Discovery
 event_id: web
 event_organizer: dev-journeys
+language: python
 ```
 
 Required field:
@@ -60,6 +61,7 @@ Required field:
 3. services: Put down all the bluemix services that are used in your journey in a list.
 4. event_id: Put down where you will distribute your journey. Default is web.
 5. event_organizer: Put down your event organizer if you have one.
+6. language: If your journey is not in **python**, please put down the journey's main language in lower case.
 
 
 ## Example app

metrics_tracker_client/__init__.py

@@ -32,14 +32,18 @@ def track(tracker_url=None):
 
     event = dict()
     event['date_sent'] = time.strftime("%Y-%m-%dT%H:%M:%S.000Z", time.gmtime())
-    event['runtime'] = 'python'
     event['provider'] = 'others'
     try:
         event['space_id'] = getpass.getuser()
     except:
         pass
     journey_metric = metrics.getJson()
 
+    if (journey_metric is not None) and journey_metric.get("language"):
+        event['runtime'] = journey_metric['language']
+    else:
+        event['runtime'] = 'python'
+
     if env.get('VCAP_APPLICATION') is not None:
         vcap_app = json.loads(env['VCAP_APPLICATION'])
         if version is not None:
@@ -52,6 +56,7 @@ def track(tracker_url=None):
         event['space_id'] = str(vcap_app['space_id'])
         event['application_version'] = str(vcap_app['application_version'])
         event['application_uris'] = [str(uri) for uri in vcap_app['application_uris']]
+        event['bound_services'] = []
         try:
             event['provider'] = str(vcap_app['cf_api'])
         except:
@@ -74,6 +79,8 @@ def track(tracker_url=None):
                 for instance in vcap_services[service]:
                     if 'plan' in instance.keys():
                         event['bound_vcap_services'][service]['plans'].append(str(instance['plan']))
+                    if 'name' in instance.keys():
+                        event['bound_services'].append(str(instance['name']))
 
                 if len(event['bound_vcap_services'][service]['plans']) == 0:
                     del event['bound_vcap_services'][service]['plans']
@@ -97,4 +104,3 @@ def DSX(metric=None):
         print ('Missing Github organization/repository name')
     else:
         metrics.DSXtrack(metric)
-

repository.yaml

@@ -9,7 +9,7 @@
 #       - Mainframe
 #       - Swift on the Server
 #       - Hyperledger Composer
-#       - Hyperledger Fabric v1.0
+#       - Data Science Experience
 
 # services:
 #       - IoT Platform
@@ -39,4 +39,6 @@
 #       - Streaming Analytics for Bluemix
 #       - Investment Portfolio
 #       - Predictive Market Scenarios
-#       - Simulated Instrument Analytics
+#       - Simulated Instrument Analytics
+
+# language: python

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='metrics-tracker-client',
-    version='1.0.9',
+    version='1.1.1',
     description='Python client for the deployment tracker',
     long_description=long_description,
     url='https://github.com/IBM/metrics-collector-client-python',