Skip to content

Commit

Permalink
Use is_recording flag in asgi, pyramid, aiohttp instrumentation (#1142)
Browse files Browse the repository at this point in the history
  • Loading branch information
lzchen authored and codeboten committed Oct 22, 2020
1 parent 7bb8ce1 commit 3fe8225
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,22 @@ def _before_traversal(event):
)
tracer = trace.get_tracer(__name__, __version__)

attributes = otel_wsgi.collect_request_attributes(environ)

if request.matched_route:
span_name = request.matched_route.pattern
attributes["http.route"] = request.matched_route.pattern
else:
span_name = otel_wsgi.get_default_span_name(environ)

span = tracer.start_span(
span_name,
kind=trace.SpanKind.SERVER,
attributes=attributes,
start_time=start_time,
span_name, kind=trace.SpanKind.SERVER, start_time=start_time,
)

if span.is_recording():
attributes = otel_wsgi.collect_request_attributes(environ)
if request.matched_route:
attributes["http.route"] = request.matched_route.pattern
for key, value in attributes.items():
span.set_attribute(key, value)

activation = tracer.use_span(span, end_on_exit=True)
activation.__enter__()
environ[_ENVIRON_ACTIVATION_KEY] = activation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from unittest.mock import patch
from unittest.mock import Mock, patch

from pyramid.config import Configurator

Expand Down Expand Up @@ -87,6 +87,22 @@ def test_simple(self):
self.assertEqual(span_list[0].kind, trace.SpanKind.SERVER)
self.assertEqual(span_list[0].attributes, expected_attrs)

def test_not_recording(self):
mock_tracer = Mock()
mock_span = Mock()
mock_span.is_recording.return_value = False
mock_tracer.start_span.return_value = mock_span
mock_tracer.use_span.return_value.__enter__ = mock_span
mock_tracer.use_span.return_value.__exit__ = mock_span
with patch("opentelemetry.trace.get_tracer"):
self.client.get("/hello/123")
span_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(span_list), 0)
self.assertFalse(mock_span.is_recording())
self.assertTrue(mock_span.is_recording.called)
self.assertFalse(mock_span.set_attribute.called)
self.assertFalse(mock_span.set_status.called)

def test_404(self):
expected_attrs = expected_attributes(
{
Expand Down

0 comments on commit 3fe8225

Please sign in to comment.