File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change 14
14
import opentelemetry .trace as trace_api
15
15
from opentelemetry import propagate
16
16
from opentelemetry .baggage .propagation import W3CBaggagePropagator
17
- < << << << HEAD
18
- == == == =
19
- from opentelemetry .exporter .otlp .proto .http .trace_exporter import OTLPSpanExporter
20
- > >> >> >> 68740 c5 (chore : allow custom tracer provider in Agent (#207))
21
17
from opentelemetry .propagators .composite import CompositePropagator
22
18
from opentelemetry .sdk .resources import Resource
23
19
from opentelemetry .sdk .trace import TracerProvider as SDKTracerProvider
@@ -223,7 +219,11 @@ def _initialize_tracer(self) -> None:
223
219
except Exception as e :
224
220
logger .exception ("error=<%s> | Failed to configure OTLP exporter" , e )
225
221
elif self .otlp_endpoint and self .tracer_provider :
222
+ < << << << HEAD
226
223
raise ModuleNotFoundError (OTEL_EXPORTER_MODULE_ERROR )
224
+ == == == =
225
+ logger .warning (OTEL_EXPORTER_MODULE_ERROR )
226
+ >> >> >> > 5 fab010 (build (a2a ): add a2a deps and mitigate otel conflict (#232))
227
227
228
228
# Set as global tracer provider
229
229
trace_api .set_tracer_provider (self .tracer_provider )
You can’t perform that action at this time.
0 commit comments