AWS Lambda Safeties and Improvements (#279)

* AWS Lambda: Avoid setting arbitrary context

* Do not double trace the boto3 exit

Author: Peter Giacomo Lombardo

instana/instrumentation/aws/lambda_inst.py

@@ -31,11 +31,6 @@ def lambda_handler_with_instana(wrapped, instance, args, kwargs):
                     result['headers']['Server-Timing'] = server_timing_value
                 elif 'multiValueHeaders' in result:
                     result['multiValueHeaders']['Server-Timing'] = [server_timing_value]
-                else:
-                    # If both 'headers' and 'multiValueHeaders' aren't in result,
-                    # then default to setting single value 'headers'
-                    result['headers'] = dict()
-                    result['headers']['Server-Timing'] = server_timing_value
         except Exception as exc:
             if scope.span:
                 scope.span.log_exception(exc)

instana/instrumentation/urllib3.py

@@ -62,8 +62,8 @@ def collect_response(scope, response):
     def urlopen_with_instana(wrapped, instance, args, kwargs):
         parent_span = tracer.active_span
 
-        # If we're not tracing, just return
-        if parent_span is None:
+        # If we're not tracing, just return; boto3 has it's own visibility
+        if parent_span is None or parent_span.operation_name == 'boto3':
             return wrapped(*args, **kwargs)
 
         with tracer.start_active_span("urllib3", child_of=parent_span) as scope: