Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding propagators API and b3 SDK implementation (#51, #52) #78

Merged
merged 5 commits into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from .httptextformat import HTTPTextFormat
from .binaryformat import BinaryFormat

__all__ = ["HTTPTextFormat", "BinaryFormat"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import abc
import typing
from opentelemetry.trace import SpanContext


class BinaryFormat(abc.ABC):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this class could use some "performance-oriented" APIs: Since creating a slice of bytes copies it, I suggest from_bytes(byte_representation:bytes, offset: int = 0, length: int = -1), and maybe append_bytes(dst: bytearray).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see the value here, but I may wait on adding these until I add an implementation (e.g. the standard binary format). That might better illustrate the right API, unless you already have an example in mind.

Alternatively it looks like memoryview would be a great way to read values:

https://docs.python.org/3/library/stdtypes.html#memoryview

Although I could always construct a memoryview from the bytes object I received. For to_bytes I could use bytearray internally to construct the buffer.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

@bogdandrutu bogdandrutu Aug 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to not duplicate the same class for correlation-context (distributedcontext) I would suggest to make this a template and have BinaryFormat<SpanContext> and BinaryFormat<DistributedContext>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Mypy typing does support generics, but I'm planning of filing another PR that aligns closer to the tickets I've mentioned above. This will include creating a unified composed object for SpanContext and DistributedContext and using the composed object as the context for propagators, thereby eliminating the need for the generic.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an offline conversation with @bogdandrutu: a bigger problem is that referencing SpanContext here would make context depend on trace.

This creates a circular dependency, and even if we remove the propagators from the tracer trace will depend on context in other places. If we think of the context package as representing the base context propagation layer it's surprising to see it depend on a layer higher in the stack.

This isn't a blocking comment for this PR, just something to keep in mind when you start composing context objects.

@staticmethod
@abc.abstractmethod
def to_bytes(context: SpanContext) -> bytes:
pass

@staticmethod
@abc.abstractmethod
def from_bytes(byte_representation: bytes) -> typing.Optional[SpanContext]:
pass
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import abc
import typing
from opentelemetry.trace import SpanContext

Setter = typing.Callable[[object, str, str], None]
Getter = typing.Callable[[object, str], str]


class HTTPTextFormat(abc.ABC):
"""API for propagation of spans via headers.
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved

This class provides an interface that enables extracting and injecting
trace state into headers of HTTP requests. Http frameworks and client
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
can integrate with HTTPTextFormat by providing the object containing the
headers, and a getter and setter function for the extraction and
injection of values, respectively.

Example::

import flask
import requests
from opentelemetry.context.propagation import HTTPTextFormat

PROPAGATOR = HTTPTextFormat()
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved



Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why all the blank lines?

def get_header_from_flask_request(request, key):
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
return request.headers[key]

def set_header_into_requests_request(request: requests.Request,
key: str, value: str):
request.headers[key] = value

def example_route():
span_context = PROPAGATOR.extract(
get_header_from_flask_request,
flask.request
)
request_to_downstream = requests.Request(
"GET", "http://httpbin.org/get"
)
PROPAGATOR.inject(
span_context,
set_header_into_requests_request,
request_to_downstream
)
session = requests.Session()
session.send(request_to_downstream.prepare())


.. _Propagation API Specification:
https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/api-propagators.md

Enabling this flexi
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
"""
@abc.abstractmethod
def extract(self, get_from_carrier: Getter,
carrier: object) -> SpanContext:
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
pass
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved

@abc.abstractmethod
def inject(self, context: SpanContext, set_in_carrier: Setter,
carrier: object) -> None:
pass
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from opentelemetry.context.propagation.httptextformat import HTTPTextFormat
import opentelemetry.trace as trace


class B3Format(HTTPTextFormat):
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
"""Propagator for the B3 HTTP header format.

See: https://github.com/openzipkin/b3-propagation
"""

SINGLE_HEADER_KEY = "b3"
TRACE_ID_KEY = "x-b3-traceid"
SPAN_ID_KEY = "x-b3-spanid"
SAMPLED_KEY = "x-b3-sampled"

@classmethod
def extract(cls, get_from_carrier, carrier):
trace_id = trace.INVALID_TRACE_ID
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
span_id = trace.INVALID_SPAN_ID
sampled = 1

single_header = get_from_carrier(carrier, cls.SINGLE_HEADER_KEY)
if single_header:
# b3-propagation spec calls for the sampling state to be
# "deferred", which is unspecified. This concept does not
# translate to SpanContext, so we set it as recorded.
sampled = "1"
fields = single_header.split("-", 4)

if len(fields) == 1:
sampled = fields[0]
elif len(fields) == 2:
trace_id, span_id = fields
elif len(fields) == 3:
trace_id, span_id, sampled = fields
elif len(fields) == 4:
trace_id, span_id, sampled, _parent_span_id = fields
else:
return trace.INVALID_SPAN_CONTEXT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

else:
trace_id = get_from_carrier(carrier, cls.TRACE_ID_KEY)
span_id = get_from_carrier(carrier, cls.SPAN_ID_KEY)
sampled = get_from_carrier(carrier, cls.SAMPLED_KEY)

options = 0
if sampled == "1":
options |= trace.TraceOptions.RECORDED
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
return trace.SpanContext(
trace_id=int(trace_id),
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
span_id=int(span_id),
trace_options=options,
trace_state={},
)

@classmethod
def inject(cls, context, set_in_carrier, carrier):
sampled = (trace.TraceOptions.RECORDED & context.trace_options) != 0
set_in_carrier(carrier, cls.TRACE_ID_KEY, str(context.trace_id))
set_in_carrier(carrier, cls.SPAN_ID_KEY, str(context.span_id))
set_in_carrier(carrier, cls.SAMPLED_KEY, "1" if sampled else "0")
Empty file.
Empty file.
57 changes: 57 additions & 0 deletions opentelemetry-sdk/tests/context/propagation/test_b3_format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import unittest
import opentelemetry.sdk.context.propagation.b3_format as b3_format
import opentelemetry.sdk.trace as trace

FORMAT = b3_format.B3Format()


def _get_from_dict(carrier: dict, key: str) -> str:
toumorokoshi marked this conversation as resolved.
Show resolved Hide resolved
return carrier.get(key)


def _set_into_dict(carrier: dict, key: str, value: str):
carrier[key] = value


class TestB3Format(unittest.TestCase):
def test_extract_multi_header(self):
"""Test the extraction of B3 headers """
trace_id = str(trace.generate_trace_id())
span_id = str(trace.generate_span_id())
carrier = {
FORMAT.TRACE_ID_KEY: trace_id,
FORMAT.SPAN_ID_KEY: span_id,
FORMAT.SAMPLED_KEY: "1",
}
span_context = FORMAT.extract(_get_from_dict, carrier)
new_carrier = {}
FORMAT.inject(span_context, _set_into_dict, new_carrier)
self.assertEqual(new_carrier[FORMAT.TRACE_ID_KEY], trace_id)
self.assertEqual(new_carrier[FORMAT.SPAN_ID_KEY], span_id)
self.assertEqual(new_carrier[FORMAT.SAMPLED_KEY], "1")

def test_extract_single_headder(self):
"""Test the extraction from a single b3 header"""
trace_id = str(trace.generate_trace_id())
span_id = str(trace.generate_span_id())
carrier = {FORMAT.SINGLE_HEADER_KEY: "{}-{}".format(trace_id, span_id)}
span_context = FORMAT.extract(_get_from_dict, carrier)
new_carrier = {}
FORMAT.inject(span_context, _set_into_dict, new_carrier)
self.assertEqual(new_carrier[FORMAT.TRACE_ID_KEY], trace_id)
self.assertEqual(new_carrier[FORMAT.SPAN_ID_KEY], span_id)
self.assertEqual(new_carrier[FORMAT.SAMPLED_KEY], "1")