Skip to content

Commit 04082ca

Browse files
marcalffmarcalff
authored
Merge branch 'main' into fix_iwyu_cleanup_5
2 parents f050ca4 + 8d45dec commit 04082ca

File tree

6 files changed

+136
-13
lines changed

6 files changed

+136
-13
lines changed

‎CHANGELOG.md

Lines changed: 127 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,140 @@ Increment the:
1515

1616
## [Unreleased]
1717

18-
* [API] Comply with W3C Trace Context
19-
[#3115](https://github.com/open-telemetry/opentelemetry-cpp/pull/3115)
18+
## [1.18 2024-11-25]
19+
20+
* [EXPORTER] Fix crash in ElasticsearchLogRecordExporter
21+
[#3082](https://github.com/open-telemetry/opentelemetry-cpp/pull/3082)
22+
23+
* [BUILD] Avoid buggy warning with gcc <= 8
24+
[#3087](https://github.com/open-telemetry/opentelemetry-cpp/pull/3087)
2025

2126
* [API] Jaeger Propagator should not be deprecated
2227
[#3086](https://github.com/open-telemetry/opentelemetry-cpp/pull/3086)
2328

24-
* Upgrade to prometheus 1.3.0
29+
* Update bzlmod version
30+
[#3093](https://github.com/open-telemetry/opentelemetry-cpp/pull/3093)
31+
32+
* [BUILD] Remove std::make_unique
33+
[#3098](https://github.com/open-telemetry/opentelemetry-cpp/pull/3098)
34+
35+
* [BUILD] Fix compiling problems for gcc 4.8
36+
[#3100](https://github.com/open-telemetry/opentelemetry-cpp/pull/3100)
37+
38+
* [TEST] Fix linking order and gmock linking
39+
[#3106](https://github.com/open-telemetry/opentelemetry-cpp/pull/3106)
40+
41+
* [EXPORTER] Add config options to prometheus exporter
42+
[#3104](https://github.com/open-telemetry/opentelemetry-cpp/pull/3104)
43+
44+
* [BUILD] Add a CMake option to disable shared libs
45+
[#3095](https://github.com/open-telemetry/opentelemetry-cpp/pull/3095)
46+
47+
* [EXPORTER] Remove out of date ETW exporter doc
48+
[#3103](https://github.com/open-telemetry/opentelemetry-cpp/pull/3103)
49+
50+
* [EXPORTER] Add logging for async gRPC errors
51+
[#3108](https://github.com/open-telemetry/opentelemetry-cpp/pull/3108)
52+
53+
* [BUILD] Remove aligned_storage from nostd
54+
[#3112](https://github.com/open-telemetry/opentelemetry-cpp/pull/3112)
55+
56+
* [EXPORTER] Elastic Search exporter follow ECS guidelines
57+
[#3107](https://github.com/open-telemetry/opentelemetry-cpp/pull/3107)
58+
59+
* [INSTALL] Resolve dependencies in opentelemetry-cpp-config.cmake
60+
[#3094](https://github.com/open-telemetry/opentelemetry-cpp/pull/3094)
61+
62+
* [API] Add synchronous gauge
63+
[#3029](https://github.com/open-telemetry/opentelemetry-cpp/pull/3029)
64+
65+
* [BUILD] allow building with -DWITH_OTLP_HTTP_COMPRESSION=OFF without zlib
66+
[#3120](https://github.com/open-telemetry/opentelemetry-cpp/pull/3120)
67+
68+
* [CI] Comment the arm64 CI
69+
[#3125](https://github.com/open-telemetry/opentelemetry-cpp/pull/3125)
70+
71+
* [API] Comply with W3C Trace Context
72+
[#3115](https://github.com/open-telemetry/opentelemetry-cpp/pull/3115)
73+
74+
* [EXPORTER] bump prometheus to v1.3.0
2575
[#3122](https://github.com/open-telemetry/opentelemetry-cpp/pull/3122)
2676

77+
* [EXPORTER] Log SSL Connection Information
78+
[#3113](https://github.com/open-telemetry/opentelemetry-cpp/pull/3113)
79+
80+
* [BUILD] Improve how to handle yield() in ARM
81+
[#3129](https://github.com/open-telemetry/opentelemetry-cpp/pull/3129)
82+
83+
* [BUILD] Fix -Wmissing-template-arg-list-after-template-kw warning
84+
[#3133](https://github.com/open-telemetry/opentelemetry-cpp/pull/3133)
85+
86+
* [EXPORTER]: Elasticsearch exporter put log resource in root instead of under 'resources'
87+
[#3131](https://github.com/open-telemetry/opentelemetry-cpp/pull/3131)
88+
89+
* [TEST] Rename w3c_tracecontext_test to w3c_tracecontext_http_test_server
90+
[#3132](https://github.com/open-telemetry/opentelemetry-cpp/pull/3132)
91+
92+
* [BUILD] Patches for building on AIX
93+
[#3127](https://github.com/open-telemetry/opentelemetry-cpp/pull/3127)
94+
2795
* [SEMANTIC CONVENTIONS] Migration to weaver
2896
[#3105](https://github.com/open-telemetry/opentelemetry-cpp/pull/3105)
2997

30-
* [EXPORTER] Allow to share gRPC clients between OTLP exporters.
98+
* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.28.0
99+
[#3139](https://github.com/open-telemetry/opentelemetry-cpp/pull/3139)
100+
101+
* [EXPORTER] handling of invalid ports in UrlParser
102+
[#3142](https://github.com/open-telemetry/opentelemetry-cpp/pull/3142)
103+
104+
* [CI] speed up clang-tidy workflow
105+
[#3148](https://github.com/open-telemetry/opentelemetry-cpp/pull/3148)
106+
107+
* [EXPORTER] Allow to share gRPC clients between OTLP exporters
31108
[#3041](https://github.com/open-telemetry/opentelemetry-cpp/pull/3041)
32109

110+
* Bump codecov/codecov-action from 4 to 5
111+
[#3143](https://github.com/open-telemetry/opentelemetry-cpp/pull/3143)
112+
113+
* [CI] Add cppcheck in the build
114+
[#3151](https://github.com/open-telemetry/opentelemetry-cpp/pull/3151)
115+
116+
* [BUILD] Fix error message
117+
[#3152](https://github.com/open-telemetry/opentelemetry-cpp/pull/3152)
118+
119+
* [EXPORTER] fix clang-tidy warnings in UrlParser
120+
[#3146](https://github.com/open-telemetry/opentelemetry-cpp/pull/3146)
121+
122+
* [EXPORTER] Upgrade to opentelemetry-proto 1.4.0
123+
[#3157](https://github.com/open-telemetry/opentelemetry-cpp/pull/3157)
124+
125+
* [TEST] refactor UrlParser tests to use value-paramterized tests
126+
[#3153](https://github.com/open-telemetry/opentelemetry-cpp/pull/3153)
127+
128+
* [TEST] add a test for ElasticSearchRecordable
129+
[#3154](https://github.com/open-telemetry/opentelemetry-cpp/pull/3154)
130+
131+
* [BUILD] Fix missing dependency on protoc compiler
132+
[#3159](https://github.com/open-telemetry/opentelemetry-cpp/pull/3159)
133+
134+
* [bazel] Update prometheus-cpp in MODULE.bazel
135+
[#3162](https://github.com/open-telemetry/opentelemetry-cpp/pull/3162)
136+
137+
* [bazel] Enable --incompatible_disallow_empty_glob
138+
[#2642](https://github.com/open-telemetry/opentelemetry-cpp/pull/2642)
139+
140+
* [INSTALL] Fix cmake/opentelemetry-cpp-config.cmake.in
141+
[#3165](https://github.com/open-telemetry/opentelemetry-cpp/pull/3165)
142+
143+
* [BUILD] Do not set OTELCPP_PROTO_PATH in the CMake cache
144+
[#3160](https://github.com/open-telemetry/opentelemetry-cpp/pull/3160)
145+
146+
* [BUILD] Fix build for esp32
147+
[#3155](https://github.com/open-telemetry/opentelemetry-cpp/pull/3155)
148+
149+
* [bazel] Update opentelemetry-proto in MODULE.bazel
150+
[#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)
151+
33152
Important changes:
34153

35154
* [API] Jaeger Propagator should not be deprecated
@@ -54,6 +173,10 @@ Important changes:
54173
for each `xxx` semantic attribute group.
55174
* See file DEPRECATED.md for details.
56175

176+
Deprecations:
177+
178+
* This release contains deprecations, see file DEPRECATED.md for details.
179+
57180
## [1.17 2024-10-07]
58181

59182
* [CI] Add a clang-tidy build

‎api/include/opentelemetry/version.h

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

13-
#define OPENTELEMETRY_VERSION "1.17.0"
13+
#define OPENTELEMETRY_VERSION "1.18.0"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 17
15+
#define OPENTELEMETRY_VERSION_MINOR 18
1616
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)

‎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.17.0"
27+
release = "1.18.0"
2828

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

‎exporters/prometheus/src/exporter_options.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ inline bool GetPrometheusWithoutOtelScope()
3333
auto exists =
3434
opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutOtelScope, setting);
3535

36-
return exists ? setting : true;
36+
return exists ? setting : false;
3737
}
3838

3939
inline bool GetPrometheusPopulateTargetInfo()

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

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

44
#pragma once
55

6-
#define OPENTELEMETRY_SDK_VERSION "1.17.0"
6+
#define OPENTELEMETRY_SDK_VERSION "1.18.0"
77

88
#include "opentelemetry/version.h"
99

‎sdk/src/version/version.cc

Lines changed: 4 additions & 4 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 = 17;
15+
const int minor_version = 18;
1616
const int patch_version = 0;
1717
const char *pre_release = "NONE";
1818
const char *build_metadata = "NONE";
19-
const char *short_version = "1.17.0";
20-
const char *full_version = "1.17.0-NONE-NONE";
21-
const char *build_date = "Mon Oct 7 08:55:12 PM UTC 2024";
19+
const char *short_version = "1.18.0";
20+
const char *full_version = "1.18.0-NONE-NONE";
21+
const char *build_date = "Mon Nov 25 08:46:03 PM UTC 2024";
2222
} // namespace version
2323
} // namespace sdk
2424
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)