Skip to content

Commit 7068d79

Browse files
author
Azfaar Qureshi
committed
adding async conversions
1 parent b283312 commit 7068d79

File tree

3 files changed

+38
-30
lines changed

3 files changed

+38
-30
lines changed

Diff for: exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def export(
145145
return self.send_message(message, headers)
146146

147147
def shutdown(self) -> None:
148-
raise NotImplementedError()
148+
pass
149149

150150
def convert_to_timeseries(
151151
self, export_records: Sequence[ExportRecord]

Diff for: tests/opentelemetry-docker-tests/tests/prometheus-remote-write-cortex/prometheus_remote_write_cortex_test.py

+33-27
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
from opentelemetry.test.test_base import TestBase
99

1010

11-
def get_cpu_usage_callback(observer):
12-
array = [1, 15, 25, 26]
13-
for number in array:
14-
labels = {"cpu_number": str(number)}
15-
observer.observe(int, labels)
11+
def observer_callback(observer):
12+
array = [1.0, 15.0, 25.0, 26.0]
13+
for (index, usage) in enumerate(array):
14+
labels = {"test_label": str(index)}
15+
observer.observe(usage, labels)
1616

1717

1818
class TestPrometheusRemoteWriteExporterCortex(TestBase):
@@ -24,55 +24,61 @@ def setUp(self):
2424
headers={"X-Scope-Org-ID": "5"}
2525
)
2626
self.labels = {"environment": "testing"}
27+
self.meter = self.meter_provider.get_meter(__name__)
28+
metrics.get_meter_provider().start_pipeline(
29+
self.meter, self.exporter, 1,
30+
)
2731

2832
def test_export_counter(self):
29-
meter = self.meter_provider.get_meter(__name__)
30-
metrics.get_meter_provider().start_pipeline(meter, self.exporter, 1)
31-
requests_counter = meter.create_counter(
33+
requests_counter = self.meter.create_counter(
3234
name="requests_counter",
3335
description="number of requests",
3436
unit="1",
3537
value_type=int,
3638
)
3739
requests_counter.add(25, self.labels)
38-
# time.sleep(1)
39-
# metrics.get_meter_provider().shutdown()
4040

4141
def test_export_valuerecorder(self):
42-
meter = self.meter_provider.get_meter(__name__)
43-
metrics.get_meter_provider().start_pipeline(meter, self.exporter, 1)
44-
requests_size = meter.create_valuerecorder(
42+
requests_size = self.meter.create_valuerecorder(
4543
name="requests_size_valuerecorder",
4644
description="size of requests",
4745
unit="1",
4846
value_type=int,
4947
)
5048
requests_size.record(25, self.labels)
51-
# time.sleep(1)
52-
# metrics.get_meter_provider().shutdown()
5349

5450
def test_export_updowncounter(self):
55-
meter = self.meter_provider.get_meter(__name__)
56-
metrics.get_meter_provider().start_pipeline(meter, self.exporter, 1)
57-
requests_size = meter.create_updowncounter(
51+
requests_size = self.meter.create_updowncounter(
5852
name="requests_active_updowncounter",
5953
description="active_requests",
6054
unit="1",
6155
value_type=int,
6256
)
6357
requests_size.add(-25, self.labels)
64-
# time.sleep(1)
65-
# metrics.get_meter_provider().shutdown()
6658

6759
def test_export_sumobserver(self):
68-
meter = self.meter_provider.get_meter(__name__)
69-
metrics.get_meter_provider().start_pipeline(meter, self.exporter, 1)
70-
meter.register_sumobserver(
71-
callback=get_cpu_usage_callback,
60+
self.meter.register_sumobserver(
61+
callback=observer_callback,
7262
name="cpu_usage_sumobserver",
7363
description="per-cpu usage",
7464
unit="1",
75-
value_type=int,
65+
value_type=float,
66+
)
67+
68+
def test_export_updownsumobserver(self):
69+
self.meter.register_updownsumobserver(
70+
callback=observer_callback,
71+
name="cpu_usage_updownsumobserver",
72+
description="cpu active",
73+
unit="1",
74+
value_type=float,
7675
)
77-
# time.sleep(2)
78-
# metrics.get_meter_provider().shutdown()
76+
77+
# def test_export_valueobserver(self):
78+
# self.meter.register_valueobserver(
79+
# callback=observer_callback,
80+
# name="ram_usage",
81+
# description="ram memory usage",
82+
# unit="1",
83+
# value_type=float,
84+
# )

Diff for: tox.ini

+4-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ commands_pre =
198198
test: pip install {toxinidir}/opentelemetry-python-core/opentelemetry-api {toxinidir}/opentelemetry-python-core/opentelemetry-sdk {toxinidir}/opentelemetry-python-core/tests/util
199199

200200
test: pip install {toxinidir}/opentelemetry-python-core/opentelemetry-instrumentation
201-
201+
202202
celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
203203

204204
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
@@ -308,7 +308,9 @@ deps =
308308
sqlalchemy ~= 1.3.16
309309
redis ~= 3.3.11
310310
celery ~= 4.0, != 4.4.4
311-
311+
protobuf>=3.13.0
312+
snappy==0.5.4
313+
requests==2.25.0
312314
changedir =
313315
tests/opentelemetry-docker-tests/tests
314316

0 commit comments

Comments
 (0)