Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@ocelotl
ocelotl committed Jan 28, 2021
1 parent 8410ddc commit b568264
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 39 deletions.
10 changes: 5 additions & 5 deletions ...opentelemetry-propagator-opentracing/src/opentelemetry/propagator/opentracing/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ def extract(
traceflags = TraceFlags.DEFAULT

if (
traceid != INVALID_TRACE_ID and
_valid_traceid.match(traceid) is not None and
spanid != INVALID_SPAN_ID and
_valid_spanid.match(spanid) is not None
traceid != INVALID_TRACE_ID
and _valid_traceid.match(traceid) is not None
and spanid != INVALID_SPAN_ID
and _valid_spanid.match(spanid) is not None
):
# FIXME this padding is lost when trace_id is casted to int when a
# SpanContext is created. This causes a test case to fail. The
Expand Down Expand Up @@ -99,7 +99,7 @@ def extract(
if not key.startswith(OT_BAGGAGE_PREFIX):
continue

baggage[key[len(OT_BAGGAGE_PREFIX):]] = extract_first_element(
baggage[key[len(OT_BAGGAGE_PREFIX) :]] = extract_first_element(
getter.get(carrier, key)
)

Expand Down
73 changes: 39 additions & 34 deletions propagator/opentelemetry-propagator-opentracing/tests/test_opentracing_propagator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,24 @@

from unittest import TestCase

from opentelemetry.baggage import set_baggage, get_all
from opentelemetry.trace import (
TraceFlags, SpanContext, set_span_in_context, INVALID_TRACE_ID, INVALID_SPAN_ID, INVALID_SPAN_CONTEXT
from opentelemetry.baggage import get_all, set_baggage
from opentelemetry.propagator.opentracing import (
OT_BAGGAGE_PREFIX,
OT_SAMPLED_HEADER,
OT_SPAN_ID_HEADER,
OT_TRACE_ID_HEADER,
OpenTracingPropagator,
)
from opentelemetry.trace.propagation import get_current_span
from opentelemetry.sdk.trace import _Span

from opentelemetry.propagator.opentracing import (
OpenTracingPropagator, OT_TRACE_ID_HEADER, OT_SAMPLED_HEADER,
OT_BAGGAGE_PREFIX, OT_SPAN_ID_HEADER
from opentelemetry.trace import (
INVALID_SPAN_CONTEXT,
INVALID_SPAN_ID,
INVALID_TRACE_ID,
SpanContext,
TraceFlags,
set_span_in_context,
)
from opentelemetry.trace.propagation import get_current_span
from opentelemetry.trace.propagation.textmap import DictGetter

carrier_getter = DictGetter()
Expand All @@ -49,9 +56,9 @@ def carrier_inject(self, trace_id, span_id, is_remote, trace_flags):
span_id=span_id,
is_remote=is_remote,
trace_flags=trace_flags,
)
),
)
)
),
)

return carrier
Expand Down Expand Up @@ -92,7 +99,7 @@ def test_inject_truncate_traceid(self):
True,
TraceFlags.DEFAULT,
)[OT_TRACE_ID_HEADER],
"64fe8b2a57d3eff7"
"64fe8b2a57d3eff7",
)

def test_inject_sampled_true(self):
Expand All @@ -105,7 +112,7 @@ def test_inject_sampled_true(self):
True,
TraceFlags.SAMPLED,
)[OT_SAMPLED_HEADER],
"true"
"true",
)

def test_inject_sampled_false(self):
Expand All @@ -118,7 +125,7 @@ def test_inject_sampled_false(self):
True,
TraceFlags.DEFAULT,
)[OT_SAMPLED_HEADER],
"false"
"false",
)

def test_inject_invalid_trace_id(self):
Expand All @@ -131,7 +138,7 @@ def test_inject_invalid_trace_id(self):
True,
TraceFlags.SAMPLED,
),
{}
{},
)

def test_inject_set_baggage(self):
Expand All @@ -155,10 +162,10 @@ def test_inject_set_baggage(self):
span_id=int("e457b5a2e4d86bd1", 16),
is_remote=True,
trace_flags=TraceFlags.SAMPLED,
)
),
)
)
)
),
),
)

self.assertEqual(carrier["".join([OT_BAGGAGE_PREFIX, "key"])], "value")
Expand All @@ -184,10 +191,10 @@ def test_inject_invalid_baggage_keys(self):
span_id=int("e457b5a2e4d86bd1", 16),
is_remote=True,
trace_flags=TraceFlags.SAMPLED,
)
),
)
)
)
),
),
)

self.assertNotIn("".join([OT_BAGGAGE_PREFIX, "!"]), carrier.keys())
Expand All @@ -213,10 +220,10 @@ def test_inject_invalid_baggage_values(self):
span_id=int("e457b5a2e4d86bd1", 16),
is_remote=True,
trace_flags=TraceFlags.SAMPLED,
)
),
)
)
)
),
),
)

self.assertNotIn("".join([OT_BAGGAGE_PREFIX, "key"]), carrier.keys())
Expand All @@ -231,7 +238,7 @@ def test_extract_trace_id_span_id_sampled_true(self):
OT_TRACE_ID_HEADER: "80f198ee56343ba864fe8b2a57d3eff7",
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
OT_SAMPLED_HEADER: "true",
}
},
)
).get_span_context()

Expand All @@ -252,7 +259,7 @@ def test_extract_trace_id_span_id_sampled_false(self):
OT_TRACE_ID_HEADER: "80f198ee56343ba864fe8b2a57d3eff7",
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -273,7 +280,7 @@ def test_extract_padding_trace_id(self):
OT_TRACE_ID_HEADER: "64fe8b2a57d3eff7",
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -294,7 +301,7 @@ def test_extract_malformed_trace_id(self):
OT_TRACE_ID_HEADER: "abc123",
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -310,7 +317,7 @@ def test_extract_malformed_span_id(self):
OT_TRACE_ID_HEADER: "64fe8b2a57d3eff7",
OT_SPAN_ID_HEADER: "abc123",
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -326,7 +333,7 @@ def test_extract_invalid_trace_id(self):
OT_TRACE_ID_HEADER: INVALID_TRACE_ID,
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -342,7 +349,7 @@ def test_extract_invalid_span_id(self):
OT_TRACE_ID_HEADER: "64fe8b2a57d3eff7",
OT_SPAN_ID_HEADER: INVALID_SPAN_ID,
OT_SAMPLED_HEADER: "false",
}
},
)
).get_span_context()

Expand All @@ -359,13 +366,11 @@ def test_extract_baggage(self):
OT_SAMPLED_HEADER: "false",
"".join([OT_BAGGAGE_PREFIX, "abc"]): "abc",
"".join([OT_BAGGAGE_PREFIX, "def"]): "def",
}
},
)
span_context = get_current_span(context).get_span_context()

self.assertEqual(
hex(span_context.trace_id)[2:], "64fe8b2a57d3eff7"
)
self.assertEqual(hex(span_context.trace_id)[2:], "64fe8b2a57d3eff7")
self.assertEqual(hex(span_context.span_id)[2:], "e457b5a2e4d86bd1")
self.assertTrue(span_context.is_remote)
self.assertEqual(span_context.trace_flags, TraceFlags.DEFAULT)
Expand Down

0 comments on commit b568264

Please sign in to comment.