boto3: Add collection safeties and limits (#278)

* Better arg extraction

* Pymongo: Remove unused KV

* Limit collected KVs

Author: Peter Giacomo Lombardo

instana/instrumentation/boto3_inst.py

@@ -100,18 +100,13 @@ def s3_inject_method_with_instana(wrapped, instance, arg_list, kwargs):
                 scope.span.set_tag('http.url', instance._endpoint.host + ':443/' + operation)
                 scope.span.set_tag('http.method', 'POST')
 
-                index = 1
-                payload = {}
                 arg_length = len(arg_list)
-
-                for arg_name in fas_args:
-                    payload[arg_name] = arg_list[index-1]
-
-                    index += 1
-                    if index > arg_length:
-                        break
-
-                scope.span.set_tag('payload', payload)
+                if arg_length > 0:
+                    payload = {}
+                    for index in range(arg_length):
+                        if fas_args[index] in ['Filename', 'Bucket', 'Key']:
+                            payload[fas_args[index]] = arg_list[index]
+                    scope.span.set_tag('payload', payload)
             except Exception as exc:
                 logger.debug("s3_inject_method_with_instana: collect error", exc_info=True)
 

instana/instrumentation/pymongo.py

@@ -48,7 +48,6 @@ def failed(self, event):
         def _collect_connection_tags(self, span, event):
             (host, port) = event.connection_id
 
-            span.set_tag("driver", "pymongo")
             span.set_tag("host", host)
             span.set_tag("port", str(port))
             span.set_tag("db", event.database_name)

tests/clients/boto3/test_boto3_s3.py

@@ -187,7 +187,7 @@ def test_s3_upload_file_obj(s3):
     assert(boto_span.data['boto3']['op'] == 'upload_fileobj')
     assert(boto_span.data['boto3']['ep'] == 'https://s3.amazonaws.com')
     assert(boto_span.data['boto3']['reg'] == 'us-east-1')
-    payload = {'Fileobj': "<_io.BufferedReader name='%s'>" % upload_filename, 'Bucket': 'aws_bucket_name', 'Key': 'aws_key_name'}
+    payload = {'Bucket': 'aws_bucket_name', 'Key': 'aws_key_name'}
     assert boto_span.data['boto3']['payload'] == payload
     assert boto_span.data['http']['method'] == 'POST'
     assert boto_span.data['http']['url'] == 'https://s3.amazonaws.com:443/upload_fileobj'