Remove trace_api and metrics/noop.h scope resolution

open-telemetry · Oct 18, 2020 · 3f73296 · 3f73296
1 parent 29898c7
commit 3f73296
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 396 deletions.
diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h
@@ -15,6 +15,9 @@
 
 #include <memory>
 
+// TODO: Create generic short pattern for opentelemetry::common and opentelemetry::trace and others
+// as necessary
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace metrics
 {
@@ -297,36 +300,36 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<Counter<short>> NewShortCounter(nostd::string_view name,
-                                                                   nostd::string_view description,
-                                                                   nostd::string_view unit,
-                                                                   const bool enabled) override
+  nostd::shared_ptr<Counter<short>> NewShortCounter(nostd::string_view name,
+                                                    nostd::string_view description,
+                                                    nostd::string_view unit,
+                                                    const bool enabled) override
   {
     return nostd::shared_ptr<Counter<short>>{
         new NoopCounter<short>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<Counter<int>> NewIntCounter(nostd::string_view name,
-                                                               nostd::string_view description,
-                                                               nostd::string_view unit,
-                                                               const bool enabled) override
+  nostd::shared_ptr<Counter<int>> NewIntCounter(nostd::string_view name,
+                                                nostd::string_view description,
+                                                nostd::string_view unit,
+                                                const bool enabled) override
   {
     return nostd::shared_ptr<Counter<int>>{new NoopCounter<int>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<Counter<float>> NewFloatCounter(nostd::string_view name,
-                                                                   nostd::string_view description,
-                                                                   nostd::string_view unit,
-                                                                   const bool enabled) override
+  nostd::shared_ptr<Counter<float>> NewFloatCounter(nostd::string_view name,
+                                                    nostd::string_view description,
+                                                    nostd::string_view unit,
+                                                    const bool enabled) override
   {
     return nostd::shared_ptr<Counter<float>>{
         new NoopCounter<float>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<Counter<double>> NewDoubleCounter(nostd::string_view name,
-                                                                     nostd::string_view description,
-                                                                     nostd::string_view unit,
-                                                                     const bool enabled) override
+  nostd::shared_ptr<Counter<double>> NewDoubleCounter(nostd::string_view name,
+                                                      nostd::string_view description,
+                                                      nostd::string_view unit,
+                                                      const bool enabled) override
   {
     return nostd::shared_ptr<Counter<double>>{
         new NoopCounter<double>(name, description, unit, enabled)};
@@ -342,41 +345,37 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<UpDownCounter<short>> NewShortUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<UpDownCounter<short>> NewShortUpDownCounter(nostd::string_view name,
+                                                                nostd::string_view description,
+                                                                nostd::string_view unit,
+                                                                const bool enabled) override
   {
     return nostd::shared_ptr<UpDownCounter<short>>{
         new NoopUpDownCounter<short>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownCounter<int>> NewIntUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<UpDownCounter<int>> NewIntUpDownCounter(nostd::string_view name,
+                                                            nostd::string_view description,
+                                                            nostd::string_view unit,
+                                                            const bool enabled) override
   {
     return nostd::shared_ptr<UpDownCounter<int>>{
         new NoopUpDownCounter<int>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownCounter<float>> NewFloatUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<UpDownCounter<float>> NewFloatUpDownCounter(nostd::string_view name,
+                                                                nostd::string_view description,
+                                                                nostd::string_view unit,
+                                                                const bool enabled) override
   {
     return nostd::shared_ptr<UpDownCounter<float>>{
         new NoopUpDownCounter<float>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownCounter<double>> NewDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<UpDownCounter<double>> NewDoubleUpDownCounter(nostd::string_view name,
+                                                                  nostd::string_view description,
+                                                                  nostd::string_view unit,
+                                                                  const bool enabled) override
   {
     return nostd::shared_ptr<UpDownCounter<double>>{
         new NoopUpDownCounter<double>(name, description, unit, enabled)};
@@ -392,41 +391,37 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<ValueRecorder<short>> NewShortValueRecorder(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<ValueRecorder<short>> NewShortValueRecorder(nostd::string_view name,
+                                                                nostd::string_view description,
+                                                                nostd::string_view unit,
+                                                                const bool enabled) override
   {
     return nostd::shared_ptr<ValueRecorder<short>>{
         new NoopValueRecorder<short>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueRecorder<int>> NewIntValueRecorder(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<ValueRecorder<int>> NewIntValueRecorder(nostd::string_view name,
+                                                            nostd::string_view description,
+                                                            nostd::string_view unit,
+                                                            const bool enabled) override
   {
     return nostd::shared_ptr<ValueRecorder<int>>{
         new NoopValueRecorder<int>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueRecorder<float>> NewFloatValueRecorder(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<ValueRecorder<float>> NewFloatValueRecorder(nostd::string_view name,
+                                                                nostd::string_view description,
+                                                                nostd::string_view unit,
+                                                                const bool enabled) override
   {
     return nostd::shared_ptr<ValueRecorder<float>>{
         new NoopValueRecorder<float>(name, description, unit, enabled)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueRecorder<double>> NewDoubleValueRecorder(
-      nostd::string_view name,
-      nostd::string_view description,
-      nostd::string_view unit,
-      const bool enabled) override
+  nostd::shared_ptr<ValueRecorder<double>> NewDoubleValueRecorder(nostd::string_view name,
+                                                                  nostd::string_view description,
+                                                                  nostd::string_view unit,
+                                                                  const bool enabled) override
   {
     return nostd::shared_ptr<ValueRecorder<double>>{
         new NoopValueRecorder<double>(name, description, unit, enabled)};
@@ -442,7 +437,7 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<SumObserver<short>> NewShortSumObserver(
+  nostd::shared_ptr<SumObserver<short>> NewShortSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -453,7 +448,7 @@ class NoopMeter : public Meter
         new NoopSumObserver<short>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<SumObserver<int>> NewIntSumObserver(
+  nostd::shared_ptr<SumObserver<int>> NewIntSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -464,7 +459,7 @@ class NoopMeter : public Meter
         new NoopSumObserver<int>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<SumObserver<float>> NewFloatSumObserver(
+  nostd::shared_ptr<SumObserver<float>> NewFloatSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -475,7 +470,7 @@ class NoopMeter : public Meter
         new NoopSumObserver<float>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<SumObserver<double>> NewDoubleSumObserver(
+  nostd::shared_ptr<SumObserver<double>> NewDoubleSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -496,7 +491,7 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<UpDownSumObserver<short>> NewShortUpDownSumObserver(
+  nostd::shared_ptr<UpDownSumObserver<short>> NewShortUpDownSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -507,7 +502,7 @@ class NoopMeter : public Meter
         new NoopUpDownSumObserver<short>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownSumObserver<int>> NewIntUpDownSumObserver(
+  nostd::shared_ptr<UpDownSumObserver<int>> NewIntUpDownSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -518,7 +513,7 @@ class NoopMeter : public Meter
         new NoopUpDownSumObserver<int>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownSumObserver<float>> NewFloatUpDownSumObserver(
+  nostd::shared_ptr<UpDownSumObserver<float>> NewFloatUpDownSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -529,7 +524,7 @@ class NoopMeter : public Meter
         new NoopUpDownSumObserver<float>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<UpDownSumObserver<double>> NewDoubleUpDownSumObserver(
+  nostd::shared_ptr<UpDownSumObserver<double>> NewDoubleUpDownSumObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -550,7 +545,7 @@ class NoopMeter : public Meter
    * @param enabled a boolean that turns the metric instrument on and off.
    * @return
    */
-  opentelemetry::nostd::shared_ptr<ValueObserver<short>> NewShortValueObserver(
+  nostd::shared_ptr<ValueObserver<short>> NewShortValueObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -561,7 +556,7 @@ class NoopMeter : public Meter
         new NoopValueObserver<short>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueObserver<int>> NewIntValueObserver(
+  nostd::shared_ptr<ValueObserver<int>> NewIntValueObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -572,7 +567,7 @@ class NoopMeter : public Meter
         new NoopValueObserver<int>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueObserver<float>> NewFloatValueObserver(
+  nostd::shared_ptr<ValueObserver<float>> NewFloatValueObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,
@@ -583,7 +578,7 @@ class NoopMeter : public Meter
         new NoopValueObserver<float>(name, description, unit, enabled, callback)};
   }
 
-  opentelemetry::nostd::shared_ptr<ValueObserver<double>> NewDoubleValueObserver(
+  nostd::shared_ptr<ValueObserver<double>> NewDoubleValueObserver(
       nostd::string_view name,
       nostd::string_view description,
       nostd::string_view unit,

diff --git a/api/test/metrics/noop_metrics_test.cc b/api/test/metrics/noop_metrics_test.cc
@@ -12,8 +12,6 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 using opentelemetry::metrics::Meter;
 using opentelemetry::metrics::NoopMeter;
 
-namespace metrics_api = opentelemetry::metrics;
-
 void Callback(opentelemetry::metrics::ObserverResult<int> result)
 {
   std::map<std::string, std::string> labels = {{"key", "value"}};

diff --git a/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h b/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h
@@ -17,7 +17,9 @@
 using opentelemetry::sdk::trace::AttributeConverter;
 using opentelemetry::sdk::trace::SpanDataAttributeValue;
 using opentelemetry::sdk::trace::SpanDataEvent;
-namespace trace_api = opentelemetry::trace;
+
+// TODO: Create generic short pattern for opentelemetry::common and opentelemetry::trace and others
+// as necessary
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace ext
@@ -137,7 +139,8 @@ class ThreadsafeSpanData final : public opentelemetry::sdk::trace::Recordable
     attributes_[std::string(key)] = nostd::visit(converter_, value);
   }
 
-  void SetStatus(trace_api::CanonicalCode code, nostd::string_view description) noexcept override
+  void SetStatus(opentelemetry::trace::CanonicalCode code,
+                 nostd::string_view description) noexcept override
   {
     std::lock_guard<std::mutex> lock(mutex_);
     status_code_ = code;

diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h
@@ -13,10 +13,11 @@
 
 #include <map>
 
+// TODO: Create generic short pattern for opentelemetry::common and opentelemetry::trace
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
-namespace trace_api = opentelemetry::trace;
 namespace trace
 {
 /**
@@ -99,7 +100,7 @@ class Recordable
    * @param code the status code
    * @param description a description of the status
    */
-  virtual void SetStatus(trace_api::CanonicalCode code,
+  virtual void SetStatus(opentelemetry::trace::CanonicalCode code,
                          nostd::string_view description) noexcept = 0;
 
   /**

diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h
@@ -65,20 +65,12 @@ class Sampler
    * @since 0.1.0
    */
 
-<<<<<<< HEAD
   virtual SamplingResult ShouldSample(
-      const trace_api::SpanContext *parent_context,
+      const trace_api::SpanContext &parent_context,
       trace_api::TraceId trace_id,
       nostd::string_view name,
       trace_api::SpanKind span_kind,
       const opentelemetry::common::KeyValueIterable &attributes) noexcept = 0;
-=======
-  virtual SamplingResult ShouldSample(const trace_api::SpanContext &parent_context,
-                                      trace_api::TraceId trace_id,
-                                      nostd::string_view name,
-                                      trace_api::SpanKind span_kind,
-                                      const trace_api::KeyValueIterable &attributes) noexcept = 0;
->>>>>>> origin/master
 
   /**
    * Returns the sampler name or short description with the configuration.

diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h b/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h
@@ -19,11 +19,12 @@ class AlwaysOffSampler : public Sampler
   /**
    * @return Returns DROP always
    */
-  SamplingResult ShouldSample(const trace_api::SpanContext & /*parent_context*/,
-                              trace_api::TraceId /*trace_id*/,
-                              nostd::string_view /*name*/,
-                              trace_api::SpanKind /*span_kind*/,
-                              const opentelemetry::common::KeyValueIterable & /*attributes*/) noexcept override
+  SamplingResult ShouldSample(
+      const trace_api::SpanContext & /*parent_context*/,
+      trace_api::TraceId /*trace_id*/,
+      nostd::string_view /*name*/,
+      trace_api::SpanKind /*span_kind*/,
+      const opentelemetry::common::KeyValueIterable & /*attributes*/) noexcept override
   {
     return {Decision::DROP, nullptr};
   }

diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
@@ -22,11 +22,12 @@ class ParentBasedSampler : public Sampler
    * delegateSampler for root spans
    * @return Returns DROP always
    */
-  SamplingResult ShouldSample(const trace_api::SpanContext &parent_context,
-                              trace_api::TraceId trace_id,
-                              nostd::string_view name,
-                              trace_api::SpanKind span_kind,
-                              const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
+  SamplingResult ShouldSample(
+      const trace_api::SpanContext &parent_context,
+      trace_api::TraceId trace_id,
+      nostd::string_view name,
+      trace_api::SpanKind span_kind,
+      const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
 
   /**
    * @return Description MUST be ParentBased{delegate_sampler_.getDescription()}