new span context constructor

open-telemetry · Aug 2, 2020 · e0c63d3 · e0c63d3
1 parent 0e0d344
commit e0c63d3
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 212 deletions.
diff --git a/exporters/otlp/test/recordable_test.cc b/exporters/otlp/test/recordable_test.cc
@@ -117,21 +117,21 @@ TEST(Recordable, AddEventWithAttributes)
 
 TEST(Recordable, AddLink)
 {
-//  Recordable rec;
-//  const int kNumAttributes              = 3;
-//  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-//  int values[kNumAttributes]            = {5, 12, 40};
-//  std::map<std::string, int> attributes = {
-//      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-//
-//  rec.AddLink(trace::SpanContext(false, false),
-//              trace::KeyValueIterableView<std::map<std::string, int>>(attributes));
-//
-//  for (int i = 0; i < kNumAttributes; i++)
-//  {
-//    EXPECT_EQ(rec.span().links(0).attributes(i).key(), keys[i]);
-//    EXPECT_EQ(rec.span().links(0).attributes(i).value().int_value(), values[i]);
-//  }
+  Recordable rec;
+  const int kNumAttributes              = 3;
+  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
+  int values[kNumAttributes]            = {5, 12, 40};
+  std::map<std::string, int> attributes = {
+      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
+
+  rec.AddLink(trace::SpanContext(false, false),
+              trace::KeyValueIterableView<std::map<std::string, int>>(attributes));
+
+  for (int i = 0; i < kNumAttributes; i++)
+  {
+    EXPECT_EQ(rec.span().links(0).attributes(i).key(), keys[i]);
+    EXPECT_EQ(rec.span().links(0).attributes(i).value().int_value(), values[i]);
+  }
 }
 
 // Test non-int single types. Int single types are tested using templates (see IntAttributeTest)

diff --git a/sdk/test/trace/parent_or_else_sampler_test.cc b/sdk/test/trace/parent_or_else_sampler_test.cc
@@ -12,40 +12,40 @@ using opentelemetry::trace::SpanContext;
 
 TEST(ParentOrElseSampler, ShouldSample)
 {
-//  ParentOrElseSampler sampler_off(std::make_shared<AlwaysOffSampler>());
-//  ParentOrElseSampler sampler_on(std::make_shared<AlwaysOnSampler>());
-//
-//  // Set up parameters
-//  opentelemetry::trace::TraceId trace_id;
-//  opentelemetry::trace::SpanKind span_kind = opentelemetry::trace::SpanKind::kInternal;
-//  using M                                  = std::map<std::string, int>;
-//  M m1                                     = {{}};
-//  opentelemetry::trace::KeyValueIterableView<M> view{m1};
-//  SpanContext parent_context_sampled(true, false);
-//  SpanContext parent_context_nonsampled(false, false);
-//
-//  // Case 1: Parent doesn't exist. Return result of delegateSampler()
-//  auto sampling_result  = sampler_off.ShouldSample(nullptr, trace_id, "", span_kind, view);
-//  auto sampling_result2 = sampler_on.ShouldSample(nullptr, trace_id, "", span_kind, view);
-//
-//  ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision);
-//  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result2.decision);
-//
-//  // Case 2: Parent exists and SampledFlag is true
-//  auto sampling_result3 =
-//      sampler_off.ShouldSample(&parent_context_sampled, trace_id, "", span_kind, view);
-//  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result3.decision);
-//
-//  // Case 3: Parent exists and SampledFlag is false
-//  auto sampling_result4 =
-//      sampler_on.ShouldSample(&parent_context_nonsampled, trace_id, "", span_kind, view);
-//  ASSERT_EQ(Decision::NOT_RECORD, sampling_result4.decision);
+  ParentOrElseSampler sampler_off(std::make_shared<AlwaysOffSampler>());
+  ParentOrElseSampler sampler_on(std::make_shared<AlwaysOnSampler>());
+
+  // Set up parameters
+  opentelemetry::trace::TraceId trace_id;
+  opentelemetry::trace::SpanKind span_kind = opentelemetry::trace::SpanKind::kInternal;
+  using M                                  = std::map<std::string, int>;
+  M m1                                     = {{}};
+  opentelemetry::trace::KeyValueIterableView<M> view{m1};
+  SpanContext parent_context_sampled(true, false);
+  SpanContext parent_context_nonsampled(false, false);
+
+  // Case 1: Parent doesn't exist. Return result of delegateSampler()
+  auto sampling_result  = sampler_off.ShouldSample(nullptr, trace_id, "", span_kind, view);
+  auto sampling_result2 = sampler_on.ShouldSample(nullptr, trace_id, "", span_kind, view);
+
+  ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision);
+  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result2.decision);
+
+  // Case 2: Parent exists and SampledFlag is true
+  auto sampling_result3 =
+      sampler_off.ShouldSample(&parent_context_sampled, trace_id, "", span_kind, view);
+  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result3.decision);
+
+  // Case 3: Parent exists and SampledFlag is false
+  auto sampling_result4 =
+      sampler_on.ShouldSample(&parent_context_nonsampled, trace_id, "", span_kind, view);
+  ASSERT_EQ(Decision::NOT_RECORD, sampling_result4.decision);
 }
 
 TEST(ParentOrElseSampler, GetDescription)
 {
-//  ParentOrElseSampler sampler(std::make_shared<AlwaysOffSampler>());
-//  ASSERT_EQ("ParentOrElse{AlwaysOffSampler}", sampler.GetDescription());
-//  ParentOrElseSampler sampler2(std::make_shared<AlwaysOnSampler>());
-//  ASSERT_EQ("ParentOrElse{AlwaysOnSampler}", sampler2.GetDescription());
+  ParentOrElseSampler sampler(std::make_shared<AlwaysOffSampler>());
+  ASSERT_EQ("ParentOrElse{AlwaysOffSampler}", sampler.GetDescription());
+  ParentOrElseSampler sampler2(std::make_shared<AlwaysOnSampler>());
+  ASSERT_EQ("ParentOrElse{AlwaysOnSampler}", sampler2.GetDescription());
 }