Skip to content

Commit 4e756b7

Browse files
jer96pgrayy
authored andcommitted
build(a2a): add a2a deps and mitigate otel conflict (strands-agents#232)
* build(a2a): add a2a deps and mitigate otel conflict
1 parent e17860a commit 4e756b7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/strands/telemetry/tracer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
import opentelemetry.trace as trace_api
1515
from opentelemetry import propagate
1616
from opentelemetry.baggage.propagation import W3CBaggagePropagator
17-
<<<<<<< HEAD
18-
=======
19-
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
20-
>>>>>>> 68740c5 (chore: allow custom tracer provider in Agent (#207))
2117
from opentelemetry.propagators.composite import CompositePropagator
2218
from opentelemetry.sdk.resources import Resource
2319
from opentelemetry.sdk.trace import TracerProvider as SDKTracerProvider
@@ -223,7 +219,11 @@ def _initialize_tracer(self) -> None:
223219
except Exception as e:
224220
logger.exception("error=<%s> | Failed to configure OTLP exporter", e)
225221
elif self.otlp_endpoint and self.tracer_provider:
222+
<<<<<<< HEAD
226223
raise ModuleNotFoundError(OTEL_EXPORTER_MODULE_ERROR)
224+
=======
225+
logger.warning(OTEL_EXPORTER_MODULE_ERROR)
226+
>>>>>>> 5fab010 (build(a2a): add a2a deps and mitigate otel conflict (#232))
227227

228228
# Set as global tracer provider
229229
trace_api.set_tracer_provider(self.tracer_provider)

0 commit comments

Comments
 (0)