Integration test only 6.2 (#40)

* do not copy pycs into container

* complete es rename started in c8102fb

* reduce noise from tornado

* catch up with various renames

* app -> service
* trace -> span
* transaction_id -> transaction.id

* test only 6.x/master

* bump es & kibana to latest release

* wait variable amount of time for indexing to complete

* bump up apm server queue depth

* updated changes to match master of python agent

These are changes introduced by
elastic/apm-agent-python#119

* run flask app as __main__

as the test cases expect

Author: graphaelli

.dockerignore

@@ -0,0 +1,2 @@
+__pycache__/
+*.py[cod]

docker/apm_server/apm-server.yml

@@ -12,6 +12,8 @@ apm-server:
   # Authorization token to be checked. If a token is set here the agents must
   # send their token in the following format: Authorization: Bearer <secret-token>
   #secret_token:
+
+  concurrent_requests: 1000
 
 #============================== Kibana =====================================
 

docker/nodejs/express/app.js

@@ -1,7 +1,7 @@
 'use strict'
 
 var apm = require('elastic-apm-node').start({
-  appName: process.env.EXPRESS_APP_NAME, 
+  serviceName: process.env.EXPRESS_APP_NAME,
   flushInterval: 1,
   maxQueueSize: 1,
   secretToken: '1234',
@@ -25,9 +25,9 @@ app.get("/foo", function(req, res) {
 });
 
 function foo_route () {
-    var trace = apm.buildTrace()
-    trace.start('app.foo')
-    trace.end()
+    var span = apm.buildSpan()
+    span.start('app.foo')
+    span.end()
 }
 
 app.get("/bar", function(req, res) {
@@ -36,16 +36,16 @@ app.get("/bar", function(req, res) {
 });
 
 function bar_route () {
-    var trace = apm.buildTrace()
-    trace.start('app.bar')
+    var span = apm.buildSpan()
+    span.start('app.bar')
     extra_route()
-    trace.end()
+    span.end()
 }
 
 function extra_route () {
-    var trace = apm.buildTrace()
-    trace.start('app.extra')
-    trace.end()
+    var span = apm.buildSpan()
+    span.start('app.extra')
+    span.end()
 }
 
 app.use(apm.middleware.express())

docker/python/django/start.sh

@@ -4,9 +4,9 @@ set -ex
 
 if [[ -z ${PYTHON_AGENT_VERSION} ]] || 
    [[ -z ${PYTHON_AGENT_VERSION_STATE} ]] || 
-   [[ -z ${DJANGO_APP_NAME} ]] ||
+   [[ -z ${DJANGO_SERVICE_NAME} ]] ||
    [[ -z ${DJANGO_PORT} ]]; then
-  echo "PYTHON_AGENT_VERSION, PYTHON_AGENT_VERSION_STATE, DJANGO_APP_NAME and DJANGO_PORT expected."
+  echo "PYTHON_AGENT_VERSION, PYTHON_AGENT_VERSION_STATE, DJANGO_SERVICE_NAME and DJANGO_PORT expected."
   exit 2
 fi
 if [[ -z ${APM_SERVER_URL} ]]; then
@@ -21,7 +21,7 @@ fi
 
 echo "PYTHON_AGENT_VERSION: ${PYTHON_AGENT_VERSION}, ${PYTHON_AGENT_VERSION_STATE}"
 
-docker build --pull -t ${DJANGO_APP_NAME} -f ./docker/python/django/Dockerfile .
+docker build --pull -t ${DJANGO_SERVICE_NAME} -f ./docker/python/django/Dockerfile .
 
 
 if [[ ${PYTHON_AGENT_VERSION_STATE} == "release" ]]; then
@@ -31,13 +31,13 @@ else
 fi
 
 docker run -d \
-  --name ${DJANGO_APP_NAME} \
+  --name ${DJANGO_SERVICE_NAME} \
   --network=${NETWORK} \
   -p ${DJANGO_PORT}:${DJANGO_PORT} \
-  -e DJANGO_APP_NAME=${DJANGO_APP_NAME} \
+  -e DJANGO_SERVICE_NAME=${DJANGO_SERVICE_NAME} \
   -e DJANGO_PORT=${DJANGO_PORT} \
   -e APM_SERVER_URL=${APM_SERVER_URL} \
-  --rm "${DJANGO_APP_NAME}" \
+  --rm "${DJANGO_SERVICE_NAME}" \
   /bin/bash \
   -c "pip install -U ${install_cmd}
       python testapp/manage.py runserver 0.0.0.0:${DJANGO_PORT}"

docker/python/django/testapp/bar/views.py

@@ -8,12 +8,12 @@ def show(request):
     return HttpResponse(bar())
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def bar():
     extra()
     return "bar"
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def extra():
     return "extra"

docker/python/django/testapp/foo/views.py

@@ -8,6 +8,6 @@ def show(request):
     return HttpResponse(foo())
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def foo():
     return "foo"

docker/python/django/testapp/testapp/settings.py

@@ -41,12 +41,11 @@
 ]
 
 ELASTIC_APM = {
-    'APP_NAME': os.environ['DJANGO_APP_NAME'],
+    'SERVICE_NAME': os.environ['DJANGO_SERVICE_NAME'],
     'SERVER_URL': os.environ['APM_SERVER_URL'],
-    'SERVER': os.environ['APM_SERVER_URL'],
     'SERVER_URL': os.environ['APM_SERVER_URL'],
     'SECRET_TOKEN': '1234_test',
-    'TRACES_SEND_FREQ': 1,
+    'TRANSACTION_SEND_FREQ': 1,
     'MAX_EVENT_QUEUE_LENGTH': 1,
     'TRANSACTIONS_IGNORE_PATTERNS': ['.*healthcheck']
 }

docker/python/flask/app.py

@@ -12,11 +12,10 @@
 
 app.config['ELASTIC_APM'] = {
     'DEBUG': True,
-    'TRACES_SEND_FREQ': 1,
+    'TRANSACTION_SEND_FREQ': 1,
     'MAX_EVENT_QUEUE_LENGTH': 1,
     'SERVER_URL': os.environ['APM_SERVER_URL'],
-    'SERVER': os.environ['APM_SERVER_URL'],
-    'APP_NAME': os.environ['FLASK_APP_NAME'],
+    'SERVICE_NAME': os.environ['FLASK_SERVICE_NAME'],
     'SECRET_TOKEN': '1234',
     'TRANSACTIONS_IGNORE_PATTERNS': ['.*healthcheck']
 }
@@ -38,7 +37,7 @@ def foo_route():
     return foo()
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def foo():
     return "foo"
 
@@ -48,19 +47,19 @@ def bar_route():
     return bar()
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def bar():
     extra()
     return "bar"
 
 
-@elasticapm.trace()
+@elasticapm.capture_span()
 def extra():
     return "extra"
 
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=os.environ['FLASK_PORT'])
+    app.run(host='0.0.0.0', port=int(os.environ['FLASK_PORT']))
 
     # Create a logging handler and attach it.
     handler = LoggingHandler(client=apm.client)

docker/python/flask/start.sh

@@ -25,9 +25,9 @@ else
   install_cmd="git+https://github.com/elastic/apm-agent-python.git@${PYTHON_AGENT_VERSION}"
 fi
 
-app_name=${FLASK_APP_NAME}
+app_name=${FLASK_SERVICE_NAME}
 port=${FLASK_PORT}
-start_cmd="gunicorn -w 4 -b 0.0.0.0:${port} app:app"
+start_cmd="python app.py"
 
 docker build --pull -t ${app_name} -f ./docker/python/flask/Dockerfile .
 
@@ -36,7 +36,7 @@ docker run -d \
   --name ${app_name} \
   --network=${NETWORK} \
   -p ${port}:${port} \
-  -e FLASK_APP_NAME=${app_name} \
+  -e FLASK_SERVICE_NAME=${app_name} \
   -e FLASK_PORT=${port} \
   -e APM_SERVER_URL=${APM_SERVER_URL} \
   --rm "${app_name}" \

docker/run_tests.sh

@@ -14,9 +14,9 @@ docker run \
   -e APM_SERVER_URL=${APM_SERVER_URL} \
   -e EXPRESS_APP_NAME=${EXPRESS_APP_NAME} \
   -e EXPRESS_URL=${EXPRESS_URL} \
-  -e FLASK_APP_NAME=${FLASK_APP_NAME} \
+  -e FLASK_SERVICE_NAME=${FLASK_SERVICE_NAME} \
   -e FLASK_URL=${FLASK_URL} \
-  -e DJANGO_APP_NAME=${DJANGO_APP_NAME} \
+  -e DJANGO_SERVICE_NAME=${DJANGO_SERVICE_NAME} \
   -e DJANGO_URL=${DJANGO_URL} \
   -e PYTHONDONTWRITEBYTECODE=1 \
   -e URLS=${URLS} \