Merge pull request #63 from signalfx/rename-server-timing

Renamed SPLUNK_CONTEXT_SERVER_TIMING_ENABLED to SPLUNK_TRACE_RESPONSE_HEADER_ENABLED

README.md

@@ -72,7 +72,7 @@ default value:
 | `jaeger_endpoint` | `SIGNALFX_ENDPOINT_URL` | `'http://localhost:9080/v1/trace'` | The endpoint the tracer sends spans to. Send spans to a Smart Agent, OpenTelemetry Collector, or a SignalFx ingest endpoint. |
 | `jaeger_password` | `SIGNALFX_ACCESS_TOKEN` | `None` | The SignalFx organization access token. |
 | `N/A` | `SIGNALFX_RECORDED_VALUE_MAX_LENGTH` | `1200` | The maximum length an attribute value can have. Values longer than this are truncated. |
-| `N/A` | `SPLUNK_CONTEXT_SERVER_TIMING_ENABLED` | `true` | Enables adding Server-Timing header to HTTP responses. |
+| `N/A` | `SPLUNK_TRACE_RESPONSE_HEADER_ENABLED` | `true` | Enables adding Server-Timing header to HTTP responses. |
 
 ## Automatically instrument a Python application
 

noxfile.py

@@ -214,7 +214,7 @@ def test_falcon(session):
 
 @nox.session(python=("3.5", "3.6", "3.7"), reuse_venv=True)
 def falcon_via_bootstrap(session):
-    install_unit_tests(session, "falcon>=2.0", "requests")
+    install_unit_tests(session, "falcon>=2.0,<3.0", "requests")
     session.run("sfx-py-trace-bootstrap")
     pip_check(session)
     pip_freeze(session)

requirements-test.txt

@@ -3,7 +3,7 @@ docker
 elasticsearch
 flask
 flake8
-falcon
+falcon<3.0
 mock
 mockupdb
 psycopg2

signalfx_tracing/utils.py

@@ -243,4 +243,4 @@ def padded_hex(num):
 
 
 def is_trace_response_header_enabled():
-    return is_truthy(os.environ.get("SPLUNK_CONTEXT_SERVER_TIMING_ENABLED", "true"))
+    return is_truthy(os.environ.get("SPLUNK_TRACE_RESPONSE_HEADER_ENABLED", "true"))

tests/unit/libraries/falcon_/test_falcon.py

@@ -84,7 +84,7 @@ def test_trace_with_custom_config(self):
         }
 
     def test_response_trace_header_no_server_timing(self):
-        os.environ['SPLUNK_CONTEXT_SERVER_TIMING_ENABLED'] = 'false'
+        os.environ['SPLUNK_TRACE_RESPONSE_HEADER_ENABLED'] = 'false'
         tracer = MockTracer()
         instrument(tracer)
         app = self.make_app()
@@ -94,7 +94,7 @@ def test_response_trace_header_no_server_timing(self):
 
         assert 'access-control-expose-headers' not in result.headers
         assert 'server-timing' not in result.headers
-        del os.environ['SPLUNK_CONTEXT_SERVER_TIMING_ENABLED']
+        del os.environ['SPLUNK_TRACE_RESPONSE_HEADER_ENABLED']
 
     def test_response_trace_header_server_timing(self):
         tracer = MockTracer()