Skip to content

Commit 2584516

Browse files
fix tracer typo (#53)
* fix tracer typo * fix test tracing typo
1 parent 8d91f68 commit 2584516

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

tests/test_tracing.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515

1616
import pytest
17+
from opentelemetry import trace as trace_api
18+
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
19+
OTLPSpanExporter,
20+
)
21+
from opentelemetry.sdk import trace as trace_sdk
22+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
1723

1824
from veadk.tracing.telemetry.exporters.apmplus_exporter import (
1925
APMPlusExporter,
@@ -29,17 +35,11 @@
2935
)
3036
from veadk.tracing.telemetry.opentelemetry_tracer import OpentelemetryTracer
3137

32-
from opentelemetry import trace as trace_api
33-
from opentelemetry.sdk import trace as trace_sdk
34-
from opentelemetry.sdk.trace.export import BatchSpanProcessor
35-
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
36-
OTLPSpanExporter,
37-
)
38-
3938
APP_NAME = "app"
4039
USER_ID = "testuser"
4140
SESSION_ID = "testsession"
4241

42+
4343
def init_exporters():
4444
cozeloop_exporter = CozeloopExporter(
4545
config=CozeloopExporterConfig(
@@ -68,13 +68,15 @@ def init_exporters():
6868
)
6969
return [cozeloop_exporter, apmplus_exporter, tls_exporter]
7070

71+
7172
def gen_span_processor(endpoint: str):
7273
otlp_exporter = OTLPSpanExporter(
7374
endpoint=endpoint,
7475
)
7576
span_processor = BatchSpanProcessor(otlp_exporter)
7677
return span_processor
7778

79+
7880
@pytest.mark.asyncio
7981
async def test_tracing():
8082
exporters = init_exporters()
@@ -86,6 +88,7 @@ async def test_tracing():
8688
# TODO: Ensure the tracing provider is set correctly after loading SDK
8789
# TODO: Ensure the tracing provider is set correctly after loading SDK
8890

91+
8992
@pytest.mark.asyncio
9093
async def test_tracing_with_global_provider():
9194
exporters = init_exporters()
@@ -113,5 +116,3 @@ async def test_tracing_with_apmplus_global_provider():
113116

114117
# apmplus exporter won't init again
115118
assert len(tracer.exporters) == 4 # with extra 2 built-in exporters
116-
117-

veadk/tracing/telemetry/opentelemetry_tracer.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
from typing import Any
2020

2121
from openinference.instrumentation.google_adk import GoogleADKInstrumentor
22-
from opentelemetry.sdk import trace as trace_sdk
2322
from opentelemetry import trace as trace_api
23+
from opentelemetry.sdk import trace as trace_sdk
2424
from opentelemetry.sdk.resources import Resource
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import BatchSpanProcessor, SimpleSpanProcessor
27-
2827
from pydantic import BaseModel, ConfigDict, Field
2928
from typing_extensions import override
3029

@@ -112,7 +111,7 @@ def _init_tracer_provider(self):
112111

113112
if not isinstance(global_tracer_provider, TracerProvider):
114113
logger.info(
115-
f"Global tracer provider has not been set. Create tracer provider and set it now."
114+
"Global tracer provider has not been set. Create tracer provider and set it now."
116115
)
117116
# 1.1 init tracer provider
118117
tracer_provider = trace_sdk.TracerProvider()
@@ -144,7 +143,6 @@ def _init_tracer_provider(self):
144143
self._processors.append(processor)
145144
logger.debug(f"Init OpentelemetryTracer with {len(self.exporters)} exporters.")
146145

147-
148146
@override
149147
def dump(
150148
self,

0 commit comments

Comments
 (0)