diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2223c481..52844b0401 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Increment the: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ## [1.8.1] 2022-12-04 * [ETW Exporter] Tail based sampling support [#1780](https://github.com/open-telemetry/opentelemetry-cpp/pull/1780) @@ -284,6 +285,8 @@ update the semantic convention in instrumentation library is needed. >>>>>>> c6552dca ([Metrics SDK] Add support for Pull Metric Reader (#1701)) ======= >>>>>>> 16c5d000 ([Metrics] Switch to explicit 64 bit integers (#1686)) +======= +>>>>>>> 399daf57 (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) * [TRACE SDK] Add trace sdk builders (#1393) [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471) * [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473) @@ -307,6 +310,45 @@ update the semantic convention in instrumentation library is needed. ======= ======= ======= +======= +## [1.7.0] 2022-10-28 + +* [METRICS SDK] Validate Instrument meta data (name, unit, description) [#1713](https://github.com/open-telemetry/opentelemetry-cpp/pull/1713) +* [DOCS] Document libthrift 0.12.0 doesn't work with Jaeger exporter [#1714](https://github.com/open-telemetry/opentelemetry-cpp/pull/1714) +* [Metrics SDK] Add Monotonic Property to Sum Aggregation, and +unit tests for Up Down Counter [#1675](https://github.com/open-telemetry/opentelemetry-cpp/pull/1675) +* [Metrics SDK] Move Metrics Exemplar processing behind feature flag [#1710](https://github.com/open-telemetry/opentelemetry-cpp/pull/1710) +* [Metrics API/SDK] Change Meter API/SDK to return nostd::unique_ptr + for Sync Instruments [#1707](https://github.com/open-telemetry/opentelemetry-cpp/pull/1707) +which includes breaking change in the Metrics api and sdk. +* [BUILD] Add e2e test to asan & tsan CI [#1670](https://github.com/open-telemetry/opentelemetry-cpp/pull/1670) +* [BUILD] Add otlp-grpc example bazel [#1708](https://github.com/open-telemetry/opentelemetry-cpp/pull/1708) +* [TRACE SDK] Fix debug log of OTLP HTTP exporter and ES log exporter [#1703](https://github.com/open-telemetry/opentelemetry-cpp/pull/1703) +* [METRICS SDK] Fix a potential precision loss on integer in +ReservoirCellIndexFor [#1696](https://github.com/open-telemetry/opentelemetry-cpp/pull/1696) +* [METRICS SDK] Fix Histogram crash [#1685](https://github.com/open-telemetry/opentelemetry-cpp/pull/1685) +* [METRICS SDK] Fix:1676 Segfault when short export period is used for metrics [#1682](https://github.com/open-telemetry/opentelemetry-cpp/pull/1682) +* [METRICS SDK] Add timeout support to MeterContext::ForceFlush [#1673](https://github.com/open-telemetry/opentelemetry-cpp/pull/1673) +* [DOCS] - Minor updates to OStream Metrics exporter documentation [#1679](https://github.com/open-telemetry/opentelemetry-cpp/pull/1679) +* [DOCS] Fix:#1575 API Documentation for Metrics SDK and API [#1678](https://github.com/open-telemetry/opentelemetry-cpp/pull/1678) +* [BUILD] Fixed compiler warnings [#1677](https://github.com/open-telemetry/opentelemetry-cpp/pull/1677) +* [METRICS SDK] Fix threading issue between Meter::RegisterSyncMetricStorage + and Meter::Collect [#1666](https://github.com/open-telemetry/opentelemetry-cpp/pull/1666) +* [METRICS SDK] Fix data race on MeterContext::meters_ [#1668](https://github.com/open-telemetry/opentelemetry-cpp/pull/1668) +* [METRICS SDK] Fix observable Gauge metrics generation [#1651](https://github.com/open-telemetry/opentelemetry-cpp/pull/1651) +* [BUILD] Detect ARCH=sparc in CMake [#1660](https://github.com/open-telemetry/opentelemetry-cpp/pull/1660) +* [SDK] Add user agent for OTLP http/grpc client [#1657](https://github.com/open-telemetry/opentelemetry-cpp/pull/1657) +* [BUILD] Fix clang and gcc warnings [#1658](https://github.com/open-telemetry/opentelemetry-cpp/pull/1658) +* [Metrics SDK] Add Metrics ExemplarFilter and ExemplarReservoir [#1584](https://github.com/open-telemetry/opentelemetry-cpp/pull/1584) +* [LOGS SDK] Rename OnReceive to OnEmit [#1652](https://github.com/open-telemetry/opentelemetry-cpp/pull/1652) +* [METRICS SDK] Fix Observable Gauge does not reflect updated values, +and send the old value always [#1641](https://github.com/open-telemetry/opentelemetry-cpp/pull/1641) +* [Metrics SDK] Change boundary type to double for Explicit Bucket Histogram Aggregation, +and change default bucket range [#1626](https://github.com/open-telemetry/opentelemetry-cpp/pull/1626) +* [METRICS SDK] Fix occasional Segfault with LongCounter instrument [#1638](https://github.com/open-telemetry/opentelemetry-cpp/pull/1638) +* [BUILD] Bump vcpk to 2022.08.15 [#1633](https://github.com/open-telemetry/opentelemetry-cpp/pull/1633) +* [BUILD] Bump gRPC to v1.48.1 for CMake Linux CI [#1608](https://github.com/open-telemetry/opentelemetry-cpp/pull/1608) +>>>>>>> 9acde87b (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) * [Metrics] Switch to explicit 64 bit integers [#1686](https://github.com/open-telemetry/opentelemetry-cpp/pull/1686) which includes breaking change in the Metrics api and sdk. >>>>>>> 7fd76eec ([Metrics] Switch to explicit 64 bit integers (#1686)) @@ -316,7 +358,17 @@ update the semantic convention in instrumentation library is needed. * [BUILD] Add CMake OTELCPP_MAINTAINER_MODE [#1650](https://github.com/open-telemetry/opentelemetry-cpp/pull/1650) * [SEMANTIC CONVENTIONS] Upgrade to version 1.14.0 [#1697](https://github.com/open-telemetry/opentelemetry-cpp/pull/1697) +<<<<<<< HEAD >>>>>>> fa5f9fc1 (Add CMake OTELCPP_MAINTAINER_MODE (#1650)) +======= +Notes: + +Metrics API/SDK GA release includes PRs [#1686](https://github.com/open-telemetry/opentelemetry-cpp/pull/1686), +[#1701](https://github.com/open-telemetry/opentelemetry-cpp/pull/1701), and +[#1707](https://github.com/open-telemetry/opentelemetry-cpp/pull/1707) +with breaking changes in the Metrics API and SDK. + +>>>>>>> 9acde87b (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) ## [1.6.1] 2022-09-22 >>>>>>> 5c180a16 (Prepare v1.6.1 release (#1630)) diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index 228fc68452..a54f549988 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #define OPENTELEMETRY_VERSION "1.8.1" ======= #define OPENTELEMETRY_VERSION "1.5.0" @@ -19,6 +20,9 @@ ======= #define OPENTELEMETRY_VERSION "1.6.1" >>>>>>> 92618117 (Prepare v1.6.1 release (#1630)) +======= +#define OPENTELEMETRY_VERSION "1.7.0" +>>>>>>> 399daf57 (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO) // clang-format off diff --git a/docs/public/conf.py b/docs/public/conf.py index f1641dff7d..9158663fee 100644 --- a/docs/public/conf.py +++ b/docs/public/conf.py @@ -24,6 +24,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD release = "1.8.1" ======= release = "1.5.0" @@ -34,6 +35,9 @@ ======= release = "1.6.1" >>>>>>> 92618117 (Prepare v1.6.1 release (#1630)) +======= +release = "1.7.0" +>>>>>>> 399daf57 (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) # Run sphinx on subprojects and copy output # ----------------------------------------- diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index 7168a570d7..e0516c9181 100644 --- a/sdk/include/opentelemetry/sdk/version/version.h +++ b/sdk/include/opentelemetry/sdk/version/version.h @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #define OPENTELEMETRY_SDK_VERSION "1.8.1" ======= #define OPENTELEMETRY_SDK_VERSION "1.5.0" @@ -18,6 +19,9 @@ ======= #define OPENTELEMETRY_SDK_VERSION "1.6.1" >>>>>>> 92618117 (Prepare v1.6.1 release (#1630)) +======= +#define OPENTELEMETRY_SDK_VERSION "1.7.0" +>>>>>>> 399daf57 (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) #include "opentelemetry/version.h" diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 05ae4064b2..1d7f79a702 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -11,6 +11,7 @@ namespace version const int MAJOR_VERSION = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD const int MINOR_VERSION = 8; const int PATCH_VERSION = 1; const char *PRE_RELEASE = "NONE"; @@ -52,6 +53,19 @@ const char *BUILD_DATE = "Tue Aug 16 00:35:48 UTC 2022"; "1.6.0-NONE-NONE-27-pre_release_1.6.1-38012fab34faa50d5020959b68eba77ac485b508"; const char *BUILD_DATE = "Thu Sep 22 18:05:21 UTC 2022"; >>>>>>> 92618117 (Prepare v1.6.1 release (#1630)) +======= +const int MINOR_VERSION = 7; +const int PATCH_VERSION = 0; +const char *PRE_RELEASE = "NONE"; +const char *BUILD_METADATA = "NONE"; +const int COUNT_NEW_COMMITS = 35; +const char *BRANCH = "pre_release_1.7.0"; +const char *COMMIT_HASH = "dd7e257b6de71eeaf9e3149530962301705b9a0d"; +const char *SHORT_VERSION = "1.7.0"; +const char *FULL_VERSION = + "1.7.0-NONE-NONE-35-pre_release_1.7.0-dd7e257b6de71eeaf9e3149530962301705b9a0d"; +const char *BUILD_DATE = "Fri 28 Oct 2022 06:22:43 PM UTC"; +>>>>>>> 399daf57 (Prepare v1.7.0 release with Metrics API/SDK GA. (#1721)) } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE