Skip to content

Commit d7ab5af

Browse files
marcalffmarcalff
authored
Merge branch 'main' into fix/reader_data_race
2 parents 32e470d + 830651a commit d7ab5af

File tree

8 files changed

+88
-23
lines changed

8 files changed

+88
-23
lines changed

‎CHANGELOG.md

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,77 @@ Increment the:
1515

1616
## [Unreleased]
1717

18-
* [EXPORTER] Add OTLP File exporters
19-
[#2540](https://github.com/open-telemetry/opentelemetry-cpp/pull/2540)
18+
## [1.15.0] 2024-04-21
19+
20+
* [EXPORTER] Change OTLP HTTP content_type default to binary
21+
[#2564](https://github.com/open-telemetry/opentelemetry-cpp/pull/2564)
22+
* [DOC] Fix OTLP documentation: Default endpoint is wrong for OTLP/HTTP
23+
[#2560](https://github.com/open-telemetry/opentelemetry-cpp/pull/2560)
24+
* [BUILD] Fix old style cast warning
25+
[#2567](https://github.com/open-telemetry/opentelemetry-cpp/pull/2567)
2026
* [EXPORTER] Gzip compression support for OTLP/HTTP and OTLP/gRPC exporter
2127
[#2530](https://github.com/open-telemetry/opentelemetry-cpp/pull/2530)
28+
* [BUILD] update vcpkg submodule to 2024.02.14
29+
[#2575](https://github.com/open-telemetry/opentelemetry-cpp/pull/2575)
30+
* [SDK] Support for OTEL_SERVICE_NAME
31+
[#2577](https://github.com/open-telemetry/opentelemetry-cpp/pull/2577)
2232
* [EXPORTER] Support URL-encoded values for `OTEL_EXPORTER_OTLP_HEADERS`
2333
[#2579](https://github.com/open-telemetry/opentelemetry-cpp/pull/2579)
34+
* [BUILD] CMake cleanup for message()
35+
[#2582](https://github.com/open-telemetry/opentelemetry-cpp/pull/2582)
36+
* [BUILD] Bump CMake minimum required version to 3.9
37+
[#2581](https://github.com/open-telemetry/opentelemetry-cpp/pull/2581)
38+
* [BUILD] Provide LIKELY / UNLIKELY macros
39+
[#2580](https://github.com/open-telemetry/opentelemetry-cpp/pull/2580)
40+
* [EXPORTER] OTLP: Fix missing ResourceMetrics SchemaURL
41+
[#2587](https://github.com/open-telemetry/opentelemetry-cpp/pull/2587)
42+
* [ETW] cleanup include path
43+
[#2594](https://github.com/open-telemetry/opentelemetry-cpp/pull/2594)
44+
* Upgrade to googletest 1.14.0
45+
[#2596](https://github.com/open-telemetry/opentelemetry-cpp/pull/2596)
46+
* Upgrade to nlohmann_json 3.11.3
47+
[#2595](https://github.com/open-telemetry/opentelemetry-cpp/pull/2595)
48+
* [BAZEL] Move -std=c++14 to .bazelrc
49+
[#2600](https://github.com/open-telemetry/opentelemetry-cpp/pull/2600)
50+
* [BAZEL] Fix -std=c++14 warning on Windows
51+
[#2601](https://github.com/open-telemetry/opentelemetry-cpp/pull/2601)
52+
* Upgrade to benchmark 1.8.3
53+
[#2597](https://github.com/open-telemetry/opentelemetry-cpp/pull/2597)
54+
* Upgrade to prometheus 1.2.4
55+
[#2598](https://github.com/open-telemetry/opentelemetry-cpp/pull/2598)
56+
* [DOC] Fix typo: Asynchronouse -> Asynchronous in meter.h
57+
[#2604](https://github.com/open-telemetry/opentelemetry-cpp/pull/2604)
58+
* [BUILD] Do not link prometheus-cpp::util when it doesn't exist
59+
[#2606](https://github.com/open-telemetry/opentelemetry-cpp/pull/2606)
60+
* [SDK] Remove unused variable
61+
[#2609](https://github.com/open-telemetry/opentelemetry-cpp/pull/2609)
62+
* [METRICS SDK] Remove extra OfferMeasurement call
63+
in SyncMetricsStorage::OfferMeasurement
64+
[#2610](https://github.com/open-telemetry/opentelemetry-cpp/pull/2610)
65+
* [MISC] Use set -e on all shell scripts and pass shellcheck --severity=error
66+
[#2616](https://github.com/open-telemetry/opentelemetry-cpp/pull/2616)
67+
* [CI] Add shellcheck --severity=error as a CI step
68+
[#2618](https://github.com/open-telemetry/opentelemetry-cpp/pull/2618)
69+
* [CI] Upgrade to abseil 20240116.1 (CMake only)
70+
[#2599](https://github.com/open-telemetry/opentelemetry-cpp/pull/2599)
71+
* [CI] Benchmark, provide units with --benchmark_min_time
72+
[#2621](https://github.com/open-telemetry/opentelemetry-cpp/pull/2621)
73+
* [EXPORTER] OTLP file exporter
74+
[#2540](https://github.com/open-telemetry/opentelemetry-cpp/pull/2540)
2475
* [CI] Use platform CMake
2576
[#2627](https://github.com/open-telemetry/opentelemetry-cpp/pull/2627)
26-
* [PROTO] Upgrade to opentelemetry-proto v1.2.0
77+
* [PROTO] Upgrade to opentelemetry-proto 1.2.0
2778
[#2631](https://github.com/open-telemetry/opentelemetry-cpp/pull/2631)
2879
* [SDK] DefaultLogHandler to print errors to std::cerr, add LogLevel::None
2980
[#2622](https://github.com/open-telemetry/opentelemetry-cpp/pull/2622)
81+
* [SEMANTIC CONVENTIONS] Upgrade to semantic convention 1.25.0
82+
[#2633](https://github.com/open-telemetry/opentelemetry-cpp/pull/2633)
83+
* [DOC] Add readme and examples for OTLP FILE exporters.
84+
[#2638](https://github.com/open-telemetry/opentelemetry-cpp/pull/2638)
85+
* [SEMANTIC CONVENTIONS] Rework on semantic conventions 1.25.0
86+
[#2640](https://github.com/open-telemetry/opentelemetry-cpp/pull/2640)
87+
* [DOC] Update INSTALL.md
88+
[#2592](https://github.com/open-telemetry/opentelemetry-cpp/pull/2592)
3089

3190
Important changes:
3291

‎api/include/opentelemetry/version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
# define OPENTELEMETRY_ABI_VERSION_NO 1
1111
#endif
1212

13-
#define OPENTELEMETRY_VERSION "1.14.2"
13+
#define OPENTELEMETRY_VERSION "1.15.0"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 14
16-
#define OPENTELEMETRY_VERSION_PATCH 2
15+
#define OPENTELEMETRY_VERSION_MINOR 15
16+
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
1919

‎bazel/repository.bzl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,20 @@ def opentelemetry_cpp_deps():
5858
#
5959
# Important note:
6060
#
61-
# The bazel build still uses abseil-cpp-20220623.1 here.
61+
# The bazel build uses abseil-cpp-20230802.2 here,
62+
# while CMake uses more recent versions.
6263
#
63-
# Upgrading to abseil-cpp-20240116.1 breaks the OTLP build, reason unknown.
64+
# bazel with abseil-cpp-20240116.2 : build failures in CI
65+
# bazel with abseil-cpp-20240116.1 : build failures in CI
66+
#
67+
# TODO: Fix issue #2619
6468
#
6569
http_archive,
6670
name = "com_google_absl",
67-
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
68-
strip_prefix = "abseil-cpp-20220623.1",
71+
sha256 = "7c11539617af1f332f0854a6fb21e296a1b29c27d03f23c7b49d4adefcd102cc",
72+
strip_prefix = "abseil-cpp-20230802.2",
6973
urls = [
70-
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
74+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.2.tar.gz",
7175
],
7276
)
7377

‎docs/public/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
author = 'OpenTelemetry authors'
2525

2626
# The full version, including alpha/beta/rc tags
27-
release = "1.14.2"
27+
release = "1.15.0"
2828

2929
# Run sphinx on subprojects and copy output
3030
# -----------------------------------------

‎exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "opentelemetry/common/key_value_iterable_view.h"
88

99
#include <opentelemetry/nostd/span.h>
10+
#include <opentelemetry/nostd/type_traits.h>
1011
#include <map>
1112
#include <string>
1213
#include <vector>
@@ -106,7 +107,7 @@ class PropertyValue : public PropertyVariant
106107
* @param vec Vector of integral type primitives to convert to span.
107108
* @return Span of integral type primitives.
108109
*/
109-
template <typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
110+
template <typename T, nostd::enable_if_t<std::is_integral<T>::value, bool> = true>
110111
static nostd::span<const T> to_span(const std::vector<T> &vec)
111112
{
112113
nostd::span<const T> result(vec.data(), vec.size());
@@ -119,7 +120,7 @@ class PropertyValue : public PropertyVariant
119120
* @param vec Vector of float type primitives to convert to span.
120121
* @return Span of float type primitives.
121122
*/
122-
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
123+
template <typename T, nostd::enable_if_t<std::is_floating_point<T>::value, bool> = true>
123124
static nostd::span<const T> to_span(const std::vector<T> &vec)
124125
{
125126
nostd::span<const T> result(vec.data(), vec.size());
@@ -139,7 +140,7 @@ class PropertyValue : public PropertyVariant
139140
* @param v
140141
* @return
141142
*/
142-
template <typename TInteger, std::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
143+
template <typename TInteger, nostd::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
143144
PropertyValue(TInteger number) : PropertyVariant(number)
144145
{}
145146

@@ -148,7 +149,7 @@ class PropertyValue : public PropertyVariant
148149
* @param v
149150
* @return
150151
*/
151-
template <typename TFloat, std::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
152+
template <typename TFloat, nostd::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
152153
PropertyValue(TFloat number) : PropertyVariant(double(number))
153154
{}
154155

‎sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "opentelemetry/common/key_value_iterable_view.h"
1010
#include "opentelemetry/nostd/string_view.h"
11+
#include "opentelemetry/nostd/type_traits.h"
1112
#include "opentelemetry/nostd/unique_ptr.h"
1213
#include "opentelemetry/nostd/variant.h"
1314
#include "opentelemetry/sdk/common/attribute_utils.h"
@@ -73,7 +74,7 @@ class InstrumentationScope
7374
*/
7475
template <
7576
class ArgumentType,
76-
std::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
77+
nostd::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
7778
* = nullptr>
7879
static nostd::unique_ptr<InstrumentationScope> Create(nostd::string_view name,
7980
nostd::string_view version,

‎sdk/include/opentelemetry/sdk/version/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "opentelemetry/detail/preprocessor.h"
77

8-
#define OPENTELEMETRY_SDK_VERSION "1.14.2"
8+
#define OPENTELEMETRY_SDK_VERSION "1.15.0"
99

1010
#include "opentelemetry/version.h"
1111

‎sdk/src/version/version.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ namespace sdk
1212
namespace version
1313
{
1414
const int major_version = 1;
15-
const int minor_version = 14;
16-
const int patch_version = 2;
15+
const int minor_version = 15;
16+
const int patch_version = 0;
1717
const char *pre_release = "NONE";
1818
const char *build_metadata = "NONE";
19-
const char *short_version = "1.14.2";
20-
const char *full_version = "1.14.2-NONE-NONE";
21-
const char *build_date = "Tue Feb 27 18:25:51 UTC 2024";
19+
const char *short_version = "1.15.0";
20+
const char *full_version = "1.15.0-NONE-NONE";
21+
const char *build_date = "Sun Apr 21 19:31:02 UTC 2024";
2222
} // namespace version
2323
} // namespace sdk
2424
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)