Implement https:/open-telemetry/opentelemetry-specification/pull/2452

.gitattributes

@@ -41,3 +41,7 @@ LICENSE* text
 ## git files
 .gitignore text eol=lf
 .gitattributes text eol=lf
+
+## bazel files
+WORKSPACE text eol=lf
+BUILD text eol=lf

CHANGELOG.md

@@ -15,10 +15,10 @@ Increment the:
 
 ## [Unreleased]
 
-* [SDK] Async Batch Span/Log processor with max async support ([#1306](https:/open-telemetry/opentelemetry-cpp/pull/1306))
 * [EXPORTER] OTLP http exporter allow concurrency session ([#1209](https:/open-telemetry/opentelemetry-cpp/pull/1209))
 * [EXT] `curl::HttpClient` use `curl_multi_handle` instead of creating a thread
  for every request and it's able to reuse connections now. ([#1317](https:/open-telemetry/opentelemetry-cpp/pull/1317))
+* [METRICS] Only record non-negative / finite / Non-NAN histogram values([#1427](https:/open-telemetry/opentelemetry-cpp/pull/1427))
 
 ## [1.4.0] 2022-05-17
 

RELEASING.md

@@ -89,5 +89,5 @@ should include all the release notes from the Changelog for this release.
 ## Post Release
 
 Update the OpenTelemetry.io document
-[here](https:/open-telemetry/opentelemetry.io/tree/main/content/en/docs/cpp)
+[here](https:/open-telemetry/opentelemetry.io/tree/main/content/en/docs/instrumentation/cpp)
 by sending a Pull Request.

api/include/opentelemetry/metrics/meter.h

@@ -47,24 +47,26 @@ class Meter
  nostd::string_view unit = "") noexcept = 0;
 
  /**
- * Creates a Asynchronouse (Observable) counter with the passed characteristics and returns a
+ * Creates a Asynchronous (Observable) counter with the passed characteristics and returns a
  * shared_ptr to that Observable Counter
  *
  * @param name the name of the new Observable Counter.
+ * @param callback the function to be observed by the instrument.
  * @param description a brief description of what the Observable Counter is used for.
  * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
- * @param callback the function to be observed by the instrument.
- * @return a shared pointer to the created Observable Counter.
+ * @param state to be passed back to callback
  */
  virtual void CreateLongObservableCounter(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 
  virtual void CreateDoubleObservableCounter(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 
  /**
  * Creates a Histogram with the passed characteristics and returns a shared_ptr to that Histogram.
@@ -89,20 +91,22 @@ class Meter
  * shared_ptr to that Observable Counter
  *
  * @param name the name of the new Observable Gauge.
+ * @param callback the function to be observed by the instrument.
  * @param description a brief description of what the Observable Gauge is used for.
  * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
- * @param callback the function to be observed by the instrument.
- * @return a shared pointer to the created Observable Gauge.
+ * @param state to be passed back to callback
  */
  virtual void CreateLongObservableGauge(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 
  virtual void CreateDoubleObservableGauge(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 
  /**
  * Creates an UpDownCounter with the passed characteristics and returns a shared_ptr to that
@@ -128,20 +132,23 @@ class Meter
  * a shared_ptr to that Observable UpDownCounter
  *
  * @param name the name of the new Observable UpDownCounter.
+ * @param callback the function to be observed by the instrument.
  * @param description a brief description of what the Observable UpDownCounter is used for.
  * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
- * @param callback the function to be observed by the instrument.
- * @return a shared pointer to the created Observable UpDownCounter.
+ * @param state to be passed back to callback
  */
  virtual void CreateLongObservableUpDownCounter(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 
  virtual void CreateDoubleObservableUpDownCounter(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &,
+ void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept = 0;
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept = 0;
 };
 } // namespace metrics
 OPENTELEMETRY_END_NAMESPACE

api/include/opentelemetry/metrics/noop.h

@@ -138,15 +138,17 @@ class NoopMeter final : public Meter
  }
 
  void CreateLongObservableCounter(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 
  void CreateDoubleObservableCounter(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 
  nostd::shared_ptr<Histogram<long>> CreateLongHistogram(
@@ -166,15 +168,17 @@ class NoopMeter final : public Meter
  }
 
  void CreateLongObservableGauge(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 
  void CreateDoubleObservableGauge(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 
  nostd::shared_ptr<UpDownCounter<long>> CreateLongUpDownCounter(
@@ -196,15 +200,17 @@ class NoopMeter final : public Meter
  }
 
  void CreateLongObservableUpDownCounter(nostd::string_view name,
- void (*callback)(ObserverResult<long> &),
+ void (*callback)(ObserverResult<long> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 
  void CreateDoubleObservableUpDownCounter(nostd::string_view name,
- void (*callback)(ObserverResult<double> &),
+ void (*callback)(ObserverResult<double> &, void *),
  nostd::string_view description = "",
- nostd::string_view unit = "") noexcept override
+ nostd::string_view unit = "",
+ void *state = nullptr) noexcept override
  {}
 };
 

api/include/opentelemetry/trace/span_context.h

@@ -81,7 +81,7 @@ class SpanContext final
 
  bool IsRemote() const noexcept { return is_remote_; }
 
- static SpanContext GetInvalid() { return SpanContext(false, false); }
+ static SpanContext GetInvalid() noexcept { return SpanContext(false, false); }
 
  bool IsSampled() const noexcept { return trace_flags_.IsSampled(); }
 

bazel/repository.bzl

@@ -10,6 +10,19 @@ filegroup(
 )
 """
 
+#
+# MAINTAINER
+#
+# This file is used for the Bazel build.
+#
+# When changing (add, upgrade, remove) dependencies
+# please update:
+# - the CMake build, see file
+# <root>/third_party_release
+# - git submodule, see command
+# git submodule status
+#
+
 def opentelemetry_cpp_deps():
  """Loads dependencies need to compile the opentelemetry-cpp library."""
 
@@ -86,9 +99,9 @@ def opentelemetry_cpp_deps():
  http_archive,
  name = "github_nlohmann_json",
  build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
- sha256 = "69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf",
+ sha256 = "b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e",
  urls = [
- "https:/nlohmann/json/releases/download/v3.6.1/include.zip",
+ "https:/nlohmann/json/releases/download/v3.10.5/include.zip",
  ],
  )
 

cmake/nlohmann-json.cmake

@@ -26,7 +26,7 @@ ExternalProject_Add(nlohmann_json_download
 )
 
 ExternalProject_Get_Property(nlohmann_json_download INSTALL_DIR)
-SET(NLOHMANN_JSON_INCLUDE_DIR ${INSTALL_DIR}/third_party/src/nlohmann_json_download/single_include)
+SET(NLOHMANN_JSON_INCLUDE_DIR ${INSTALL_DIR}/src/nlohmann_json_download/single_include)
 add_library(nlohmann_json_ INTERFACE)
 target_include_directories(nlohmann_json_ INTERFACE
  "$<BUILD_INTERFACE:${NLOHMANN_JSON_INCLUDE_DIR}>"

docs/public/sdk/GettingStarted.rst

@@ -50,9 +50,9 @@ OpenTelemetry offers six tracing exporters out of the box:
  opentelemetry::exporter::jaeger::JaegerExporterOptions opts;
  opts.transport_format = opentelemetry::exporter::jaeger::TransportFormat::kThriftHttp;
  opts.endpoint = "localhost";
- opts.server_port =  6831;
+ opts.server_port = 14268;
  opts.headers = {{}}; // optional headers
- auto jaeger_udp_exporter =
+ auto jaeger_http_exporter =
  std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::jaeger::JaegerExporter(opts));
 
 

examples/common/logs_foo_library/foo_library.cc

@@ -33,6 +33,7 @@ void foo_library()
  auto ctx = span->GetContext();
  auto logger = get_logger();
  logger->Log(opentelemetry::logs::Severity::kDebug, "body", {}, ctx.trace_id(), ctx.span_id(),
- ctx.trace_flags(), opentelemetry::common::SystemTimestamp());
+ ctx.trace_flags(),
+ opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
 }
 #endif

examples/common/metrics_foo_library/foo_library.cc

@@ -29,7 +29,7 @@ std::map<std::string, std::string> get_random_attr()
 class MeasurementFetcher
 {
 public:
- static void Fetcher(opentelemetry::metrics::ObserverResult<double> &observer_result)
+ static void Fetcher(opentelemetry::metrics::ObserverResult<double> &observer_result, void *state)
  {
  double val = (rand() % 700) + 1.1;
  std::map<std::string, std::string> labels = get_random_attr();

exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h

@@ -35,6 +35,10 @@ struct ElasticsearchExporterOptions
  // Whether to print the status of the exporter in the console
  bool console_debug_;
 
+# ifdef ENABLE_ASYNC_EXPORT
+ bool asynchronous_mode_ = false;
+# endif
+
  /**
  * Constructor for the ElasticsearchExporterOptions. By default, the endpoint is
  * localhost:9200/logs with a timeout of 30 seconds and disabled console debugging
@@ -49,12 +53,19 @@ struct ElasticsearchExporterOptions
  int port = 9200,
  std::string index = "logs",
  int response_timeout = 30,
- bool console_debug = false)
- : host_{host},
- port_{port},
- index_{index},
- response_timeout_{response_timeout},
- console_debug_{console_debug}
+ bool console_debug = false
+# ifdef ENABLE_ASYNC_EXPORT
+ ,
+ bool asynchronous_mode = false
+# endif
+ )
+ : host_{host}, port_{port}, index_{index}, response_timeout_{response_timeout}, console_debug_
+ {
+ console_debug
+ }
+# ifdef ENABLE_ASYNC_EXPORT
+ , asynchronous_mode_ { asynchronous_mode }
+# endif
  {}
 };
 
@@ -89,19 +100,6 @@ class ElasticsearchLogExporter final : public opentelemetry::sdk::logs::LogExpor
  const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
  &records) noexcept override;
 
-# ifdef ENABLE_ASYNC_EXPORT
- /**
- * Exports a vector of log records to the Elasticsearch instance asynchronously.
- * @param records A list of log records to send to Elasticsearch.
- * @param result_callback callback function accepting ExportResult as argument
- */
- void Export(
- const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
- &records,
- std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
- override;
-# endif
-
  /**
  * Shutdown this exporter.
  * @param timeout The maximum time to wait for the shutdown method to return