From b5d066d7504b65d30633c944e507d4f6d5af8a07 Mon Sep 17 00:00:00 2001
From: Oliver Zhang <ziqizh@google.com>
Date: Tue, 23 Jun 2020 23:10:09 +0000
Subject: [PATCH 1/2] minor fix

---
 sdk/include/opentelemetry/sdk/trace/sampler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h
index 2cf24b4b40..c1236908ab 100644
--- a/sdk/include/opentelemetry/sdk/trace/sampler.h
+++ b/sdk/include/opentelemetry/sdk/trace/sampler.h
@@ -38,7 +38,7 @@ struct SamplingResult
 {
   Decision decision;
   // A set of span Attributes that will also be added to the Span. Can be nullptr.
-  std::unique_ptr<std::map<std::string, openelemetry::common::AttributeValue>> attributes;
+  std::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>> attributes;
 };
 
 /**

From abba0e301c13ae8b65037b617960ffea66996d7d Mon Sep 17 00:00:00 2001
From: Oliver Zhang <ziqizh@google.com>
Date: Wed, 24 Jun 2020 01:34:51 +0000
Subject: [PATCH 2/2] modify namespace

---
 sdk/include/opentelemetry/sdk/trace/sampler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h
index c1236908ab..93599b18e7 100644
--- a/sdk/include/opentelemetry/sdk/trace/sampler.h
+++ b/sdk/include/opentelemetry/sdk/trace/sampler.h
@@ -70,7 +70,7 @@ class Sampler
                                       trace_api::TraceId trace_id,
                                       nostd::string_view name,
                                       trace_api::SpanKind span_kind,
-                                      const KeyValueIterable &attributes) noexcept = 0;
+                                      const trace_api::KeyValueIterable &attributes) noexcept = 0;
 
   /**
    * Returns the sampler name or short description with the configuration.