resolve conflict

open-telemetry · Jun 17, 2020 · 6fd2568 · 6fd2568
2 parents 7c4ac5a + 279ef0e
commit 6fd2568
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h
@@ -49,7 +49,7 @@ class Sampler
       trace_api::TraceId trace_id,
       nostd::string_view name,
       trace_api::SpanKind span_kind,
-      std::map<std::string, common::AttributeValue> attributes) noexcept = 0;
+      nostd::span<std::pair<nostd::string_view, common::AttributeValue>> attributes) noexcept = 0;
 
   /**
    * Returns the sampler name or short description with the configuration.