Merge branch 'main' into FixVcpkg

.gitmodules

@@ -1,34 +1,34 @@
 [submodule "third_party/prometheus-cpp"]
-	path = third_party/prometheus-cpp
-	url = https://github.com/jupp0r/prometheus-cpp
-	branch = master
+path = third_party/prometheus-cpp
+url = https://github.com/jupp0r/prometheus-cpp
+branch = master
 
 [submodule "tools/vcpkg"]
-	path = tools/vcpkg
-	url = https://github.com/Microsoft/vcpkg
-	branch = master
+path = tools/vcpkg
+url = https://github.com/Microsoft/vcpkg
+branch = master
 
 [submodule "third_party/ms-gsl"]
-	path = third_party/ms-gsl
-	url = https://github.com/microsoft/GSL
-	branch = master
+path = third_party/ms-gsl
+url = https://github.com/microsoft/GSL
+branch = main
 
 [submodule "third_party/googletest"]
-	path = third_party/googletest
-	url = https://github.com/google/googletest
-	branch = master
+path = third_party/googletest
+url = https://github.com/google/googletest
+branch = main
 
 [submodule "third_party/benchmark"]
-	path = third_party/benchmark
-	url = https://github.com/google/benchmark
-	branch = master
+path = third_party/benchmark
+url = https://github.com/google/benchmark
+branch = main
 
 [submodule "third_party/opentelemetry-proto"]
-	path = third_party/opentelemetry-proto
-	url = https://github.com/open-telemetry/opentelemetry-proto
-	branch = master
+path = third_party/opentelemetry-proto
+url = https://github.com/open-telemetry/opentelemetry-proto
+branch = main
 
 [submodule "third_party/nlohmann-json"]
-	path = third_party/nlohmann-json
-	url = https://github.com/nlohmann/json
-	branch = master
+path = third_party/nlohmann-json
+url = https://github.com/nlohmann/json
+branch = master

CHANGELOG.md

@@ -15,6 +15,62 @@ Increment the:
 
 ## [Unreleased]
 
