Skip to content

Commit 2b5e8ce

Browse files
committed
[CHORE] One CHANGELOG entry, and drop a comment about another PR
Two CHANGELOG bullets pointed at this PR and said the same thing twice. The first names what the exporter now decides success from, so the second goes. The fixture comment described how this file and #4331 would be reconciled. That is coordination between PRs, not something a reader of this file needs. Signed-off-by: thc1006 <84045975+thc1006@users.noreply.github.com>
1 parent 45a0b89 commit 2b5e8ce

2 files changed

Lines changed: 0 additions & 6 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@ Increment the:
168168
errors flag, and one acknowledgement per record that names its target index
169169
and says the operation applied
170170
[#4297](https://github.com/open-telemetry/opentelemetry-cpp/pull/4297)
171-
* [BUG] Stop reading an Elasticsearch bulk response that only says the request
172-
was accepted as a batch that was written
173-
[#4297](https://github.com/open-telemetry/opentelemetry-cpp/pull/4297)
174171

175172
* [BUG] Make SocketAddr string parsing safe and reject malformed addresses
176173
[#4292](https://github.com/open-telemetry/opentelemetry-cpp/pull/4292)

‎exporters/elasticsearch/test/es_log_record_exporter_test.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,6 @@ TEST(ElasticsearchBulkResponseTests, RejectsAnItemErrorUnderErrorsFalse)
432432
// that the status and the body actually reach it. A fake HTTP client drives the
433433
// callbacks from inside SendRequest(), which runs before Export() reaches the
434434
// wait, and the assertions are on the ExportResult.
435-
//
436-
// This fixture is the same one #4331 adds to this file. Whichever lands first,
437-
// the other drops the duplicate when it rebases.
438435
// ---------------------------------------------------------------------------
439436
namespace
440437
{

0 commit comments

Comments
 (0)