Skip to content

Commit d5f06d7

Browse files
committed
remove unused clock and client_id
1 parent ad0c105 commit d5f06d7

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/sampler/_sampling_rule.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
from __future__ import annotations
2020

21+
2122
# Disable snake_case naming style so this class can match the sampling rules response from X-Ray
2223
# pylint: disable=invalid-name
2324
class _SamplingRule:

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/sampler/aws_xray_remote_sampler.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
DEFAULT_SAMPLING_PROXY_ENDPOINT,
3232
_AwsXRaySamplingClient,
3333
)
34-
from opentelemetry.sdk.extension.aws.trace.sampler._clock import _Clock
3534
from opentelemetry.sdk.resources import Resource
3635
from opentelemetry.sdk.trace.sampling import (
3736
Decision,
@@ -137,8 +136,6 @@ def __init__(
137136
)
138137
polling_interval = DEFAULT_RULES_POLLING_INTERVAL_SECONDS
139138

140-
self.__client_id = self.__generate_client_id() # pylint: disable=W0238
141-
self._clock = _Clock()
142139
self.__xray_client = _AwsXRaySamplingClient(
143140
endpoint, log_level=log_level
144141
)
@@ -201,10 +198,3 @@ def __start_sampling_rule_poller(self) -> None:
201198
)
202199
self._rules_timer.daemon = True
203200
self._rules_timer.start()
204-
205-
def __generate_client_id(self) -> str:
206-
hex_chars = "0123456789abcdef"
207-
client_id_array: list[str] = []
208-
for _ in range(0, 24):
209-
client_id_array.append(random.choice(hex_chars))
210-
return "".join(client_id_array)

sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/sampler/test_aws_xray_remote_sampler.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ def test_create_remote_sampler_with_empty_resource(
104104
self.assertIsNotNone(
105105
self.rs._root._root._InternalAwsXRayRemoteSampler__resource
106106
)
107-
self.assertTrue(
108-
len(self.rs._root._root._InternalAwsXRayRemoteSampler__client_id),
109-
24,
110-
)
111107

112108
@patch(
113109
"opentelemetry.sdk.extension.aws.trace.sampler._aws_xray_sampling_client._AwsXRaySamplingClient.get_sampling_rules",
@@ -198,7 +194,7 @@ def test_create_remote_sampler_with_all_fields_populated(
198194
"opentelemetry.sdk.extension.aws.trace.sampler._aws_xray_sampling_client._AwsXRaySamplingClient.get_sampling_rules",
199195
return_value=None,
200196
)
201-
def test_get_description(self, sdf) -> str:
197+
def test_get_description(self, mocked_get_sampling_rules) -> str:
202198
self.rs: _AwsXRayRemoteSampler = _AwsXRayRemoteSampler(
203199
resource=Resource.create({"service.name": "dummy_name"})
204200
)

0 commit comments

Comments
 (0)