Skip to content

Commit cfd1cc6

Browse files
authored
Merge branch 'main' into cmake_find_or_fetch_protobuf_and_grpc
2 parents 72172a1 + c406864 commit cfd1cc6

31 files changed

+1416
-10
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ Increment the:
1818
* [TEST] Shared otel-cpp libs linked to latest static protobuf and grpc
1919
[#3544](https://github.com/open-telemetry/opentelemetry-cpp/pull/3544)
2020

21+
* [SDK] Implement env var configuration for PeriodicExportingMetricReader
22+
[#3549](https://github.com/open-telemetry/opentelemetry-cpp/pull/3549)
23+
24+
* [SDK] Update default exemplar reservoir size for exponential histograms
25+
[#3551](https://github.com/open-telemetry/opentelemetry-cpp/pull/3551)
26+
2127
## [1.22 2025-07-11]
2228

2329
* [DOC] Udpate link to membership document
@@ -1407,7 +1413,7 @@ Important changes:
14071413
* [ETW EXPORTER] Remove namespace using in ETW exporter which affects global
14081414
namespace
14091415
[#2531](https://github.com/open-telemetry/opentelemetry-cpp/pull/2531)
1410-
* [BUILD] Don't invoke vcpkg from this repo with CMAKE_TOOLCHAIN_FILE set
1416+
* [BUILD] Don't invoke vcpkg from this repo with CMAKE_TOOLCHAIN_FILE set
14111417
[#2527](https://github.com/open-telemetry/opentelemetry-cpp/pull/2527)
14121418
* [EXPORTER] Async exporting for otlp grpc
14131419
[#2407](https://github.com/open-telemetry/opentelemetry-cpp/pull/2407)

ext/src/dll/input.src

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ForceFlush@LoggerProvider@logs@sdk@v1@opentelemetry
1616
OStreamLogRecordExporter@logs@exporter@v1@opentelemetry
1717
Create@OStreamMetricExporterFactory@metrics@exporter@v1@opentelemetry
1818
Create@PeriodicExportingMetricReaderFactory@metrics@sdk@v1@opentelemetry
19+
PeriodicExportingMetricReaderOptions@metrics@sdk@v1@opentelemetry
1920
Create@MeterProviderFactory@metrics@sdk@v1@opentelemetry
2021
Create@MeterContextFactory@metrics@sdk@v1@opentelemetry
2122
Create@ViewFactory@metrics@sdk@v1@opentelemetry
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/console_log_record_exporter_configuration.h"
9+
#include "opentelemetry/sdk/logs/exporter.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ConsoleLogRecordExporterBuilder
19+
{
20+
public:
21+
ConsoleLogRecordExporterBuilder() = default;
22+
ConsoleLogRecordExporterBuilder(ConsoleLogRecordExporterBuilder &&) = default;
23+
ConsoleLogRecordExporterBuilder(const ConsoleLogRecordExporterBuilder &) = default;
24+
ConsoleLogRecordExporterBuilder &operator=(ConsoleLogRecordExporterBuilder &&) = default;
25+
ConsoleLogRecordExporterBuilder &operator=(const ConsoleLogRecordExporterBuilder &other) =
26+
default;
27+
virtual ~ConsoleLogRecordExporterBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Build(
30+
const opentelemetry::sdk::configuration::ConsoleLogRecordExporterConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h"
9+
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ConsolePushMetricExporterBuilder
19+
{
20+
public:
21+
ConsolePushMetricExporterBuilder() = default;
22+
ConsolePushMetricExporterBuilder(ConsolePushMetricExporterBuilder &&) = default;
23+
ConsolePushMetricExporterBuilder(const ConsolePushMetricExporterBuilder &) = default;
24+
ConsolePushMetricExporterBuilder &operator=(ConsolePushMetricExporterBuilder &&) = default;
25+
ConsolePushMetricExporterBuilder &operator=(const ConsolePushMetricExporterBuilder &other) =
26+
default;
27+
virtual ~ConsolePushMetricExporterBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Build(
30+
const opentelemetry::sdk::configuration::ConsolePushMetricExporterConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/console_span_exporter_configuration.h"
9+
#include "opentelemetry/sdk/trace/exporter.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ConsoleSpanExporterBuilder
19+
{
20+
public:
21+
ConsoleSpanExporterBuilder() = default;
22+
ConsoleSpanExporterBuilder(ConsoleSpanExporterBuilder &&) = default;
23+
ConsoleSpanExporterBuilder(const ConsoleSpanExporterBuilder &) = default;
24+
ConsoleSpanExporterBuilder &operator=(ConsoleSpanExporterBuilder &&) = default;
25+
ConsoleSpanExporterBuilder &operator=(const ConsoleSpanExporterBuilder &other) = default;
26+
virtual ~ConsoleSpanExporterBuilder() = default;
27+
28+
virtual std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(
29+
const opentelemetry::sdk::configuration::ConsoleSpanExporterConfiguration *model) const = 0;
30+
};
31+
32+
} // namespace configuration
33+
} // namespace sdk
34+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h"
9+
#include "opentelemetry/sdk/logs/exporter.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ExtensionLogRecordExporterBuilder
19+
{
20+
public:
21+
ExtensionLogRecordExporterBuilder() = default;
22+
ExtensionLogRecordExporterBuilder(ExtensionLogRecordExporterBuilder &&) = default;
23+
ExtensionLogRecordExporterBuilder(const ExtensionLogRecordExporterBuilder &) = default;
24+
ExtensionLogRecordExporterBuilder &operator=(ExtensionLogRecordExporterBuilder &&) = default;
25+
ExtensionLogRecordExporterBuilder &operator=(const ExtensionLogRecordExporterBuilder &other) =
26+
default;
27+
virtual ~ExtensionLogRecordExporterBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Build(
30+
const opentelemetry::sdk::configuration::ExtensionLogRecordExporterConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/extension_log_record_processor_configuration.h"
9+
#include "opentelemetry/sdk/logs/processor.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ExtensionLogRecordProcessorBuilder
19+
{
20+
public:
21+
ExtensionLogRecordProcessorBuilder() = default;
22+
ExtensionLogRecordProcessorBuilder(ExtensionLogRecordProcessorBuilder &&) = default;
23+
ExtensionLogRecordProcessorBuilder(const ExtensionLogRecordProcessorBuilder &) = default;
24+
ExtensionLogRecordProcessorBuilder &operator=(ExtensionLogRecordProcessorBuilder &&) = default;
25+
ExtensionLogRecordProcessorBuilder &operator=(const ExtensionLogRecordProcessorBuilder &other) =
26+
default;
27+
virtual ~ExtensionLogRecordProcessorBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor> Build(
30+
const opentelemetry::sdk::configuration::ExtensionLogRecordProcessorConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h"
9+
#include "opentelemetry/sdk/metrics/metric_reader.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ExtensionPullMetricExporterBuilder
19+
{
20+
public:
21+
ExtensionPullMetricExporterBuilder() = default;
22+
ExtensionPullMetricExporterBuilder(ExtensionPullMetricExporterBuilder &&) = default;
23+
ExtensionPullMetricExporterBuilder(const ExtensionPullMetricExporterBuilder &) = default;
24+
ExtensionPullMetricExporterBuilder &operator=(ExtensionPullMetricExporterBuilder &&) = default;
25+
ExtensionPullMetricExporterBuilder &operator=(const ExtensionPullMetricExporterBuilder &other) =
26+
default;
27+
virtual ~ExtensionPullMetricExporterBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> Build(
30+
const opentelemetry::sdk::configuration::ExtensionPullMetricExporterConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h"
9+
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ExtensionPushMetricExporterBuilder
19+
{
20+
public:
21+
ExtensionPushMetricExporterBuilder() = default;
22+
ExtensionPushMetricExporterBuilder(ExtensionPushMetricExporterBuilder &&) = default;
23+
ExtensionPushMetricExporterBuilder(const ExtensionPushMetricExporterBuilder &) = default;
24+
ExtensionPushMetricExporterBuilder &operator=(ExtensionPushMetricExporterBuilder &&) = default;
25+
ExtensionPushMetricExporterBuilder &operator=(const ExtensionPushMetricExporterBuilder &other) =
26+
default;
27+
virtual ~ExtensionPushMetricExporterBuilder() = default;
28+
29+
virtual std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Build(
30+
const opentelemetry::sdk::configuration::ExtensionPushMetricExporterConfiguration *model)
31+
const = 0;
32+
};
33+
34+
} // namespace configuration
35+
} // namespace sdk
36+
OPENTELEMETRY_END_NAMESPACE
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include <memory>
7+
8+
#include "opentelemetry/sdk/configuration/extension_sampler_configuration.h"
9+
#include "opentelemetry/sdk/trace/sampler.h"
10+
#include "opentelemetry/version.h"
11+
12+
OPENTELEMETRY_BEGIN_NAMESPACE
13+
namespace sdk
14+
{
15+
namespace configuration
16+
{
17+
18+
class ExtensionSamplerBuilder
19+
{
20+
public:
21+
ExtensionSamplerBuilder() = default;
22+
ExtensionSamplerBuilder(ExtensionSamplerBuilder &&) = default;
23+
ExtensionSamplerBuilder(const ExtensionSamplerBuilder &) = default;
24+
ExtensionSamplerBuilder &operator=(ExtensionSamplerBuilder &&) = default;
25+
ExtensionSamplerBuilder &operator=(const ExtensionSamplerBuilder &other) = default;
26+
virtual ~ExtensionSamplerBuilder() = default;
27+
28+
virtual std::unique_ptr<opentelemetry::sdk::trace::Sampler> Build(
29+
const opentelemetry::sdk::configuration::ExtensionSamplerConfiguration *model) const = 0;
30+
};
31+
32+
} // namespace configuration
33+
} // namespace sdk
34+
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)