Skip to content

Commit e1e6627

Browse files
owentowent
authored
Merge branch 'main' into allow_construct_grpc_exporters_with_existed_grpc_client
2 parents 949c679 + fa0a520 commit e1e6627

File tree

7 files changed

+121
-18
lines changed

7 files changed

+121
-18
lines changed

‎CHANGELOG.md‎

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,107 @@ Increment the:
1515

1616
## [Unreleased]
1717

18+
* [EXPORTER] Allow to share gRPC clients between OTLP exporters.
19+
[#3041](https://github.com/open-telemetry/opentelemetry-cpp/pull/3041)
20+
21+
## [1.17 2024-10-07]
22+
1823
* [CI] Add a clang-tidy build
1924
[#3001](https://github.com/open-telemetry/opentelemetry-cpp/pull/3001)
2025

26+
* [BUILD] Upgrade to opentelemetry-proto 1.3.2
27+
[#2991](https://github.com/open-telemetry/opentelemetry-cpp/pull/2991)
28+
2129
* [REMOVAL] Remove build option `WITH_DEPRECATED_SDK_FACTORY`
2230
[#2717](https://github.com/open-telemetry/opentelemetry-cpp/pull/2717)
2331

24-
* [EXPORTER] Allow to share gRPC clients between OTLP exporters.
25-
[#3041](https://github.com/open-telemetry/opentelemetry-cpp/pull/3041)
32+
* [EXPORTER] ForceFlush before canceling the running requests on shutdown
33+
[#2727](https://github.com/open-telemetry/opentelemetry-cpp/pull/2727)
34+
35+
* [SDK] Fix crash in PeriodicExportingMetricReader
36+
[#2983](https://github.com/open-telemetry/opentelemetry-cpp/pull/2983)
37+
38+
* [SDK] Fix memory leak in TlsRandomNumberGenerator() constructor
39+
[#2661](https://github.com/open-telemetry/opentelemetry-cpp/pull/2661)
40+
41+
* [EXPORTER] Ignore exception when create thread in OTLP file exporter
42+
[#3012](https://github.com/open-telemetry/opentelemetry-cpp/pull/3012)
43+
44+
* [BUILD] Update the version in MODULE.bazel
45+
[#3015](https://github.com/open-telemetry/opentelemetry-cpp/pull/3015)
46+
47+
* [BUILD] Fix build without vcpkg on Windows when gRPC is disabled
48+
[#3016](https://github.com/open-telemetry/opentelemetry-cpp/pull/3016)
49+
50+
* [BUILD] Add abi_version_no bazel flag
51+
[#3020](https://github.com/open-telemetry/opentelemetry-cpp/pull/3020)
52+
53+
* [Code health] Expand iwyu coverage to include unit tests
54+
[#3022](https://github.com/open-telemetry/opentelemetry-cpp/pull/3022)
55+
56+
* [BUILD] Version opentelemetry_proto/proto_grpc shared libraries
57+
[#2992](https://github.com/open-telemetry/opentelemetry-cpp/pull/2992)
58+
59+
* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.27.0
60+
[#3023](https://github.com/open-telemetry/opentelemetry-cpp/pull/3023)
61+
62+
* [SDK] Support empty histogram buckets
63+
[#3027](https://github.com/open-telemetry/opentelemetry-cpp/pull/3027)
64+
65+
* [TEST] Fix sync problems in OTLP File exporter tests
66+
[#3031](https://github.com/open-telemetry/opentelemetry-cpp/pull/3031)
67+
68+
* [SDK] PeriodicExportingMetricReader: future is never set, blocks until timeout
69+
[#3030](https://github.com/open-telemetry/opentelemetry-cpp/pull/3030)
70+
71+
* [Code Health] Clang Tidy cleanup, Part 2
72+
[#3038](https://github.com/open-telemetry/opentelemetry-cpp/pull/3038)
73+
74+
* [Code Health] include-what-you-use cleanup, part 3
75+
[#3004](https://github.com/open-telemetry/opentelemetry-cpp/pull/3004)
76+
77+
* [SDK] Fix overflow in timeout logic
78+
[#3046](https://github.com/open-telemetry/opentelemetry-cpp/pull/3046)
79+
80+
* [TEST] Add missing tests to Bazel build
81+
[#3045](https://github.com/open-telemetry/opentelemetry-cpp/pull/3045)
82+
83+
* [TEST] update collector tests with debug exporter
84+
[#3050](https://github.com/open-telemetry/opentelemetry-cpp/pull/3050)
85+
86+
* [EXAMPLE] update collector example with debug exporter
87+
[#3049](https://github.com/open-telemetry/opentelemetry-cpp/pull/3049)
88+
89+
* [TEST] update references to logging exporter
90+
[#3053](https://github.com/open-telemetry/opentelemetry-cpp/pull/3053)
91+
92+
* [EXAMPLE] Clean the tracer initialization in OStream example
93+
[#3051](https://github.com/open-telemetry/opentelemetry-cpp/pull/3051)
94+
95+
* [EXPORTER] Fix the format of SpanLink for ETW
96+
[#3054](https://github.com/open-telemetry/opentelemetry-cpp/pull/3054)
2697

2798
* [EXPORTER] Add in-memory metric exporter
2899
[#3043](https://github.com/open-telemetry/opentelemetry-cpp/pull/3043)
29100

101+
* [Code Health] include-what-you-use cleanup, part 4
102+
[#3040](https://github.com/open-telemetry/opentelemetry-cpp/pull/3040)
103+
104+
* [BUILD] add loongarch info
105+
[#3052](https://github.com/open-telemetry/opentelemetry-cpp/pull/3052)
106+
107+
* [CI] Update otel-collector version
108+
[#3067](https://github.com/open-telemetry/opentelemetry-cpp/pull/3067)
109+
110+
* [SDK] Update MetricProducer interface to match spec
111+
[#3044](https://github.com/open-telemetry/opentelemetry-cpp/pull/3044)
112+
113+
* [EXPORTER] Fix URL in ES exporter, fix ipv6 supporting for http client
114+
[#3081](https://github.com/open-telemetry/opentelemetry-cpp/pull/3081)
115+
116+
* [EXPORTER] Add HttpHeaders in ElasticsearchLogRecordExporter
117+
[#3083](https://github.com/open-telemetry/opentelemetry-cpp/pull/3083)
118+
30119
Breaking changes:
31120

32121
* [REMOVAL] Remove build option `WITH_DEPRECATED_SDK_FACTORY`

‎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.16.1"
13+
#define OPENTELEMETRY_VERSION "1.17.0"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 16
16-
#define OPENTELEMETRY_VERSION_PATCH 1
15+
#define OPENTELEMETRY_VERSION_MINOR 17
16+
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
1919

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

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

‎exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace logs
2626
*/
2727
struct ElasticsearchExporterOptions
2828
{
29+
using HttpHeaders = std::multimap<std::string, std::string>;
30+
2931
// Configuration options to establish Elasticsearch connection
3032
std::string host_;
3133
int port_;
@@ -37,6 +39,9 @@ struct ElasticsearchExporterOptions
3739
// Whether to print the status of the exporter in the console
3840
bool console_debug_;
3941

42+
/** Additional HTTP headers. */
43+
HttpHeaders http_headers_;
44+
4045
/**
4146
* Constructor for the ElasticsearchExporterOptions. By default, the endpoint is
4247
* localhost:9200/logs with a timeout of 30 seconds and disabled console debugging
@@ -47,16 +52,18 @@ struct ElasticsearchExporterOptions
4752
* from elasticsearch
4853
* @param console_debug If true, print the status of the exporter methods in the console
4954
*/
50-
ElasticsearchExporterOptions(std::string host = "localhost",
51-
int port = 9200,
52-
std::string index = "logs",
53-
int response_timeout = 30,
54-
bool console_debug = false)
55+
ElasticsearchExporterOptions(std::string host = "localhost",
56+
int port = 9200,
57+
std::string index = "logs",
58+
int response_timeout = 30,
59+
bool console_debug = false,
60+
HttpHeaders http_headers = {})
5561
: host_{host},
5662
port_{port},
5763
index_{index},
5864
response_timeout_{response_timeout},
59-
console_debug_{console_debug}
65+
console_debug_{console_debug},
66+
http_headers_{http_headers}
6067
{}
6168
};
6269

‎exporters/elasticsearch/src/es_log_record_exporter.cc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,13 @@ sdk::common::ExportResult ElasticsearchLogRecordExporter::Export(
330330
request->SetUri(options_.index_ + "/_bulk?pretty");
331331
request->SetMethod(http_client::Method::Post);
332332
request->AddHeader("Content-Type", "application/json");
333+
334+
// Add options headers
335+
for (auto it = options_.http_headers_.cbegin(); it != options_.http_headers_.cend(); ++it)
336+
{
337+
request->AddHeader(it->first, it->second);
338+
}
339+
333340
request->SetTimeoutMs(std::chrono::milliseconds(1000 * options_.response_timeout_));
334341

335342
// Create the request body

‎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.16.1"
6+
#define OPENTELEMETRY_SDK_VERSION "1.17.0"
77

88
#include "opentelemetry/version.h"
99

‎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 = 16;
16-
const int patch_version = 1;
15+
const int minor_version = 17;
16+
const int patch_version = 0;
1717
const char *pre_release = "NONE";
1818
const char *build_metadata = "NONE";
19-
const char *short_version = "1.16.1";
20-
const char *full_version = "1.16.1-NONE-NONE";
21-
const char *build_date = "Wed Jul 17 17:34:38 UTC 2024";
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";
2222
} // namespace version
2323
} // namespace sdk
2424
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)