AWS Lambda support

CHANGELOG.asciidoc

@@ -34,15 +34,20 @@ endif::[]
 
 // Unreleased changes go here
 // When the next release happens, nest these changes under the "Python Agent version 6.x" heading
-//[float]
-//===== Features
-//
-//
+[float]
+===== Features
+
+* Add experimental support for AWS lambda instrumentation {pull}1193[#1193]
+* Add support for span compression {pull}1321[#1321]
+* Auto-infer destination resources for easier instrumentation of new resources {pull}1359[#1359]
+* Add support for dropped span statistics {pull}1327[#1327]
+
 [float]
 ===== Bug fixes
 
 * Ensure that Prometheus histograms are encoded correctly for APM Server {pull}1354[#1354]
 * Remove problematic (and duplicate) `event.dataset` from logging integrations {pull}1365[#1365]
+* Fix for memcache instrumentation when configured with a unix socket {pull}1357[#1357]
 
 [[release-notes-6.x]]
 === Python Agent version 6.x

elasticapm/__init__.py

@@ -31,6 +31,7 @@
 
 from elasticapm.base import Client, get_client # noqa: F401
 from elasticapm.conf import setup_logging # noqa: F401
+from elasticapm.contrib.serverless import capture_serverless # noqa: F401
 from elasticapm.instrumentation.control import instrument, uninstrument # noqa: F401
 from elasticapm.traces import ( # noqa: F401
  capture_span,

elasticapm/base.py

@@ -150,7 +150,7 @@ def __init__(self, config=None, **inline):
  constants.EVENTS_API_PATH,
  )
  transport_class = import_string(self.config.transport_class)
- self._transport = transport_class(self._api_endpoint_url, self, **transport_kwargs)
+ self._transport = transport_class(url=self._api_endpoint_url, client=self, **transport_kwargs)
  self.config.transport = self._transport
  self._thread_managers["transport"] = self._transport
 
@@ -200,7 +200,8 @@ def __init__(self, config=None, **inline):
  self._metrics.register("elasticapm.metrics.sets.breakdown.BreakdownMetricSet")
  if self.config.prometheus_metrics:
  self._metrics.register("elasticapm.metrics.sets.prometheus.PrometheusMetrics")
- self._thread_managers["metrics"] = self._metrics
+ if self.config.metrics_interval:
+ self._thread_managers["metrics"] = self._metrics
  compat.atexit_register(self.close)
  if self.config.central_config:
  self._thread_managers["config"] = self.config

elasticapm/contrib/serverless/__init__.py

@@ -0,0 +1,41 @@
+# BSD 3-Clause License
+#
+# Copyright (c) 2019, Elasticsearch BV
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+
+# Future providers such as GCP and Azure will be added to this if/elif block
+# This way you can use the same syntax for each of the providers from a user
+# perspective
+if os.environ.get("AWS_REGION"):
+ from elasticapm.contrib.serverless.aws import capture_serverless
+else:
+ from elasticapm.contrib.serverless.aws import capture_serverless
+
+__all__ = ("capture_serverless",)