remove custom context of botocore instrumentation (#372)

specifically, the `service` property clashes with the existing `context.service` property in the Elasticsearch storage backend

backport of #367 to 3.x

closes #372

Author: beniwohli

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.0.5
+[Check the diff](https://github.com/elastic/apm-agent-python/compare/v3.0.4...v3.0.5)
+
+ * backported a quickfix for the boto3/botocore instrumentation (#372)
+
 ## v3.0.4
 [Check the diff](https://github.com/elastic/apm-agent-python/compare/v3.0.3...v3.0.4)
 

elasticapm/instrumentation/packages/botocore.py

@@ -17,12 +17,11 @@ def call(self, module, method, wrapped, instance, args, kwargs):
         target_endpoint = instance._endpoint.host
         parsed_url = urlparse.urlparse(target_endpoint)
         if "." in parsed_url.hostname:
-            service, region = parsed_url.hostname.split(".", 2)[:2]
+            service = parsed_url.hostname.split(".", 2)[0]
         else:
-            service, region = parsed_url.hostname, None
+            service = parsed_url.hostname
 
         signature = "{}:{}".format(service, operation_name)
-        extra_data = {"service": service, "region": region, "operation": operation_name}
 
-        with capture_span(signature, "ext.http.aws", extra_data, leaf=True):
+        with capture_span(signature, "ext.http.aws", leaf=True):
             return wrapped(*args, **kwargs)

tests/instrumentation/botocore_tests.py

@@ -24,9 +24,6 @@ def test_botocore_instrumentation(mock_make_request, instrument, elasticapm_clie
     span = transaction.spans[0]
 
     assert span.name == "ec2:DescribeInstances"
-    assert span.context["service"] == "ec2"
-    assert span.context["region"] == "us-west-2"
-    assert span.context["operation"] == "DescribeInstances"
 
 
 def test_nonstandard_endpoint_url(instrument, elasticapm_client):
@@ -39,6 +36,3 @@ def test_nonstandard_endpoint_url(instrument, elasticapm_client):
     span = transaction.spans[0]
 
     assert span.name == "example:DescribeInstances"
-    assert span.context["service"] == "example"
-    assert span.context["region"] is None
-    assert span.context["operation"] == "DescribeInstances"