chore: allow custom tracer provider in Agent (strands-agents#207)

poshinchen · pgrayy · commit 772562404480 · 2025-06-18T12:52:49.000Z
diff --git a/src/strands/telemetry/tracer.py b/src/strands/telemetry/tracer.py
@@ -14,6 +14,10 @@
 import opentelemetry.trace as trace_api
 from opentelemetry import propagate
 from opentelemetry.baggage.propagation import W3CBaggagePropagator
+<<<<<<< HEAD
+=======
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+>>>>>>> 68740c5 (chore: allow custom tracer provider in Agent (#207))
 from opentelemetry.propagators.composite import CompositePropagator
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider as SDKTracerProvider
