Skip to content

Commit 693b9ee

Browse files
committed
change function name, other requested changes
1 parent 5fd3260 commit 693b9ee

5 files changed

Lines changed: 51 additions & 53 deletions

File tree

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,4 @@ cython_debug/
181181
.cursorrules
182182

183183
# specific test file to ignore
184-
telemetry_test.py
185-
trace_test.py
184+
*_test_local.py

anaconda_opentelemetry/exporter_shim.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def __init__(self, exporter_class, **kwargs):
2020
self._exporter = exporter_class(**kwargs)
2121
self._state = ExporterState.READY
2222

23-
def update_endpoint(self, batch_access, config, new_endpoint, auth_token=None):
23+
def change_signal_endpoint(self, batch_access, config, new_endpoint, auth_token=None):
2424

2525
endpoint = config._change_signal_endpoint(
2626
self._signal,

anaconda_opentelemetry/signals.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from opentelemetry.trace.status import StatusCode
3131

3232
from .config import Configuration as Config
33-
from .config import deprecated
3433
from .exporter_shim import OTLPMetricExporterShim, OTLPSpanExporterShim, OTLPLogExporterShim
3534
from .attributes import ResourceAttributes as Attributes
3635
from .__version__ import __SDK_VERSION__, __TELEMETRY_SCHEMA_VERSION__
@@ -574,7 +573,7 @@ def initialize_telemetry(config: Config,
574573
)
575574
__ANACONDA_TELEMETRY_INITIALIZED = True
576575

577-
def update_endpoint(signal_type: str, new_endpoint: str, auth_token: str = None):
576+
def change_signal_endpoint(signal_type: str, new_endpoint: str, auth_token: str = None):
578577
"""
579578
Updates the endpoint for the passed signal
580579
@@ -597,7 +596,7 @@ def update_endpoint(signal_type: str, new_endpoint: str, auth_token: str = None)
597596
logging.getLogger(__package__).warning(f"{signal_type} not a valid signal type.")
598597
return False
599598

600-
updated_endpoint = _AnacondaTelInstance._instance.exporter.update_endpoint(
599+
updated_endpoint = _AnacondaTelInstance._instance.exporter.change_signal_endpoint(
601600
batch_access,
602601
_AnacondaTelInstance._instance._config,
603602
new_endpoint,

tests/unit_tests/exporter_shim_test.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_shutdown_delegates_to_exporter(self):
9797
assert result == True
9898
assert mixin._exporter.is_shutdown == True
9999

100-
def test_update_endpoint_successful(self):
100+
def test_change_signal_endpoint_successful(self):
101101
mixin = _OTLPExporterMixin(MockExporter, endpoint="http://localhost:4317")
102102
mixin._signal = "metrics"
103103

@@ -106,7 +106,7 @@ def test_update_endpoint_successful(self):
106106

107107
batch_access = Mock()
108108

109-
result = mixin.update_endpoint(
109+
result = mixin.change_signal_endpoint(
110110
batch_access,
111111
config,
112112
"http://newhost:8080",
@@ -128,7 +128,7 @@ def test_update_endpoint_successful(self):
128128
assert isinstance(mixin._exporter, MockExporter)
129129
assert mixin._exporter.kwargs['endpoint'] == "http://newhost:8080/v1/metrics"
130130

131-
def test_update_endpoint_handles_exporter_creation_failure(self):
131+
def test_change_signal_endpoint_handles_exporter_creation_failure(self):
132132
class FailingExporter:
133133
def __init__(self, **kwargs):
134134
if kwargs.get('endpoint') == "http://invalid:8080/v1/metrics":
@@ -148,7 +148,7 @@ def shutdown(self):
148148

149149
batch_access = Mock()
150150

151-
result = mixin.update_endpoint(
151+
result = mixin.change_signal_endpoint(
152152
batch_access,
153153
config,
154154
"http://invalid:8080"
@@ -159,8 +159,8 @@ def shutdown(self):
159159
assert mixin._exporter is old_exporter
160160
batch_access.force_flush.assert_not_called()
161161

162-
def test_update_endpoint_thread_safety(self):
163-
"""Test that update_endpoint properly locks during state changes"""
162+
def test_change_signal_endpoint_thread_safety(self):
163+
"""Test that change_signal_endpoint properly locks during state changes"""
164164
mixin = _OTLPExporterMixin(MockExporter, endpoint="http://localhost:4317")
165165
mixin._signal = "metrics"
166166

@@ -190,7 +190,7 @@ def track_state_on_exit(*args):
190190

191191
mixin._lock = mock_lock
192192

193-
mixin.update_endpoint(batch_access, config, "http://newhost:8080")
193+
mixin.change_signal_endpoint(batch_access, config, "http://newhost:8080")
194194

195195
# Should acquire lock at least twice
196196
assert enter_count[0] >= 2
@@ -254,15 +254,15 @@ def test_export_with_spans(self):
254254
assert result == "SUCCESS"
255255
assert shim._exporter.exported_items == [spans]
256256

257-
def test_update_endpoint_uses_tracing_signal(self):
257+
def test_change_signal_endpoint_uses_tracing_signal(self):
258258
shim = OTLPSpanExporterShim(MockExporter)
259259

260260
config = Mock()
261261
config._change_signal_endpoint.return_value = "http://newhost:8080/v1/traces"
262262

263263
batch_access = Mock()
264264

265-
shim.update_endpoint(batch_access, config, "http://newhost:8080")
265+
shim.change_signal_endpoint(batch_access, config, "http://newhost:8080")
266266

267267
config._change_signal_endpoint.assert_called_once_with(
268268
"tracing",
@@ -293,15 +293,15 @@ def test_export_with_logs(self):
293293
assert result == "SUCCESS"
294294
assert shim._exporter.exported_items == [logs]
295295

296-
def test_update_endpoint_uses_logging_signal(self):
296+
def test_change_signal_endpoint_uses_logging_signal(self):
297297
shim = OTLPLogExporterShim(MockExporter)
298298

299299
config = Mock()
300300
config._change_signal_endpoint.return_value = "http://newhost:8080/v1/logs"
301301

302302
batch_access = Mock()
303303

304-
shim.update_endpoint(batch_access, config, "http://newhost:8080")
304+
shim.change_signal_endpoint(batch_access, config, "http://newhost:8080")
305305

306306
config._change_signal_endpoint.assert_called_once_with(
307307
"logging",
@@ -343,7 +343,7 @@ def test_endpoint_update_sequence(self):
343343

344344
for endpoint in endpoints:
345345
config._change_signal_endpoint.return_value = f"{endpoint}/v1/metrics"
346-
result = shim.update_endpoint(batch_access, config, endpoint)
346+
result = shim.change_signal_endpoint(batch_access, config, endpoint)
347347

348348
assert result == True
349349
assert shim._init_kwargs['endpoint'] == f"{endpoint}/v1/metrics"
@@ -370,17 +370,17 @@ def export_continuously():
370370
export_results.append(f"error: {e}")
371371
time.sleep(0.01)
372372

373-
def update_endpoint():
373+
def change_signal_endpoint():
374374
config = Mock()
375375
config._change_signal_endpoint.return_value = "http://newhost:8080/v1/metrics"
376376
batch_access = Mock()
377377

378378
time.sleep(0.05)
379-
result = shim.update_endpoint(batch_access, config, "http://newhost:8080")
379+
result = shim.change_signal_endpoint(batch_access, config, "http://newhost:8080")
380380
update_results.append(result)
381381

382382
export_thread = Thread(target=export_continuously)
383-
update_thread = Thread(target=update_endpoint)
383+
update_thread = Thread(target=change_signal_endpoint)
384384

385385
export_thread.start()
386386
update_thread.start()

tests/unit_tests/test_external.py

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from unittest.mock import patch, MagicMock
99
import anaconda_opentelemetry.signals as signals_package
1010
from anaconda_opentelemetry.signals import initialize_telemetry, record_histogram, increment_counter, \
11-
decrement_counter, get_trace, get_telemetry_logger_handler, MetricsNotInitialized, update_endpoint
11+
decrement_counter, get_trace, get_telemetry_logger_handler, MetricsNotInitialized, change_signal_endpoint
1212
from anaconda_opentelemetry.signals import __check_internet_status as check_internet
1313
from anaconda_opentelemetry.config import Configuration as Config
1414
from anaconda_opentelemetry.attributes import ResourceAttributes as Attributes
@@ -1186,25 +1186,25 @@ def setup_method(self):
11861186
"""Reset all instances state before each test"""
11871187
_instance = None
11881188

1189-
def test_update_endpoint_invalid_signal_type(self):
1189+
def test_change_signal_endpoint_invalid_signal_type(self):
11901190
# Test with invalid signal type
1191-
result = update_endpoint('invalid_signal', 'http://new-endpoint:4317')
1191+
result = change_signal_endpoint('invalid_signal', 'http://new-endpoint:4317')
11921192
assert result is False
11931193

11941194
@patch('anaconda_opentelemetry.signals._AnacondaLogger._instance')
1195-
def test_update_endpoint_logging_success(self, mock_logger_instance):
1195+
def test_change_signal_endpoint_logging_success(self, mock_logger_instance):
11961196
mock_exporter = MagicMock()
1197-
mock_exporter.update_endpoint.return_value = True
1197+
mock_exporter.change_signal_endpoint.return_value = True
11981198
mock_processor = MagicMock()
11991199
mock_config = MagicMock()
12001200

12011201
mock_logger_instance._processor = mock_processor
12021202
mock_logger_instance.exporter = mock_exporter
12031203
mock_logger_instance._config = mock_config
12041204

1205-
result = update_endpoint('logging', 'http://new-endpoint:4317')
1205+
result = change_signal_endpoint('logging', 'http://new-endpoint:4317')
12061206

1207-
mock_exporter.update_endpoint.assert_called_once_with(
1207+
mock_exporter.change_signal_endpoint.assert_called_once_with(
12081208
mock_processor,
12091209
mock_config,
12101210
'http://new-endpoint:4317',
@@ -1213,19 +1213,19 @@ def test_update_endpoint_logging_success(self, mock_logger_instance):
12131213
assert result is True
12141214

12151215
@patch('anaconda_opentelemetry.signals._AnacondaLogger._instance')
1216-
def test_update_endpoint_logging_with_auth_token(self, mock_logger_instance):
1216+
def test_change_signal_endpoint_logging_with_auth_token(self, mock_logger_instance):
12171217
mock_exporter = MagicMock()
1218-
mock_exporter.update_endpoint.return_value = True
1218+
mock_exporter.change_signal_endpoint.return_value = True
12191219
mock_processor = MagicMock()
12201220
mock_config = MagicMock()
12211221

12221222
mock_logger_instance._processor = mock_processor
12231223
mock_logger_instance.exporter = mock_exporter
12241224
mock_logger_instance._config = mock_config
12251225

1226-
result = update_endpoint('logging', 'http://new-endpoint:4317', auth_token='test_token')
1226+
result = change_signal_endpoint('logging', 'http://new-endpoint:4317', auth_token='test_token')
12271227

1228-
mock_exporter.update_endpoint.assert_called_once_with(
1228+
mock_exporter.change_signal_endpoint.assert_called_once_with(
12291229
mock_processor,
12301230
mock_config,
12311231
'http://new-endpoint:4317',
@@ -1234,34 +1234,34 @@ def test_update_endpoint_logging_with_auth_token(self, mock_logger_instance):
12341234
assert result is True
12351235

12361236
@patch('anaconda_opentelemetry.signals._AnacondaLogger._instance')
1237-
def test_update_endpoint_logging_failure(self, mock_logger_instance):
1237+
def test_change_signal_endpoint_logging_failure(self, mock_logger_instance):
12381238
mock_exporter = MagicMock()
1239-
mock_exporter.update_endpoint.return_value = False
1239+
mock_exporter.change_signal_endpoint.return_value = False
12401240
mock_processor = MagicMock()
12411241
mock_config = MagicMock()
12421242

12431243
mock_logger_instance._processor = mock_processor
12441244
mock_logger_instance.exporter = mock_exporter
12451245
mock_logger_instance._config = mock_config
12461246

1247-
result = update_endpoint('logging', 'http://new-endpoint:4317')
1247+
result = change_signal_endpoint('logging', 'http://new-endpoint:4317')
12481248

12491249
assert result is False
12501250

12511251
@patch('anaconda_opentelemetry.signals._AnacondaMetrics._instance')
1252-
def test_update_endpoint_metrics_success(self, mock_metrics_instance):
1252+
def test_change_signal_endpoint_metrics_success(self, mock_metrics_instance):
12531253
mock_exporter = MagicMock()
1254-
mock_exporter.update_endpoint.return_value = True
1254+
mock_exporter.change_signal_endpoint.return_value = True
12551255
mock_metric_reader = MagicMock()
12561256
mock_config = MagicMock()
12571257

12581258
mock_metrics_instance.metric_reader = mock_metric_reader
12591259
mock_metrics_instance.exporter = mock_exporter
12601260
mock_metrics_instance._config = mock_config
12611261

1262-
result = update_endpoint('metrics', 'http://new-endpoint:4317')
1262+
result = change_signal_endpoint('metrics', 'http://new-endpoint:4317')
12631263

1264-
mock_exporter.update_endpoint.assert_called_once_with(
1264+
mock_exporter.change_signal_endpoint.assert_called_once_with(
12651265
mock_metric_reader,
12661266
mock_config,
12671267
'http://new-endpoint:4317',
@@ -1270,34 +1270,34 @@ def test_update_endpoint_metrics_success(self, mock_metrics_instance):
12701270
assert result is True
12711271

12721272
@patch('anaconda_opentelemetry.signals._AnacondaMetrics._instance')
1273-
def test_update_endpoint_metrics_failure(self, mock_metrics_instance):
1273+
def test_change_signal_endpoint_metrics_failure(self, mock_metrics_instance):
12741274
mock_exporter = MagicMock()
1275-
mock_exporter.update_endpoint.return_value = False
1275+
mock_exporter.change_signal_endpoint.return_value = False
12761276
mock_metric_reader = MagicMock()
12771277
mock_config = MagicMock()
12781278

12791279
mock_metrics_instance.metric_reader = mock_metric_reader
12801280
mock_metrics_instance.exporter = mock_exporter
12811281
mock_metrics_instance._config = mock_config
12821282

1283-
result = update_endpoint('metrics', 'http://new-endpoint:4317')
1283+
result = change_signal_endpoint('metrics', 'http://new-endpoint:4317')
12841284

12851285
assert result is False
12861286

12871287
@patch('anaconda_opentelemetry.signals._AnacondaTrace._instance')
1288-
def test_update_endpoint_tracing_success(self, mock_trace_instance):
1288+
def test_change_signal_endpoint_tracing_success(self, mock_trace_instance):
12891289
mock_exporter = MagicMock()
1290-
mock_exporter.update_endpoint.return_value = True
1290+
mock_exporter.change_signal_endpoint.return_value = True
12911291
mock_processor = MagicMock()
12921292
mock_config = MagicMock()
12931293

12941294
mock_trace_instance._processor = mock_processor
12951295
mock_trace_instance.exporter = mock_exporter
12961296
mock_trace_instance._config = mock_config
12971297

1298-
result = update_endpoint('tracing', 'http://new-endpoint:4317')
1298+
result = change_signal_endpoint('tracing', 'http://new-endpoint:4317')
12991299

1300-
mock_exporter.update_endpoint.assert_called_once_with(
1300+
mock_exporter.change_signal_endpoint.assert_called_once_with(
13011301
mock_processor,
13021302
mock_config,
13031303
'http://new-endpoint:4317',
@@ -1306,32 +1306,32 @@ def test_update_endpoint_tracing_success(self, mock_trace_instance):
13061306
assert result is True
13071307

13081308
@patch('anaconda_opentelemetry.signals._AnacondaTrace._instance')
1309-
def test_update_endpoint_tracing_failure(self, mock_trace_instance):
1309+
def test_change_signal_endpoint_tracing_failure(self, mock_trace_instance):
13101310
mock_exporter = MagicMock()
1311-
mock_exporter.update_endpoint.return_value = False
1311+
mock_exporter.change_signal_endpoint.return_value = False
13121312
mock_processor = MagicMock()
13131313
mock_config = MagicMock()
13141314

13151315
mock_trace_instance._processor = mock_processor
13161316
mock_trace_instance.exporter = mock_exporter
13171317
mock_trace_instance._config = mock_config
13181318

1319-
result = update_endpoint('tracing', 'http://new-endpoint:4317')
1319+
result = change_signal_endpoint('tracing', 'http://new-endpoint:4317')
13201320

13211321
assert result is False
13221322

13231323
@patch('anaconda_opentelemetry.signals._AnacondaLogger._instance')
1324-
def test_update_endpoint_case_insensitive(self, mock_logger_instance):
1324+
def test_change_signal_endpoint_case_insensitive(self, mock_logger_instance):
13251325
mock_exporter = MagicMock()
1326-
mock_exporter.update_endpoint.return_value = True
1326+
mock_exporter.change_signal_endpoint.return_value = True
13271327
mock_processor = MagicMock()
13281328
mock_config = MagicMock()
13291329

13301330
mock_logger_instance._processor = mock_processor
13311331
mock_logger_instance.exporter = mock_exporter
13321332
mock_logger_instance._config = mock_config
13331333

1334-
result = update_endpoint('LOGGING', 'http://new-endpoint:4317')
1334+
result = change_signal_endpoint('LOGGING', 'http://new-endpoint:4317')
13351335

13361336
assert result is True
1337-
mock_exporter.update_endpoint.assert_called_once()
1337+
mock_exporter.change_signal_endpoint.assert_called_once()

0 commit comments

Comments
 (0)