add connection id (#209)

Author: uri-p

.circleci/config.yml

@@ -53,6 +53,7 @@ jobs:
       - run: echo "export AWS_DEFAULT_REGION=us-west-2" >> $BASH_ENV
       - run: mkdir -p ~/.aws
       - run: echo ${KEY} | gpg --batch -d --passphrase-fd 0 ../common-resources/encrypted_files/credentials_integration.enc > ~/.aws/credentials
+      - run: . venv/bin/activate && pip uninstall lumigo_tracer -y && python setup.py develop
       - run: . venv/bin/activate && ./scripts/checks.sh
       - run: ../utils/common_bash/defaults/code_cov.sh
 

requirements.txt

@@ -10,3 +10,4 @@ pymongo==3.11.0
 redispy==3.0.0
 sqlalchemy==1.3.20
 moto==1.3.16
+urllib3==1.26.6

src/lumigo_tracer/spans_container.py

@@ -37,6 +37,7 @@
 
 
 class SpansContainer:
+    lambda_container_id = str(uuid.uuid4())
     is_cold = True
     _span: Optional["SpansContainer"] = None
 
@@ -73,6 +74,7 @@ def __init__(
         self.transaction_id = transaction_id
         self.max_finish_time = max_finish_time
         self.base_msg = {
+            "lambda_container_id": SpansContainer.lambda_container_id,
             "started": started,
             "transactionId": transaction_id,
             "account": account,

src/lumigo_tracer/wrappers/http/http_data_classes.py

@@ -8,13 +8,15 @@ class HttpRequest:
     uri: str
     headers: dict
     body: bytes
+    instance_id: Optional[bytes]
 
     def __init__(self, **kwargs):
         self.host = kwargs["host"]
         self.method = kwargs["method"]
         self.uri = kwargs["uri"]
         self.headers = {k.lower(): v for k, v in (kwargs.get("headers") or {}).items()}
         self.body = kwargs.get("body")
+        self.instance_id = kwargs.get("instance_id")
 
     def clone(self, **kwargs):
         clone_obj = deepcopy(self)

src/lumigo_tracer/wrappers/http/http_parser.py

@@ -51,11 +51,13 @@ def parse_request(self, parse_params: HttpRequest) -> dict:
                 else "",
                 "method": parse_params.method,
                 "uri": parse_params.uri,
+                "instance_id": parse_params.instance_id,
             }
         else:
             additional_info = {
                 "method": parse_params.method if parse_params else "",
                 "body": "The data is not available",
+                "instance_id": parse_params.instance_id,
             }
 
         return {

src/lumigo_tracer/wrappers/http/sync_http_wrappers.py

@@ -175,10 +175,19 @@ def _http_send_wrapper(func, instance, args, kwargs):
     with lumigo_safe_execute("add request event"):
         if headers:
             add_request_event(
-                HttpRequest(host=host, method=method, uri=uri, headers=headers, body=body)
+                HttpRequest(
+                    host=host,
+                    method=method,
+                    uri=uri,
+                    headers=headers,
+                    body=body,
+                    instance_id=id(instance),
+                )
             )
         else:
-            add_unparsed_request(HttpRequest(host=host, method=method, uri=uri, body=data))
+            add_unparsed_request(
+                HttpRequest(host=host, method=method, uri=uri, body=data, instance_id=id(instance))
+            )
 
     ret_val = func(*args, **kwargs)
     with lumigo_safe_execute("add response event"):
@@ -224,6 +233,7 @@ def _requests_wrapper(func, instance, args, kwargs):
                         uri=url,
                         body=kwargs.get("data"),
                         headers=kwargs.get("headers"),
+                        instance_id=id(instance),
                     )
                 )
             SpansContainer.add_exception_to_span(span, exception, [])

src/test/unit/wrappers/http/test_sync_http_wrappers.py

@@ -12,6 +12,7 @@
 import pytest
 import urllib3
 import requests
+from urllib3 import HTTPConnectionPool
 
 import lumigo_tracer
 from lumigo_tracer import lumigo_utils
@@ -43,6 +44,7 @@ def lambda_test_function(event, context):
     assert http_spans[0]["started"] > SpansContainer.get_span().function_span["started"]
     assert "ended" in http_spans[0]
     assert "content-length" in http_spans[0]["info"]["httpInfo"]["request"]["headers"]
+    assert http_spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_lambda_wrapper_query_with_http_params(context):
@@ -55,6 +57,7 @@ def lambda_test_function(event, context):
 
     assert http_spans
     assert http_spans[0]["info"]["httpInfo"]["request"]["uri"] == "www.google.com/?q=123"
+    assert http_spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_uri_requests(context):
@@ -69,6 +72,7 @@ def lambda_test_function(event, context):
 
     assert http_spans
     assert http_spans[0]["info"]["httpInfo"]["request"]["uri"] == "www.google.com/?q=123"
+    assert http_spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_lambda_wrapper_get_response(context):
@@ -83,6 +87,7 @@ def lambda_test_function(event, context):
 
     assert http_spans
     assert http_spans[0]["info"]["httpInfo"]["response"]["statusCode"] == 200
+    assert http_spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_lambda_wrapper_http_splitted_send(context):
@@ -102,6 +107,7 @@ def lambda_test_function(event, context):
     assert http_spans
     assert http_spans[0]["info"]["httpInfo"]["request"]["body"] == '"123456"'
     assert "content-length" in http_spans[0]["info"]["httpInfo"]["request"]["headers"]
+    assert http_spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_lambda_wrapper_no_headers(context):
@@ -152,6 +158,7 @@ def lambda_test_function(event, context):
     assert len(http_events) == 1
     span = SpansContainer.get_span().spans[0]
     assert span["info"]["httpInfo"]["request"]["body"] == '"body"'
+    assert span["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_bad_domains_scrubber(monkeypatch, context):
@@ -176,6 +183,7 @@ def lambda_test_function(event, context):
     assert http_events[0].get("info", {}).get("httpInfo", {}).get("host") == "www.google.com"
     assert "headers" not in http_events[0]["info"]["httpInfo"]["request"]
     assert http_events[0]["info"]["httpInfo"]["request"]["body"] == "The data is not available"
+    assert http_events[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_domains_scrubber_override_allows_default_domains(monkeypatch, context):
@@ -193,6 +201,7 @@ def lambda_test_function(event, context):
     assert len(http_events) == 1
     assert http_events[0].get("info", {}).get("httpInfo", {}).get("host") == ssm_url
     assert http_events[0]["info"]["httpInfo"]["request"]["headers"]
+    assert http_events[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_wrapping_json_request(context):
@@ -241,6 +250,7 @@ def lambda_test_function(event, context):
     assert event["info"]["httpInfo"]["response"]["body"]
     assert event["info"]["httpInfo"]["response"]["statusCode"] == 200
     assert event["info"]["httpInfo"]["host"] == "www.google.com"
+    assert event["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_wrapping_requests_times(monkeypatch, context):
@@ -292,6 +302,7 @@ def lambda_test_function(event, context):
     assert span["info"]["httpInfo"]["request"]["method"] == "POST"
     assert span["info"]["httpInfo"]["request"]["body"] == '"123"'
     assert span["info"]["httpInfo"]["request"]["headers"]
+    assert span["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def test_requests_failure_with_kwargs(monkeypatch, context):
@@ -342,6 +353,8 @@ def lambda_test_function(event, context):
     spans = SpansContainer.get_span().spans
     assert spans[0]["info"]["httpInfo"]["request"]["headers"] == json.dumps({"a": "b"})
     assert spans[1]["info"]["httpInfo"]["request"]["headers"] == json.dumps({"c": "d"})
+    assert spans[0]["info"]["httpInfo"]["request"].get("instance_id") is not None
+    assert spans[1]["info"]["httpInfo"]["request"].get("instance_id") is not None
 
 
 def api_gw_event() -> Dict:
@@ -558,3 +571,18 @@ def lambda_test_function(event, context):
 def test_is_lumigo_edge(host, is_lumigo, monkeypatch):
     monkeypatch.setattr(Configuration, "host", "lumigo.io")
     assert is_lumigo_edge(host) == is_lumigo
+
+
+def test_same_connection_id_for_same_connection(context):
+    @lumigo_tracer.lumigo_tracer(token=TOKEN)
+    def lambda_test_function(event, context):
+        pool = HTTPConnectionPool("www.google.com", maxsize=1)
+        pool.request("GET", "/?q=123")
+        pool.request("GET", "/?q=1234")
+
+    lambda_test_function({}, context)
+    http_spans = SpansContainer.get_span().spans
+
+    instance_id_1 = http_spans[0]["info"]["httpInfo"]["request"].get("instance_id")
+    instance_id_2 = http_spans[1]["info"]["httpInfo"]["request"].get("instance_id")
+    assert instance_id_1 == instance_id_2