+## [1.4.0] 2022-05-17
+
+* [API SDK] Upgrade proto to v0.17.0, update log data model ([#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383))
+* [BUILD] Alpine image ([#1382](https://github.com/open-telemetry/opentelemetry-cpp/pull/1382))
+* [LOGS SDK] Get span_id from context when Logger::Log received invalid span_id
+  ([#1398](https://github.com/open-telemetry/opentelemetry-cpp/pull/1398))
+* [METRICS SDK] Connect async storage with async instruments ([#1388](https://github.com/open-telemetry/opentelemetry-cpp/pull/1388))
+* [DOCS] Getting started document using ostream exporter ([#1394](https://github.com/open-telemetry/opentelemetry-cpp/pull/1394))
+* [BUILD] Fix missing link to nlohmann_json ([#1390](https://github.com/open-telemetry/opentelemetry-cpp/pull/1390))
+* [SDK] Fix sharing resource in batched exported spans ([#1386](https://github.com/open-telemetry/opentelemetry-cpp/pull/1386))
+* [PROTOCOL \& LOGS] Upgrade proto to v0.17.0, update log data model ([#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383))
+* [METRICS SDK] Remove un-necessary files. ([#1379](https://github.com/open-telemetry/opentelemetry-cpp/pull/1379))
+* [EXPORTER] Prometheus exporter meters and instrument name ([#1378](https://github.com/open-telemetry/opentelemetry-cpp/pull/1378))
+* [API] Add noexcept/const qualifier at missing places for Trace API. ([#1374](https://github.com/open-telemetry/opentelemetry-cpp/pull/1374))
+* [SDK] Fix empty tracestate header propagation ([#1373](https://github.com/open-telemetry/opentelemetry-cpp/pull/1373))
+* [METRICS SDK] Reuse temporal metric storage for sync storage ([#1369](https://github.com/open-telemetry/opentelemetry-cpp/pull/1369))
+* [SDK] Fix baggage propagation for empty/invalid baggage context ([#1367](https://github.com/open-telemetry/opentelemetry-cpp/pull/1367))
+* [BUILD] Export opentelemetry_otlp_recordable ([#1365](https://github.com/open-telemetry/opentelemetry-cpp/pull/1365))
+* [TESTS] Disable test on prometheus-cpp which not need ([#1363](https://github.com/open-telemetry/opentelemetry-cpp/pull/1363))
+* [METRICS] Fix class member initialization order ([#1360](https://github.com/open-telemetry/opentelemetry-cpp/pull/1360))
+* [METRICS SDK] Simplify SDK Configuration: Use View with default aggregation if
+  no matching View is configured
+  ([#1358](https://github.com/open-telemetry/opentelemetry-cpp/pull/1358))
+* [BUILD] Add missing include guard ([#1357](https://github.com/open-telemetry/opentelemetry-cpp/pull/1357))
+* [ETW EXPORTER] Fix scalar delete against array ([#1356](https://github.com/open-telemetry/opentelemetry-cpp/pull/1356))
+* [ETW EXPORTER] Conditional include for codecvt header ([#1355](https://github.com/open-telemetry/opentelemetry-cpp/pull/1355))
+* [BUILD] Use latest TraceLoggingDynamic.h ([#1354](https://github.com/open-telemetry/opentelemetry-cpp/pull/1354))
+* [SDK] Add explicit type cast in baggage UrlDecode ([#1353](https://github.com/open-telemetry/opentelemetry-cpp/pull/1353))
+* [METRICS SDK] Remove exporter registration to meter provider ([#1350](https://github.com/open-telemetry/opentelemetry-cpp/pull/1350))
+* [METRICS SDK] Fix output time in metrics OStream exporter ([#1346](https://github.com/open-telemetry/opentelemetry-cpp/pull/1346))
+* [BUILD] ostream metrics cmake ([#1344](https://github.com/open-telemetry/opentelemetry-cpp/pull/1344))
+* [BUILD] Link `opentelemetry_ext` with `opentelemetry_api` ([#1336](https://github.com/open-telemetry/opentelemetry-cpp/pull/1336))
+* [METRICS SDK] Enable metric collection for Async Instruments - Delta and
+  Cumulative
+  ([#1334](https://github.com/open-telemetry/opentelemetry-cpp/pull/1334))
+* [BUILD] Dependencies image as artifact ([#1333](https://github.com/open-telemetry/opentelemetry-cpp/pull/1333))
+* [EXAMPLE] Prometheus example ([#1332](https://github.com/open-telemetry/opentelemetry-cpp/pull/1332))
+* [METRICS EXPORTER] Prometheus exporter ([#1331](https://github.com/open-telemetry/opentelemetry-cpp/pull/1331))
+* [METRICS] Metrics histogram example ([#1330](https://github.com/open-telemetry/opentelemetry-cpp/pull/1330))
+* [TESTS] Replace deprecated googletest API ([#1327](https://github.com/open-telemetry/opentelemetry-cpp/pull/1327))
+* [BUILD] Fix Ninja path ([#1326](https://github.com/open-telemetry/opentelemetry-cpp/pull/1326))
+* [API] Update yield logic for ARM processor ([#1325](https://github.com/open-telemetry/opentelemetry-cpp/pull/1325))
+* [BUILD] Fix metrics compiler warnings ([#1328](https://github.com/open-telemetry/opentelemetry-cpp/pull/1328))
+* [METRICS SDK] Implement Merge and Diff operation for Histogram Aggregation ([#1303](https://github.com/open-telemetry/opentelemetry-cpp/pull/1303))
+
+Notes:
+
+While opentelemetry-cpp Logs are still in experimental stage,
+[#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383) updated
+opentelemetry-proto to 0.17.0, which includes some breaking change in the
+protocol, like
+[this](https://github.com/open-telemetry/opentelemetry-proto/pull/373). This
+makes `name` parameter for our log API unnecessary. However, this parameter is
+marked deprecated instead of being removed in this release, and it will be
+removed in future release.
+
 ## [1.3.0] 2022-04-11
 
 * [ETW EXPORTER] ETW provider handle cleanup ([#1322](https://github.com/open-telemetry/opentelemetry-cpp/pull/1322))

CMakeLists.txt

@@ -173,6 +173,11 @@ if(WIN32)
   option(WITH_ETW "Whether to include the ETW Exporter in the SDK" ON)
 endif(WIN32)
 
+# Do not convert deprecated message to error
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
+  add_compile_options(-Wno-error=deprecated-declarations)
+endif()
+
 option(
   WITH_API_ONLY
   "Only build the API (use as a header-only library). Overrides WITH_EXAMPLES and all options to enable exporters"

README.md

@@ -13,15 +13,15 @@ The C++ [OpenTelemetry](https://opentelemetry.io/) client.
 | Signal  | Status                 | Project                                                                  |
 | ------- | ---------------------- | ------------------------------------------------------------------------ |
 | Traces  | Public Release         | N/A                                                                      |
-| Metrics | Development  [1]       | N/A                                                                      |
+| Metrics | Alpha        [1]       | N/A                                                                      |
 | Logs    | Experimental [2]       | N/A                                                                      |
 
-* [1]: The development of the metrics API and SDK based on new stable
-      specification is ongoing. The timelines would be available in release
-      milestone. The earlier implementation (based on old specification) can be
-      included in build by setting `ENABLE_METRICS_PREVIEW` preprocessor macro,
-      and is included under `*/_metrics/*` directory. This would be eventually
-      removed once the ongoing implemetation is stable.
+* [1]: The metric collection pipeline is available for testing purpose. Not
+      ready for production. The earlier implementation (based on old
+      specification) can be included in build by setting
+      `ENABLE_METRICS_PREVIEW` preprocessor macro, and is included under
+      `*/_metrics/*` directory. This would be eventually removed once the
+      ongoing implemetation is stable.
 * [2]: The current Log Signal Implementation is Experimental, and will change as
       the current OpenTelemetry Log specification matures. The current
       implementation can be included in build by setting `ENABLE_LOGS_PREVIEW`

api/include/opentelemetry/common/macros.h

@@ -7,6 +7,23 @@
 
 #include "opentelemetry/version.h"
 
+#if !defined(OPENTELEMETRY_LIKELY_IF) && defined(__cplusplus)
+// GCC 9 has likely attribute but do not support declare it at the beginning of statement
+#  if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
+#    if __has_cpp_attribute(likely)
+#      define OPENTELEMETRY_LIKELY_IF(...) \
+        if (__VA_ARGS__)                   \
+        [[likely]]
+#    endif
+#  endif
+#endif
+#if !defined(OPENTELEMETRY_LIKELY_IF) && (defined(__clang__) || defined(__GNUC__))
+#  define OPENTELEMETRY_LIKELY_IF(...) if (__builtin_expect(!!(__VA_ARGS__), true))
+#endif
+#ifndef OPENTELEMETRY_LIKELY_IF
+#  define OPENTELEMETRY_LIKELY_IF(...) if (__VA_ARGS__)
+#endif
+
 /// \brief Declare variable as maybe unused
 /// usage:
 ///   OPENTELEMETRY_MAYBE_UNUSED int a;
@@ -40,3 +57,35 @@
 #    endif
 #  endif
 #endif
+
+#if defined(__cplusplus) && __cplusplus >= 201402L
+#  define OPENTELEMETRY_DEPRECATED [[deprecated]]
+#elif defined(__clang__)
+#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
+#elif defined(__GNUC__)
+#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
+#    define OPENTELEMETRY_DEPRECATED [[deprecated]]
+#  else
+#    define OPENTELEMETRY_DEPRECATED __declspec(deprecated)
+#  endif
+#else
+#  define OPENTELEMETRY_DEPRECATED
+#endif
+
+#if defined(__cplusplus) && __cplusplus >= 201402L
+#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
+#elif defined(__clang__)
+#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
+#elif defined(__GNUC__)
+#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
+#elif defined(_MSC_VER)
+#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
+#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
+#  else
+#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __declspec(deprecated(msg))
+#  endif
+#else
+#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg)
+#endif