Revert back to master before serverless implementation.

aws · Feb 22, 2019 · 033e03f · 033e03f
1 parent c8e8012
commit 033e03f
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 528 deletions.
diff --git a/aws_xray_sdk/core/exceptions/exceptions.py b/aws_xray_sdk/core/exceptions/exceptions.py
@@ -22,10 +22,6 @@ class FacadeSegmentMutationException(Exception):
     pass
 
 
-class MimicSegmentInvalidException(Exception):
-    pass
-
-
 class MissingPluginNames(Exception):
     pass
 

diff --git a/aws_xray_sdk/core/models/mimic_segment.py b/aws_xray_sdk/core/models/mimic_segment.py
diff --git a/aws_xray_sdk/core/recorder.py b/aws_xray_sdk/core/recorder.py
@@ -243,8 +243,7 @@ def begin_segment(self, name=None, traceid=None,
             self._populate_runtime_context(segment, decision)
 
         self.context.put_segment(segment)
-        current_segment = self.get_trace_entity()
-        return current_segment
+        return segment
 
     def end_segment(self, end_time=None):
         """

diff --git a/aws_xray_sdk/core/serverless_lambda_context.py b/aws_xray_sdk/core/serverless_lambda_context.py
diff --git a/aws_xray_sdk/ext/django/middleware.py b/aws_xray_sdk/ext/django/middleware.py
@@ -1,9 +1,7 @@
 import logging
 
 from aws_xray_sdk.core import xray_recorder
-from aws_xray_sdk.core.lambda_launcher import check_in_lambda, LambdaContext
 from aws_xray_sdk.core.models import http
-from aws_xray_sdk.core.serverless_lambda_context import ServerlessLambdaContext
 from aws_xray_sdk.core.utils import stacktrace
 from aws_xray_sdk.ext.util import calculate_sampling_decision, \
     calculate_segment_name, construct_xray_header, prepare_response_header
@@ -27,13 +25,6 @@ def __init__(self, get_response):
 
         self.get_response = get_response
 
-        # The case when the middleware is initialized in a Lambda Context, we make sure
-        # to use the ServerlessLambdaContext so that the middleware properly functions.
-        # We also check if the current context is a LambdaContext to not override customer
-        # provided contexts.
-        if check_in_lambda() is not None and type(xray_recorder.context) == LambdaContext:
-            xray_recorder.context = ServerlessLambdaContext()
-
     # hooks for django version >= 1.10
     def __call__(self, request):
 

diff --git a/aws_xray_sdk/ext/flask/middleware.py b/aws_xray_sdk/ext/flask/middleware.py
@@ -1,9 +1,7 @@
 import flask.templating
 from flask import request
 
-from aws_xray_sdk.core.lambda_launcher import check_in_lambda, LambdaContext
 from aws_xray_sdk.core.models import http
-from aws_xray_sdk.core.serverless_lambda_context import ServerlessLambdaContext
 from aws_xray_sdk.core.utils import stacktrace
 from aws_xray_sdk.ext.util import calculate_sampling_decision, \
     calculate_segment_name, construct_xray_header, prepare_response_header
@@ -20,13 +18,6 @@ def __init__(self, app, recorder):
         self.app.after_request(self._after_request)
         self.app.teardown_request(self._handle_exception)
 
-        # The case when the middleware is initialized in a Lambda Context, we make sure
-        # to use the ServerlessLambdaContext so that the middleware properly functions.
-        # We also check if the current context is a LambdaContext to not override customer
-        # provided contexts.
-        if check_in_lambda() is not None and type(self._recorder.context) == LambdaContext:
-            self._recorder.context = ServerlessLambdaContext()
-
         _patch_render(recorder)
 
     def _before_request(self):

diff --git a/tests/test_mimic_segment.py b/tests/test_mimic_segment.py