Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit f00ff22

Browse files
hectorhdzghectorhdzg
committed
WIP
1 parent d12dd20 commit f00ff22

File tree

4 files changed

+66
-67
lines changed

4 files changed

+66
-67
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ venv.bak/
102102

103103
# mypy
104104
.mypy_cache/
105+
106+
# vscode
107+
.vscode/

‎azure_monitor/examples/traces/trace.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
trace.set_preferred_tracer_source_implementation(lambda T: TracerSource())
1212
span_processor = SimpleExportSpanProcessor(
13-
AzureMonitorSpanExporter(
14-
instrumentation_key="<INSTRUMENTATION KEY HERE>"
15-
)
13+
AzureMonitorSpanExporter(instrumentation_key="<INSTRUMENTATION KEY HERE>")
1614
)
1715
trace.tracer_source().add_span_processor(span_processor)
1816
tracer = trace.tracer_source().get_tracer(__name__)

‎azure_monitor/src/azure_monitor/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ def _parse_connection_string(self, connection_string):
131131
prefix = result.get("location")
132132
if prefix is not None:
133133
location_prefix = prefix + "."
134-
endpoint = (
135-
"https://" + location_prefix + "dc." + endpoint_suffix
134+
endpoint = "https://{0}dc.{1}".format(
135+
location_prefix, endpoint_suffix
136136
)
137137
result[INGESTION_ENDPOINT] = endpoint
138138
else:

‎azure_monitor/tests/trace/test_trace.py

+60-62
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ def test_span_to_envelope(self):
6565
links=None,
6666
kind=SpanKind.CLIENT,
6767
)
68-
span.status = StatusCanonicalCode.OK
69-
span.start_time = start_time
70-
span.end_time = end_time
68+
span.set_status(StatusCanonicalCode.OK)
69+
span.start(start_time=start_time)
70+
span.end(end_time=end_time)
7171
envelope = exporter.span_to_envelope(span)
7272
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
7373
self.assertEqual(
@@ -109,9 +109,9 @@ def test_span_to_envelope(self):
109109
links=None,
110110
kind=SpanKind.CLIENT,
111111
)
112-
span.status = StatusCanonicalCode.OK
113-
span.start_time = start_time
114-
span.end_time = end_time
112+
span.set_status(StatusCanonicalCode.OK)
113+
span.start(start_time=start_time)
114+
span.end(end_time=end_time)
115115
envelope = exporter.span_to_envelope(span)
116116
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
117117
self.assertEqual(
@@ -151,9 +151,9 @@ def test_span_to_envelope(self):
151151
links=None,
152152
kind=SpanKind.CLIENT,
153153
)
154-
span.status = StatusCanonicalCode.OK
155-
span.start_time = start_time
156-
span.end_time = end_time
154+
span.set_status(StatusCanonicalCode.OK)
155+
span.start(start_time=start_time)
156+
span.end(end_time=end_time)
157157
envelope = exporter.span_to_envelope(span)
158158
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
159159
self.assertEqual(
@@ -202,9 +202,9 @@ def test_span_to_envelope(self):
202202
links=None,
203203
kind=SpanKind.SERVER,
204204
)
205-
span.status = StatusCanonicalCode.OK
206-
span.start_time = start_time
207-
span.end_time = end_time
205+
span.set_status(StatusCanonicalCode.OK)
206+
span.start(start_time=start_time)
207+
span.end(end_time=end_time)
208208
envelope = exporter.span_to_envelope(span)
209209
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
210210
self.assertEqual(
@@ -254,9 +254,9 @@ def test_span_to_envelope(self):
254254
links=None,
255255
kind=SpanKind.SERVER,
256256
)
257-
span.status = StatusCanonicalCode.OK
258-
span.start_time = start_time
259-
span.end_time = end_time
257+
span.set_status(StatusCanonicalCode.OK)
258+
span.start(start_time=start_time)
259+
span.end(end_time=end_time)
260260
envelope = exporter.span_to_envelope(span)
261261
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
262262
self.assertEqual(
@@ -306,9 +306,9 @@ def test_span_to_envelope(self):
306306
links=None,
307307
kind=SpanKind.SERVER,
308308
)
309-
span.status = StatusCanonicalCode.OK
310-
span.start_time = start_time
311-
span.end_time = end_time
309+
span.set_status(StatusCanonicalCode.OK)
310+
span.start(start_time=start_time)
311+
span.end(end_time=end_time)
312312
envelope = exporter.span_to_envelope(span)
313313
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
314314
self.assertEqual(
@@ -342,9 +342,9 @@ def test_span_to_envelope(self):
342342
links=None,
343343
kind=SpanKind.INTERNAL,
344344
)
345-
span.status = StatusCanonicalCode.OK
346-
span.start_time = start_time
347-
span.end_time = end_time
345+
span.set_status(StatusCanonicalCode.OK)
346+
span.start(start_time=start_time)
347+
span.end(end_time=end_time)
348348
envelope = exporter.span_to_envelope(span)
349349
self.assertEqual(envelope.iKey, "12345678-1234-5678-abcd-12345678abcd")
350350
self.assertEqual(
@@ -387,9 +387,9 @@ def test_span_to_envelope(self):
387387
links=None,
388388
kind=SpanKind.CLIENT,
389389
)
390-
span.status = StatusCanonicalCode.OK
391-
span.start_time = start_time
392-
span.end_time = end_time
390+
span.set_status(StatusCanonicalCode.OK)
391+
span.start(start_time=start_time)
392+
span.end(end_time=end_time)
393393
envelope = exporter.span_to_envelope(span)
394394
self.assertEqual(len(envelope.data.baseData.properties), 2)
395395
self.assertEqual(
@@ -427,9 +427,9 @@ def test_span_to_envelope(self):
427427
links=links,
428428
kind=SpanKind.CLIENT,
429429
)
430-
span.status = StatusCanonicalCode.OK
431-
span.start_time = start_time
432-
span.end_time = end_time
430+
span.set_status(StatusCanonicalCode.OK)
431+
span.start(start_time=start_time)
432+
span.end(end_time=end_time)
433433
envelope = exporter.span_to_envelope(span)
434434
self.assertEqual(len(envelope.data.baseData.properties), 2)
435435
json_dict = json.loads(envelope.data.baseData.properties["_MS.links"])[
@@ -458,9 +458,9 @@ def test_span_to_envelope(self):
458458
links=None,
459459
kind=SpanKind.SERVER,
460460
)
461-
span.status = StatusCanonicalCode.OK
462-
span.start_time = start_time
463-
span.end_time = end_time
461+
span.set_status(StatusCanonicalCode.OK)
462+
span.start(start_time=start_time)
463+
span.end(end_time=end_time)
464464
envelope = exporter.span_to_envelope(span)
465465
self.assertEqual(envelope.data.baseData.responseCode, "500")
466466
self.assertFalse(envelope.data.baseData.success)
@@ -485,9 +485,9 @@ def test_span_to_envelope(self):
485485
links=None,
486486
kind=SpanKind.CLIENT,
487487
)
488-
span.status = StatusCanonicalCode.OK
489-
span.start_time = start_time
490-
span.end_time = end_time
488+
span.set_status(StatusCanonicalCode.OK)
489+
span.start(start_time=start_time)
490+
span.end(end_time=end_time)
491491
envelope = exporter.span_to_envelope(span)
492492
self.assertEqual(envelope.data.baseData.resultCode, "500")
493493
self.assertFalse(envelope.data.baseData.success)
@@ -511,10 +511,9 @@ def test_span_to_envelope(self):
511511
links=None,
512512
kind=SpanKind.SERVER,
513513
)
514-
span.status = StatusCanonicalCode.OK
515-
span.start_time = start_time
516-
span.end_time = end_time
517-
span.status = StatusCanonicalCode.OK
514+
span.set_status(StatusCanonicalCode.OK)
515+
span.start(start_time=start_time)
516+
span.end(end_time=end_time)
518517
envelope = exporter.span_to_envelope(span)
519518
self.assertEqual(envelope.data.baseData.responseCode, "0")
520519
self.assertTrue(envelope.data.baseData.success)
@@ -538,10 +537,9 @@ def test_span_to_envelope(self):
538537
links=None,
539538
kind=SpanKind.CLIENT,
540539
)
541-
span.status = StatusCanonicalCode.OK
542-
span.start_time = start_time
543-
span.end_time = end_time
544-
span.status = StatusCanonicalCode.OK
540+
span.set_status(StatusCanonicalCode.OK)
541+
span.start(start_time=start_time)
542+
span.end(end_time=end_time)
545543
envelope = exporter.span_to_envelope(span)
546544
self.assertEqual(envelope.data.baseData.resultCode, "0")
547545
self.assertTrue(envelope.data.baseData.success)
@@ -565,9 +563,9 @@ def test_span_to_envelope(self):
565563
links=None,
566564
kind=SpanKind.SERVER,
567565
)
568-
span.start_time = start_time
569-
span.end_time = end_time
570-
span.status = StatusCanonicalCode.UNKNOWN
566+
span.set_status(StatusCanonicalCode.UNKNOWN)
567+
span.start(start_time=start_time)
568+
span.end(end_time=end_time)
571569
envelope = exporter.span_to_envelope(span)
572570
self.assertEqual(envelope.data.baseData.responseCode, "2")
573571
self.assertFalse(envelope.data.baseData.success)
@@ -591,9 +589,9 @@ def test_span_to_envelope(self):
591589
links=None,
592590
kind=SpanKind.CLIENT,
593591
)
594-
span.start_time = start_time
595-
span.end_time = end_time
596-
span.status = StatusCanonicalCode.UNKNOWN
592+
span.set_status(StatusCanonicalCode.UNKNOWN)
593+
span.start(start_time=start_time)
594+
span.end(end_time=end_time)
597595
envelope = exporter.span_to_envelope(span)
598596
self.assertEqual(envelope.data.baseData.resultCode, "2")
599597
self.assertFalse(envelope.data.baseData.success)
@@ -621,9 +619,9 @@ def test_span_to_envelope(self):
621619
links=None,
622620
kind=SpanKind.SERVER,
623621
)
624-
span.start_time = start_time
625-
span.end_time = end_time
626-
span.status = StatusCanonicalCode.OK
622+
span.set_status(StatusCanonicalCode.OK)
623+
span.start(start_time=start_time)
624+
span.end(end_time=end_time)
627625
envelope = exporter.span_to_envelope(span)
628626
self.assertEqual(
629627
envelope.data.baseData.properties["request.name"],
@@ -655,9 +653,9 @@ def test_span_to_envelope(self):
655653
links=None,
656654
kind=SpanKind.SERVER,
657655
)
658-
span.start_time = start_time
659-
span.end_time = end_time
660-
span.status = StatusCanonicalCode.OK
656+
span.set_status(StatusCanonicalCode.OK)
657+
span.start(start_time=start_time)
658+
span.end(end_time=end_time)
661659
envelope = exporter.span_to_envelope(span)
662660
self.assertIsNone(envelope.data.baseData.name)
663661

