Skip to content

Commit d12f67f

Browse files
authored
Fix ids_generator references from moving from api to sdk (#283)
1 parent 57b8106 commit d12f67f

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: master
9+
CORE_REPO_SHA: 2b188b9a43dfaa74c1a0a4514b91d1cb07d3075d
1010

1111
jobs:
1212
build:

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5555
([#261](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/261))
5656
- `opentelemetry-instrumentation-aiopg` Fix AttributeError `__aexit__` when `aiopg.connect` and `aio[g].create_pool` used with async context manager
5757
([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235))
58+
- `opentelemetry-exporter-datadog` `opentelemetry-sdk-extension-aws` Fix reference to ids_generator in sdk
59+
([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235))
5860

5961
## [0.16b1](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.16b1) - 2020-11-26
6062

exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from opentelemetry import trace as trace_api
1919
from opentelemetry.exporter.datadog import constants, propagator
2020
from opentelemetry.sdk import trace
21+
from opentelemetry.sdk.trace.ids_generator import RandomIdsGenerator
2122
from opentelemetry.trace import get_current_span, set_span_in_context
2223
from opentelemetry.trace.propagation.textmap import DictGetter
2324

@@ -29,7 +30,7 @@
2930
class TestDatadogFormat(unittest.TestCase):
3031
@classmethod
3132
def setUpClass(cls):
32-
ids_generator = trace_api.RandomIdsGenerator()
33+
ids_generator = RandomIdsGenerator()
3334
cls.serialized_trace_id = propagator.format_trace_id(
3435
ids_generator.generate_trace_id()
3536
)
@@ -107,7 +108,7 @@ def test_context_propagation(self):
107108
"child",
108109
trace_api.SpanContext(
109110
parent_span_context.trace_id,
110-
trace_api.RandomIdsGenerator().generate_span_id(),
111+
RandomIdsGenerator().generate_span_id(),
111112
is_remote=False,
112113
trace_flags=parent_span_context.trace_flags,
113114
trace_state=parent_span_context.trace_state,
@@ -154,7 +155,7 @@ def test_sampling_priority_auto_reject(self):
154155
"child",
155156
trace_api.SpanContext(
156157
parent_span_context.trace_id,
157-
trace_api.RandomIdsGenerator().generate_span_id(),
158+
RandomIdsGenerator().generate_span_id(),
158159
is_remote=False,
159160
trace_flags=parent_span_context.trace_flags,
160161
trace_state=parent_span_context.trace_state,

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/aws_xray_ids_generator.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
import random
1616
import time
1717

18-
from opentelemetry import trace
18+
from opentelemetry.sdk.trace.ids_generator import (
19+
IdsGenerator,
20+
RandomIdsGenerator,
21+
)
1922

2023

21-
class AwsXRayIdsGenerator(trace.IdsGenerator):
24+
class AwsXRayIdsGenerator(IdsGenerator):
2225
"""Generates tracing IDs compatible with the AWS X-Ray tracing service. In
2326
the X-Ray system, the first 32 bits of the `TraceId` are the Unix epoch time
2427
in seconds. Since spans (AWS calls them segments) with an embedded timestamp
@@ -28,7 +31,7 @@ class AwsXRayIdsGenerator(trace.IdsGenerator):
2831
See: https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
2932
"""
3033

31-
random_ids_generator = trace.RandomIdsGenerator()
34+
random_ids_generator = RandomIdsGenerator()
3235

3336
def generate_span_id(self) -> int:
3437
return self.random_ids_generator.generate_span_id()

0 commit comments

Comments
 (0)