@@ -683,9 +681,9 @@ def test_span_to_envelope(self):
683681
links=None,
684682
kind=SpanKind.SERVER,
685683
)
686-
span.start_time = start_time
687-
span.end_time = end_time
688-
span.status = StatusCanonicalCode.OK
684+
span.set_status(StatusCanonicalCode.OK)
685+
span.start(start_time=start_time)
686+
span.end(end_time=end_time)
689687
envelope = exporter.span_to_envelope(span)
690688
self.assertEqual(envelope.data.baseData.name, "GET")
691689
self.assertEqual(
@@ -718,9 +716,9 @@ def test_span_to_envelope(self):
718716
links=None,
719717
kind=SpanKind.SERVER,
720718
)
721-
span.start_time = start_time
722-
span.end_time = end_time
723-
span.status = StatusCanonicalCode.OK
719+
span.set_status(StatusCanonicalCode.OK)
720+
span.start(start_time=start_time)
721+
span.end(end_time=end_time)
724722
envelope = exporter.span_to_envelope(span)
725723
self.assertIsNone(
726724
envelope.data.baseData.properties.get("request.name")
@@ -752,9 +750,9 @@ def test_span_to_envelope(self):
752750
links=None,
753751
kind=SpanKind.SERVER,
754752
)
755-
span.start_time = start_time
756-
span.end_time = end_time
757-
span.status = StatusCanonicalCode.OK
753+
span.set_status(StatusCanonicalCode.OK)
754+
span.start(start_time=start_time)
755+
span.end(end_time=end_time)
758756
envelope = exporter.span_to_envelope(span)
759757
self.assertIsNone(envelope.data.baseData.url)
760758
self.assertIsNone(envelope.data.baseData.properties.get("request.url"))

0 commit comments

Comments
 (0)