From 288682734f6c9c347e418dcd1e60513069e3bbdf Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Mon, 9 Feb 2026 11:45:47 +0100
Subject: [PATCH 1/2] deps: update opentelemetry-cpp to 1.25.0

---
 deps/opentelemetry-cpp/.bazelrc               |    6 +-
 deps/opentelemetry-cpp/.bazelversion          |    2 +-
 deps/opentelemetry-cpp/.bcr/README.md         |   58 +
 .../.bcr/metadata.template.json               |   22 +
 deps/opentelemetry-cpp/.bcr/presubmit.yml     |   14 +
 .../.bcr/source.template.json                 |    5 +
 deps/opentelemetry-cpp/.clang-tidy            |    3 +-
 deps/opentelemetry-cpp/.clomonitor.yml        |    6 +
 .../.devcontainer/Dockerfile.dev              |   11 +-
 deps/opentelemetry-cpp/.gitignore             |    4 +
 deps/opentelemetry-cpp/.iwyu.imp              |   12 +
 deps/opentelemetry-cpp/.markdownlint.json     |    4 +
 deps/opentelemetry-cpp/MODULE.bazel           |    7 +-
 deps/opentelemetry-cpp/api/BUILD              |    1 +
 .../include/opentelemetry/baggage/baggage.h   |    9 +-
 .../opentelemetry/context/runtime_context.h   |   43 +-
 .../include/opentelemetry/logs/event_logger.h |   19 +
 .../logs/event_logger_provider.h              |   19 +
 .../api/include/opentelemetry/logs/noop.h     |   40 +-
 .../api/include/opentelemetry/logs/provider.h |   27 +-
 .../api/include/opentelemetry/metrics/meter.h |   31 +
 .../metrics/multi_observer_result.h           |   57 +
 .../api/include/opentelemetry/metrics/noop.h  |   12 +
 .../internal/absl/types/internal/variant.h    |    2 +-
 .../include/opentelemetry/nostd/shared_ptr.h  |    8 +
 .../include/opentelemetry/nostd/string_view.h |    2 +-
 .../api/include/opentelemetry/nostd/variant.h |    2 +-
 .../plugin/detail/dynamic_load_windows.h      |    4 +-
 .../opentelemetry/semconv/db_attributes.h     |   11 +-
 .../opentelemetry/semconv/error_attributes.h  |    2 +-
 .../opentelemetry/semconv/http_attributes.h   |   48 +-
 .../semconv/incubating/app_attributes.h       |   18 +
 .../semconv/incubating/azure_attributes.h     |    4 +-
 .../semconv/incubating/cloud_attributes.h     |   35 +
 .../semconv/incubating/container_attributes.h |   11 +-
 .../semconv/incubating/container_metrics.h    |  193 ++
 .../semconv/incubating/db_attributes.h        |   24 +-
 .../semconv/incubating/dns_attributes.h       |    6 +-
 .../semconv/incubating/enduser_attributes.h   |    3 +-
 .../semconv/incubating/error_attributes.h     |    2 +-
 .../semconv/incubating/event_attributes.h     |    3 +-
 .../semconv/incubating/faas_attributes.h      |    6 +-
 .../semconv/incubating/gcp_attributes.h       |  156 +
 .../semconv/incubating/gen_ai_attributes.h    |   94 +-
 .../semconv/incubating/http_attributes.h      |   60 +-
 .../semconv/incubating/jsonrpc_attributes.h   |   40 +
 .../semconv/incubating/k8s_attributes.h       |  118 +-
 .../semconv/incubating/k8s_metrics.h          | 2683 ++++++++++++++---
 .../semconv/incubating/linux_attributes.h     |    7 +-
 .../semconv/incubating/mcp_attributes.h       |  182 ++
 .../semconv/incubating/mcp_metrics.h          |  129 +
 .../semconv/incubating/messaging_attributes.h |    4 +-
 .../semconv/incubating/nfs_attributes.h       |   35 +
 .../semconv/incubating/nfs_metrics.h          |  692 +++++
 .../semconv/incubating/onc_rpc_attributes.h   |   44 +
 .../semconv/incubating/openshift_attributes.h |   34 +
 .../semconv/incubating/openshift_metrics.h    | 1065 +++++++
 .../semconv/incubating/otel_attributes.h      |   10 +
 .../semconv/incubating/peer_attributes.h      |   11 +-
 .../semconv/incubating/pprof_attributes.h     |   78 +
 .../semconv/incubating/process_attributes.h   |   32 +-
 .../semconv/incubating/process_metrics.h      |  110 +-
 .../semconv/incubating/rpc_attributes.h       |  251 +-
 .../semconv/incubating/rpc_metrics.h          |  163 +-
 .../semconv/incubating/service_attributes.h   |   17 +-
 .../semconv/incubating/system_attributes.h    |   60 +-
 .../semconv/incubating/system_metrics.h       |  374 ++-
 .../semconv/incubating/thread_attributes.h    |   21 +
 .../incubating/user_agent_attributes.h        |    4 +-
 .../semconv/incubating/vcs_attributes.h       |    9 +-
 .../opentelemetry/semconv/schema_url.h        |    2 +-
 .../semconv/service_attributes.h              |    3 +-
 .../api/include/opentelemetry/trace/span_id.h |    4 +-
 .../include/opentelemetry/trace/trace_flags.h |    2 +-
 .../include/opentelemetry/trace/trace_id.h    |    4 +-
 .../api/include/opentelemetry/version.h       |    4 +-
 deps/opentelemetry-cpp/api/test/baggage/BUILD |    1 +
 .../api/test/baggage/baggage_test.cc          |    2 +
 .../api/test/baggage/propagation/BUILD        |    2 +-
 deps/opentelemetry-cpp/api/test/common/BUILD  |    1 +
 .../api/test/common/kv_properties_test.cc     |    8 +-
 deps/opentelemetry-cpp/api/test/context/BUILD |    2 +-
 .../api/test/context/propagation/BUILD        |    2 +-
 deps/opentelemetry-cpp/api/test/core/BUILD    |    2 +
 deps/opentelemetry-cpp/api/test/logs/BUILD    |    2 +-
 deps/opentelemetry-cpp/api/test/metrics/BUILD |    2 +-
 deps/opentelemetry-cpp/api/test/nostd/BUILD   |    2 +
 .../api/test/nostd/shared_ptr_test.cc         |   12 +-
 .../api/test/nostd/unique_ptr_test.cc         |    4 +-
 deps/opentelemetry-cpp/api/test/plugin/BUILD  |    2 +
 .../api/test/singleton/BUILD                  |    4 +
 deps/opentelemetry-cpp/api/test/trace/BUILD   |    1 +
 .../api/test/trace/propagation/BUILD          |    2 +-
 .../api/test/trace/propagation/detail/BUILD   |    2 +-
 .../exporters/elasticsearch/BUILD             |    3 +
 .../exporters/elasticsearch/CMakeLists.txt    |    9 +
 deps/opentelemetry-cpp/exporters/etw/BUILD    |    3 +
 .../exporters/etw/TraceLoggingDynamic.h       |  613 ++--
 .../opentelemetry/exporters/etw/etw_logger.h  |   51 +-
 .../exporters/etw/etw_properties.h            |    2 +-
 .../exporters/etw/etw_provider.h              |    8 +-
 .../exporters/etw/etw_random_id_generator.h   |    2 +-
 .../opentelemetry/exporters/etw/etw_tracer.h  |   21 +-
 .../opentelemetry/exporters/etw/utils.h       |    4 +-
 .../opentelemetry/exporters/etw/uuid.h        |    2 +-
 .../exporters/etw/test/etw_logger_test.cc     |  109 +
 .../exporters/etw/test/etw_provider_test.cc   |   32 +
 .../exporters/etw/test/etw_tracer_test.cc     |    9 +
 deps/opentelemetry-cpp/exporters/memory/BUILD |    3 +
 .../exporters/memory/CMakeLists.txt           |   13 +
 .../memory/in_memory_span_exporter.h          |    5 +-
 .../opentelemetry-cpp/exporters/ostream/BUILD |   51 +
 .../exporters/ostream/CMakeLists.txt          |  151 +-
 .../src/console_push_metric_builder.cc        |   31 +-
 deps/opentelemetry-cpp/exporters/otlp/BUILD   |  188 ++
 .../exporters/otlp/CMakeLists.txt             |  533 +++-
 .../otlp_http_metric_exporter_benchmark.cc    |  128 +
 .../exporters/otlp/otlp_builder_utils.h       |    4 +
 .../otlp/otlp_grpc_exporter_options.h         |    9 +
 .../otlp/otlp_http_exporter_options.h         |    8 +
 .../exporters/otlp/otlp_metric_utils.h        |    3 -
 .../exporters/otlp/otlp_recordable.h          |   20 +
 .../exporters/otlp/protobuf_include_prefix.h  |    1 +
 .../exporters/otlp/src/otlp_builder_utils.cc  |   40 +-
 .../exporters/otlp/src/otlp_environment.cc    |  118 +-
 .../exporters/otlp/src/otlp_file_client.cc    |    2 +-
 .../exporters/otlp/src/otlp_grpc_client.cc    |    6 +-
 .../exporters/otlp/src/otlp_grpc_exporter.cc  |    6 +-
 .../otlp/src/otlp_grpc_log_record_builder.cc  |   17 +-
 .../otlp/src/otlp_grpc_log_record_exporter.cc |    2 +-
 .../otlp/src/otlp_grpc_metric_exporter.cc     |    2 +-
 .../otlp/src/otlp_grpc_push_metric_builder.cc |   17 +-
 .../otlp/src/otlp_grpc_span_builder.cc        |   17 +-
 .../exporters/otlp/src/otlp_http_exporter.cc  |    5 +-
 .../otlp/src/otlp_http_log_record_builder.cc  |   16 +-
 .../otlp/src/otlp_http_push_metric_builder.cc |   16 +-
 .../otlp/src/otlp_http_span_builder.cc        |   16 +-
 .../exporters/otlp/src/otlp_metric_utils.cc   |   63 -
 .../exporters/otlp/src/otlp_recordable.cc     |   27 +
 .../otlp/test/otlp_http_exporter_test.cc      |   99 +-
 .../otlp_http_log_record_exporter_test.cc     |  101 +-
 .../test/otlp_http_metric_exporter_test.cc    |  131 +-
 .../otlp/test/otlp_recordable_test.cc         |   77 +
 .../exporters/prometheus/BUILD                |   18 +
 .../exporters/prometheus/CMakeLists.txt       |   53 +-
 .../prometheus/src/exporter_options.cc        |    8 +-
 .../prometheus/src/prometheus_pull_builder.cc |   36 +-
 deps/opentelemetry-cpp/exporters/zipkin/BUILD |    3 +
 .../exporters/zipkin/CMakeLists.txt           |   12 +
 .../exporters/zipkin/zipkin_builder.h         |   33 -
 .../exporters/zipkin/src/zipkin_builder.cc    |   41 -
 .../zipkin/test/zipkin_exporter_test.cc       |    6 +-
 deps/opentelemetry-cpp/ext/BUILD              |    2 +
 deps/opentelemetry-cpp/ext/CMakeLists.txt     |    2 +-
 .../ext/http/server/http_server.h             |    8 +-
 .../ext/http/server/socket_tools.h            |    4 +-
 .../ext/src/http/client/curl/BUILD            |    3 +
 .../src/http/client/curl/http_client_curl.cc  |    4 +-
 .../http/client/curl/http_operation_curl.cc   |   21 +-
 deps/opentelemetry-cpp/ext/test/http/BUILD    |    2 +
 .../ext/test/http/curl_http_test.cc           |    8 +-
 .../ext/test/http/url_parser_test.cc          |    4 +-
 .../w3c_tracecontext_http_test_server/BUILD   |    2 +
 .../w3c_tracecontext_http_test_server/main.cc |    8 +-
 deps/opentelemetry-cpp/sdk/BUILD              |    2 +
 deps/opentelemetry-cpp/sdk/CMakeLists.txt     |   20 +-
 .../sdk/common/attribute_utils.h              |   39 +-
 .../cardinality_limits_configuration.h        |   34 +
 .../sdk/configuration/configuration.h         |    5 +-
 .../sdk/configuration/configuration_parser.h  |  358 ++-
 .../sdk/configuration/configured_sdk.h        |    1 +
 ...nsole_push_metric_exporter_configuration.h |   10 +-
 .../distribution_configuration.h              |   27 +
 .../distribution_entry_configuration.h        |   27 +
 .../sdk/configuration/document_node.h         |   14 +
 .../sdk/configuration/exemplar_filter.h       |   27 +
 .../configuration/grpc_tls_configuration.h    |   30 +
 .../configuration/http_tls_configuration.h    |   29 +
 .../integer_attribute_value_configuration.h   |    4 +-
 .../configuration/invalid_schema_exception.h  |    9 +-
 .../meter_provider_configuration.h            |    5 +-
 ...p_grpc_log_record_exporter_configuration.h |    6 +-
 ..._grpc_push_metric_exporter_configuration.h |    6 +-
 .../otlp_grpc_span_exporter_configuration.h   |    6 +-
 ...p_http_log_record_exporter_configuration.h |    5 +-
 ..._http_push_metric_exporter_configuration.h |    5 +-
 .../otlp_http_span_exporter_configuration.h   |    5 +-
 .../periodic_metric_reader_configuration.h    |    4 +-
 ...theus_pull_metric_exporter_configuration.h |    8 +-
 .../pull_metric_reader_configuration.h        |    5 +-
 .../sdk/configuration/registry.h              |   12 -
 .../sdk/configuration/ryml_document.h         |    9 +-
 .../sdk/configuration/ryml_document_node.h    |   17 +-
 .../sdk/configuration/sdk_builder.h           |    7 +-
 .../sdk/configuration/severity_number.h       |   48 +
 .../span_exporter_configuration_visitor.h     |    2 -
 .../sdk/configuration/translation_strategy.h  |   28 +
 .../zipkin_span_exporter_builder.h            |   34 -
 .../zipkin_span_exporter_configuration.h      |   34 -
 .../logs/batch_log_record_processor_options.h |   56 +-
 .../metrics/aggregation/aggregation_config.h  |   20 +
 .../metrics/aggregation/default_aggregation.h |    2 -
 .../sdk/metrics/data/metric_data.h            |    3 +-
 .../sdk/metrics/data/point_data.h             |   14 -
 .../export/periodic_exporting_metric_reader.h |    1 -
 ..._exporting_metric_reader_runtime_options.h |    2 -
 .../opentelemetry/sdk/metrics/instruments.h   |    6 +-
 .../include/opentelemetry/sdk/metrics/meter.h |    8 +
 .../sdk/metrics/multi_observer_result.h       |   52 +
 .../sdk/metrics/state/attributes_hashmap.h    |    2 +-
 .../sdk/metrics/state/multi_metric_storage.h  |   18 +-
 .../sdk/metrics/state/observable_registry.h   |   34 +-
 .../sdk/metrics/view/view_registry.h          |   57 +
 .../sdk/trace/batch_span_processor_options.h  |   61 +-
 .../sdk/trace/multi_span_processor.h          |    6 +-
 .../opentelemetry/sdk/version/version.h       |    2 +-
 deps/opentelemetry-cpp/sdk/src/CMakeLists.txt |    4 +
 deps/opentelemetry-cpp/sdk/src/common/BUILD   |    2 +
 .../sdk/src/common/base64.cc                  |   21 +-
 .../sdk/src/common/disabled.cc                |    5 +-
 .../sdk/src/common/env_variables.cc           |    9 +-
 .../src/common/fast_random_number_generator.h |    2 +-
 .../sdk/src/common/platform/BUILD             |    2 +
 .../sdk/src/configuration/BUILD               |   17 +
 .../sdk/src/configuration/CMakeLists.txt      |   35 +
 .../src/configuration/configuration_parser.cc |  899 ++++--
 .../sdk/src/configuration/configured_sdk.cc   |    2 +
 .../sdk/src/configuration/document_node.cc    |   59 +-
 .../sdk/src/configuration/ryml_document.cc    |   44 +-
 .../src/configuration/ryml_document_node.cc   |   66 +-
 .../sdk/src/configuration/sdk_builder.cc      |  209 +-
 .../yaml_configuration_parser.cc              |   12 +-
 deps/opentelemetry-cpp/sdk/src/logs/BUILD     |    2 +
 .../sdk/src/logs/CMakeLists.txt               |    1 +
 .../src/logs/batch_log_record_processor.cc    |    2 +-
 .../batch_log_record_processor_options.cc     |   75 +
 deps/opentelemetry-cpp/sdk/src/metrics/BUILD  |    2 +
 .../sdk/src/metrics/CMakeLists.txt            |    1 +
 ...base2_exponential_histogram_aggregation.cc |    6 +-
 .../base2_exponential_histogram_indexer.cc    |    2 +-
 .../periodic_exporting_metric_reader.cc       |   20 +-
 .../sdk/src/metrics/meter.cc                  |   19 +
 .../sdk/src/metrics/multi_observer_result.cc  |  154 +
 .../src/metrics/state/observable_registry.cc  |  229 +-
 .../metrics/state/temporal_metric_storage.cc  |    8 +-
 deps/opentelemetry-cpp/sdk/src/resource/BUILD |    2 +
 deps/opentelemetry-cpp/sdk/src/trace/BUILD    |    2 +
 .../sdk/src/trace/CMakeLists.txt              |    1 +
 .../sdk/src/trace/batch_span_processor.cc     |    2 +-
 .../src/trace/batch_span_processor_options.cc |   75 +
 .../sdk/src/trace/samplers/trace_id_ratio.cc  |    3 +-
 .../opentelemetry-cpp/sdk/src/trace/tracer.cc |    4 +
 .../sdk/src/version/version.cc                |    8 +-
 .../opentelemetry-cpp/sdk/test/CMakeLists.txt |    4 +
 deps/opentelemetry-cpp/sdk/test/common/BUILD  |    2 +
 .../sdk/test/common/env_var_test.cc           |   10 +-
 .../sdk/test/configuration/BUILD              |  144 +
 .../sdk/test/configuration/CMakeLists.txt     |   20 +
 .../configuration/yaml_distribution_test.cc   |  107 +
 .../sdk/test/configuration/yaml_logs_test.cc  |   75 +-
 .../test/configuration/yaml_metrics_test.cc   |  206 +-
 .../configuration/yaml_propagator_test.cc     |   18 +-
 .../test/configuration/yaml_resource_test.cc  |   26 +-
 .../sdk/test/configuration/yaml_test.cc       |  152 +-
 .../sdk/test/configuration/yaml_trace_test.cc |  159 +-
 .../sdk/test/instrumentationscope/BUILD       |    2 +
 deps/opentelemetry-cpp/sdk/test/logs/BUILD    |    2 +
 .../logs/batch_log_record_processor_test.cc   |  121 +
 deps/opentelemetry-cpp/sdk/test/metrics/BUILD |    2 +
 .../sdk/test/metrics/CMakeLists.txt           |    7 +-
 .../sdk/test/metrics/aggregation_test.cc      |  156 +
 .../test/metrics/attributes_hashmap_test.cc   |    6 +-
 .../sdk/test/metrics/exemplar/BUILD           |    2 +
 .../test/metrics/meter_provider_sdk_test.cc   |    4 +-
 .../sdk/test/metrics/multi_observer_test.cc   |  216 ++
 .../sdk/test/metrics/sum_aggregation_test.cc  |    9 +-
 .../sdk/test/metrics/view_registry_test.cc    |   43 +
 .../opentelemetry-cpp/sdk/test/resource/BUILD |    2 +
 deps/opentelemetry-cpp/sdk/test/trace/BUILD   |    1 +
 .../test/trace/batch_span_processor_test.cc   |  137 +
 .../sdk/test/trace/tracer_test.cc             |   71 +
 .../proto/metrics/v1/metrics.proto            |   40 +
 .../profiles/v1development/profiles.proto     |  232 +-
 .../proto/resource/v1/resource.proto          |   10 +
 .../opentelemetry/proto/trace/v1/trace.proto  |   32 +-
 deps/opentelemetry-cpp/third_party_release    |   18 +-
 286 files changed, 13099 insertions(+), 2592 deletions(-)
 create mode 100644 deps/opentelemetry-cpp/.bcr/README.md
 create mode 100644 deps/opentelemetry-cpp/.bcr/metadata.template.json
 create mode 100644 deps/opentelemetry-cpp/.bcr/presubmit.yml
 create mode 100644 deps/opentelemetry-cpp/.bcr/source.template.json
 create mode 100644 deps/opentelemetry-cpp/.clomonitor.yml
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/metrics/multi_observer_result.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/jsonrpc_attributes.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_attributes.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_metrics.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_attributes.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_metrics.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/onc_rpc_attributes.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_attributes.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_metrics.h
 create mode 100644 deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/pprof_attributes.h
 create mode 100644 deps/opentelemetry-cpp/exporters/otlp/benchmark/otlp_http_metric_exporter_benchmark.cc
 delete mode 100644 deps/opentelemetry-cpp/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h
 delete mode 100644 deps/opentelemetry-cpp/exporters/zipkin/src/zipkin_builder.cc
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/cardinality_limits_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_entry_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/exemplar_filter.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/grpc_tls_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/http_tls_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/severity_number.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/translation_strategy.h
 delete mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h
 delete mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h
 create mode 100644 deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/multi_observer_result.h
 create mode 100644 deps/opentelemetry-cpp/sdk/src/configuration/BUILD
 create mode 100644 deps/opentelemetry-cpp/sdk/src/configuration/CMakeLists.txt
 create mode 100644 deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor_options.cc
 create mode 100644 deps/opentelemetry-cpp/sdk/src/metrics/multi_observer_result.cc
 create mode 100644 deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor_options.cc
 create mode 100644 deps/opentelemetry-cpp/sdk/test/configuration/BUILD
 create mode 100644 deps/opentelemetry-cpp/sdk/test/configuration/CMakeLists.txt
 create mode 100644 deps/opentelemetry-cpp/sdk/test/configuration/yaml_distribution_test.cc
 create mode 100644 deps/opentelemetry-cpp/sdk/test/metrics/multi_observer_test.cc

diff --git a/deps/opentelemetry-cpp/.bazelrc b/deps/opentelemetry-cpp/.bazelrc
index 57cd0a2fa0c..9b87c5283a8 100644
--- a/deps/opentelemetry-cpp/.bazelrc
+++ b/deps/opentelemetry-cpp/.bazelrc
@@ -17,9 +17,9 @@ build --copt -DGRPC_BAZEL_BUILD
 build:windows --dynamic_mode=off
 
 # Set minimum supported C++ version
-build:macos --host_cxxopt=-std=c++14 --cxxopt=-std=c++14
-build:linux --host_cxxopt=-std=c++14 --cxxopt=-std=c++14
-build:windows --host_cxxopt=/std:c++14 --cxxopt=/std:c++14
+build:macos --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
+build:linux --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
+build:windows --host_cxxopt=/std:c++17 --cxxopt=/std:c++17
 
 # --config=asan : Address Sanitizer.
 common:asan --copt -DADDRESS_SANITIZER
diff --git a/deps/opentelemetry-cpp/.bazelversion b/deps/opentelemetry-cpp/.bazelversion
index 21c8c7b46b8..6d2890793d4 100644
--- a/deps/opentelemetry-cpp/.bazelversion
+++ b/deps/opentelemetry-cpp/.bazelversion
@@ -1 +1 @@
-7.1.1
+8.5.0
diff --git a/deps/opentelemetry-cpp/.bcr/README.md b/deps/opentelemetry-cpp/.bcr/README.md
new file mode 100644
index 00000000000..3a67dfa7443
--- /dev/null
+++ b/deps/opentelemetry-cpp/.bcr/README.md
@@ -0,0 +1,58 @@
+# BCR Publishing Configuration
+
+This directory contains the template files required for publishing opentelemetry-cpp to the [Bazel Central Registry (BCR)](https://github.com/bazelbuild/bazel-central-registry).
+
+## Files
+
+### metadata.template.json
+Contains the module metadata including homepage, maintainers, and repository information. This is used to create/update the BCR metadata for the module.
+
+### source.template.json
+Defines the source archive location and format. Placeholders like `{OWNER}`, `{REPO}`, `{TAG}`, and `{VERSION}` are automatically replaced during publishing.
+
+### presubmit.yml
+Defines the BCR presubmit tests that run when a new version is published. Currently configured to test on:
+- Platforms: debian10, macos, ubuntu2004, windows
+- Bazel versions: 7.x, 8.x, 9.*
+
+## Publishing Process
+
+The publish-to-bcr workflow (`.github/workflows/publish-to-bcr.yml`) automates publishing to BCR.
+
+### Prerequisites
+
+**Create a Personal Access Token (PAT)**:
+   - Create a Classic PAT with `workflow` and `repo` permissions
+   - Add it as a secret named `BCR_PUBLISH_TOKEN` in repository settings
+
+### How to Publish
+
+The workflow can be triggered in two ways:
+
+1. **Automatically**: When a new GitHub release is published
+2. **Manually**: Via workflow dispatch in GitHub Actions UI
+   - Go to Actions → Publish to BCR → Run workflow
+   - Enter the tag name (e.g., `v1.24.0`)
+
+### What Happens
+
+When triggered, the workflow:
+1. Generates a BCR entry using these templates
+2. Pushes the entry to your BCR fork
+3. Opens a pull request against the upstream BCR
+
+### Using a Fork Registry
+
+For development and testing, you can use a fork of the Bazel Central Registry:
+
+1. Fork https://github.com/bazelbuild/bazel-central-registry
+2. Configure your fork URL in the workflow (modify the `publish-to-bcr.yml` file)
+3. Test changes in your fork before submitting to the official BCR
+
+The configuration in this repository points to the **official** Bazel Central Registry at https://github.com/bazelbuild/bazel-central-registry. However, using a fork registry is recommended for testing and development to avoid polluting the official registry during experimentation.
+
+## References
+
+- [Publish to BCR Action](https://github.com/bazel-contrib/publish-to-bcr)
+- [Bazel Central Registry](https://github.com/bazelbuild/bazel-central-registry)
+- [BCR Module: opentelemetry-cpp](https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-cpp)
diff --git a/deps/opentelemetry-cpp/.bcr/metadata.template.json b/deps/opentelemetry-cpp/.bcr/metadata.template.json
new file mode 100644
index 00000000000..4db3fb88171
--- /dev/null
+++ b/deps/opentelemetry-cpp/.bcr/metadata.template.json
@@ -0,0 +1,22 @@
+{
+  "homepage": "https://github.com/open-telemetry/opentelemetry-cpp",
+  "maintainers": [
+    {
+      "name": "Keith Smiley",
+      "email": "keithbsmiley@gmail.com",
+      "github": "keith",
+      "github_user_id": 283886
+    },
+    {
+      "name": "Marc Alff",
+      "email": "marc.alff@oracle.com",
+      "github": "marcalff",
+      "github_user_id": 17238896
+    }
+  ],
+  "repository": [
+    "github:open-telemetry/opentelemetry-cpp"
+  ],
+  "versions": [],
+  "yanked_versions": {}
+}
diff --git a/deps/opentelemetry-cpp/.bcr/presubmit.yml b/deps/opentelemetry-cpp/.bcr/presubmit.yml
new file mode 100644
index 00000000000..4bc27b5d144
--- /dev/null
+++ b/deps/opentelemetry-cpp/.bcr/presubmit.yml
@@ -0,0 +1,14 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+matrix:
+  platform: ["debian10", "macos", "ubuntu2004", "windows"]
+  bazel: ["7.x", "8.x", "9.x"]
+tasks:
+  verify_targets:
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_flags:
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
+    build_targets:
+    - '@opentelemetry-cpp//api'
diff --git a/deps/opentelemetry-cpp/.bcr/source.template.json b/deps/opentelemetry-cpp/.bcr/source.template.json
new file mode 100644
index 00000000000..94d3157d744
--- /dev/null
+++ b/deps/opentelemetry-cpp/.bcr/source.template.json
@@ -0,0 +1,5 @@
+{
+  "integrity": "",
+  "strip_prefix": "opentelemetry-cpp-{VERSION}",
+  "url": "https://github.com/{OWNER}/{REPO}/archive/refs/tags/{TAG}.tar.gz"
+}
diff --git a/deps/opentelemetry-cpp/.clang-tidy b/deps/opentelemetry-cpp/.clang-tidy
index db61b810c99..599a02fd88a 100644
--- a/deps/opentelemetry-cpp/.clang-tidy
+++ b/deps/opentelemetry-cpp/.clang-tidy
@@ -35,8 +35,7 @@ Checks: >
   -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-c-arrays,
   -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-non-private-member-variables-in-classes,
   -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-pro-*
\ No newline at end of file
+  -cppcoreguidelines-pro-*
diff --git a/deps/opentelemetry-cpp/.clomonitor.yml b/deps/opentelemetry-cpp/.clomonitor.yml
new file mode 100644
index 00000000000..6b06698eab8
--- /dev/null
+++ b/deps/opentelemetry-cpp/.clomonitor.yml
@@ -0,0 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+# see https://github.com/cncf/clomonitor/blob/main/docs/checks.md#exemptions
+exemptions:
+  - check: artifacthub_badge
+    reason: "Artifact Hub doesn't support c++ packages"
diff --git a/deps/opentelemetry-cpp/.devcontainer/Dockerfile.dev b/deps/opentelemetry-cpp/.devcontainer/Dockerfile.dev
index 60efed9723d..fec4e16c6a8 100644
--- a/deps/opentelemetry-cpp/.devcontainer/Dockerfile.dev
+++ b/deps/opentelemetry-cpp/.devcontainer/Dockerfile.dev
@@ -15,13 +15,18 @@ COPY ci /opt/ci
 
 RUN apt update && apt install -y wget \
     ninja-build \
-    llvm-dev \
-    libclang-dev \
-    clang-tidy \
+    llvm-20-dev \
+    libclang-20-dev \
+    clang-tidy-20 \
     shellcheck \
     sudo \
     cmake
 
+RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-20 200 && \
+    update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-20 200 && \
+    update-alternatives --config clang-tidy && \
+    update-alternatives --config llvm-config
+
 RUN cd /opt/ci && bash setup_ci_environment.sh
 RUN cd /opt/ci && bash install_iwyu.sh
 
diff --git a/deps/opentelemetry-cpp/.gitignore b/deps/opentelemetry-cpp/.gitignore
index cafefd636dd..e7bab0eb083 100644
--- a/deps/opentelemetry-cpp/.gitignore
+++ b/deps/opentelemetry-cpp/.gitignore
@@ -80,3 +80,7 @@ functional/cert/server_cert_b.csr
 functional/cert/server_cert_b.pem
 functional/cert/server_cert_b-key.pem
 functional/cert/unreadable.pem
+
+# CodeQL build artifacts
+_codeql_build_dir/
+_codeql_detected_source_root
diff --git a/deps/opentelemetry-cpp/.iwyu.imp b/deps/opentelemetry-cpp/.iwyu.imp
index 123e72f32da..e2ab0e3b4e6 100644
--- a/deps/opentelemetry-cpp/.iwyu.imp
+++ b/deps/opentelemetry-cpp/.iwyu.imp
@@ -11,6 +11,18 @@
   { "include": ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
   { "include": ["<bits/types/struct_FILE.h>", "private", "<stdio.h>", "public"] },
 
+  # Work around for ryml
+  { "include": ["<c4/std/string.hpp>", "private", "<ryml_std.hpp>", "public"] },
+
+  { "include": ["<c4/yml/common.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/yml/node.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/yml/parse.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/yml/parse_engine.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/yml/tree.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/yml/event_handler_tree.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/substr.hpp>", "private", "<ryml.hpp>", "public"] },
+  { "include": ["<c4/substr_fwd.hpp>", "private", "<ryml.hpp>", "public"] },
+
   # Local opentelemetry-cpp style
 
   # We prefer to include <gtest/gtest.h> for simplicity
diff --git a/deps/opentelemetry-cpp/.markdownlint.json b/deps/opentelemetry-cpp/.markdownlint.json
index 48c2ae2a3f6..9c27af34b88 100644
--- a/deps/opentelemetry-cpp/.markdownlint.json
+++ b/deps/opentelemetry-cpp/.markdownlint.json
@@ -4,5 +4,9 @@
     {
         "code_blocks": false,
         "tables": false
+    },
+    "MD059":
+    {
+        "prohibited_texts": []
     }
 }
diff --git a/deps/opentelemetry-cpp/MODULE.bazel b/deps/opentelemetry-cpp/MODULE.bazel
index d147305b137..9500ea5c271 100644
--- a/deps/opentelemetry-cpp/MODULE.bazel
+++ b/deps/opentelemetry-cpp/MODULE.bazel
@@ -3,7 +3,7 @@
 
 module(
     name = "opentelemetry-cpp",
-    version = "1.23.0",
+    version = "1.25.0",
     compatibility_level = 0,
     repo_name = "io_opentelemetry_cpp",
 )
@@ -13,11 +13,14 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "curl", version = "8.8.0")
 bazel_dep(name = "grpc", version = "1.66.0.bcr.2", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
-bazel_dep(name = "opentelemetry-proto", version = "1.7.0", repo_name = "com_github_opentelemetry_proto")
+bazel_dep(name = "opentelemetry-proto", version = "1.8.0", repo_name = "com_github_opentelemetry_proto")
 bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
 bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "rapidyaml", version = "0.9.0")
+bazel_dep(name = "rules_cc", version = "0.2.9")
+bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
 bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 
diff --git a/deps/opentelemetry-cpp/api/BUILD b/deps/opentelemetry-cpp/api/BUILD
index fb31393569c..bfd3af60147 100644
--- a/deps/opentelemetry-cpp/api/BUILD
+++ b/deps/opentelemetry-cpp/api/BUILD
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "int_flag", "string_flag")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/baggage/baggage.h b/deps/opentelemetry-cpp/api/include/opentelemetry/baggage/baggage.h
index 6c799cda278..e3e08ff225c 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/baggage/baggage.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/baggage/baggage.h
@@ -274,8 +274,13 @@ class OPENTELEMETRY_EXPORT Baggage
       {
         ret.push_back(' ');
       }
-      else if (std::isalnum(str[i]) || str[i] == '-' || str[i] == '_' || str[i] == '.' ||
-               str[i] == '~')
+      // See https://www.w3.org/TR/baggage/#definition
+      else if ((str[i] >= '!')      /* 21 */
+               && (str[i] <= '~')   /* 7E */
+               && (str[i] != '"')   /* 22 */
+               && (str[i] != ',')   /* 2C */
+               && (str[i] != ';')   /* 3B */
+               && (str[i] != '\\')) /* 5C */
       {
         ret.push_back(str[i]);
       }
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/context/runtime_context.h b/deps/opentelemetry-cpp/api/include/opentelemetry/context/runtime_context.h
index 606cd796908..0ef170571b5 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/context/runtime_context.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/context/runtime_context.h
@@ -26,11 +26,11 @@ class Token
 public:
   bool operator==(const Context &other) const noexcept { return context_ == other; }
 
-  ~Token() noexcept;
+  virtual ~Token() noexcept;
 
-private:
   friend class RuntimeContextStorage;
 
+protected:
   // A constructor that sets the token's Context object to the
   // one that was passed in.
   Token(const Context &context) : context_(context) {}
@@ -241,6 +241,26 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
   {
     friend class ThreadLocalContextStorage;
 
+    /**
+     * Limit the max stack depth.
+     * The stack will still work beyond this limit,
+     * counting push() and pop() properly,
+     * but will not record contexts.
+     *
+     * In practice, this should not affect instrumented applications,
+     * the limit is set to 1 million nested scopes.
+     *
+     * The whole reason for this limit to exist is to prevent
+     * compiler warnings like:
+     *   error: argument 1 value ‘18446744073709551615’
+     *   exceeds maximum object size 9223372036854775807
+     *   [-Werror=alloc-size-larger-than=]
+     * on this line of code:
+     *   Context *temp = new Context[new_capacity];
+     * when compiling with gcc and optimizations (-flto).
+     */
+    static constexpr size_t max_capacity_ = 1000000;
+
     Stack() noexcept : size_(0), capacity_(0), base_(nullptr) {}
 
     // Pops the top Context off the stack.
@@ -250,6 +270,11 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
       {
         return;
       }
+      if (size_ > max_capacity_)
+      {
+        size_ -= 1;
+        return;
+      }
       // Store empty Context before decrementing `size`, to ensure
       // the shared_ptr object (if stored in prev context object ) are released.
       // The stack is not resized, and the unused memory would be reutilised
@@ -278,6 +303,10 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
       {
         return Context();
       }
+      if (size_ > max_capacity_)
+      {
+        return Context();
+      }
       return base_[size_ - 1];
     }
 
@@ -286,6 +315,10 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
     void Push(const Context &context) noexcept
     {
       size_++;
+      if (size_ > max_capacity_)
+      {
+        return;
+      }
       if (size_ > capacity_)
       {
         Resize(size_ * 2);
@@ -299,8 +332,14 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
       size_t old_size = size_ - 1;
       if (new_capacity == 0)
       {
+        // First increase
         new_capacity = 2;
       }
+      if (new_capacity > max_capacity_)
+      {
+        // Last increase
+        new_capacity = max_capacity_;
+      }
       Context *temp = new Context[new_capacity];
       if (base_ != nullptr)
       {
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger.h b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger.h
index 929e97cc2c4..dbeffd2042e 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger.h
@@ -15,6 +15,17 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
 {
 #if OPENTELEMETRY_ABI_VERSION_NO < 2
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4996)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#  endif
+
 /**
  * Handles event log record creation.
  **/
@@ -77,6 +88,14 @@ class OPENTELEMETRY_DEPRECATED EventLogger
   void IgnoreTraitResult(ValueType &&...)
   {}
 };
+
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic pop
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic pop
+#  endif
 #endif
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger_provider.h b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger_provider.h
index 9eea0ca23bf..cb3b05dc727 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger_provider.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/event_logger_provider.h
@@ -15,6 +15,17 @@ class EventLogger;
 class Logger;
 
 #if OPENTELEMETRY_ABI_VERSION_NO < 2
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4996)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#  endif
+
 /**
  * Creates new EventLogger instances.
  */
@@ -32,6 +43,14 @@ class OPENTELEMETRY_DEPRECATED EventLoggerProvider
       nostd::shared_ptr<Logger> delegate_logger,
       nostd::string_view event_domain) noexcept = 0;
 };
+
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic pop
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic pop
+#  endif
 #endif
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/noop.h b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/noop.h
index 5e7654ae750..73bf1e57f9b 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/noop.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/noop.h
@@ -91,10 +91,22 @@ class NoopLoggerProvider final : public LoggerProvider
 };
 
 #if OPENTELEMETRY_ABI_VERSION_NO < 2
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4996)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#  endif
+
 class NoopEventLogger final : public EventLogger
 {
 public:
   NoopEventLogger() : logger_{nostd::shared_ptr<NoopLogger>(new NoopLogger())} {}
+  ~NoopEventLogger() override = default;
 
   const nostd::string_view GetName() noexcept override { return "noop event logger"; }
 
@@ -112,27 +124,9 @@ class NoopEventLogger final : public EventLogger
 class NoopEventLoggerProvider final : public EventLoggerProvider
 {
 public:
-#  if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4996)
-#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#  endif
-
   NoopEventLoggerProvider() : event_logger_{nostd::shared_ptr<EventLogger>(new NoopEventLogger())}
   {}
-
-#  if defined(_MSC_VER)
-#    pragma warning(pop)
-#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#    pragma GCC diagnostic pop
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic pop
-#  endif
+  ~NoopEventLoggerProvider() override = default;
 
   nostd::shared_ptr<EventLogger> CreateEventLogger(
       nostd::shared_ptr<Logger> /*delegate_logger*/,
@@ -144,6 +138,14 @@ class NoopEventLoggerProvider final : public EventLoggerProvider
 private:
   nostd::shared_ptr<EventLogger> event_logger_;
 };
+
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic pop
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic pop
+#  endif
 #endif
 
 }  // namespace logs
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/provider.h b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/provider.h
index 58f668e0419..83d2e765de5 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/logs/provider.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/logs/provider.h
@@ -48,6 +48,16 @@ class OPENTELEMETRY_EXPORT Provider
   }
 
 #if OPENTELEMETRY_ABI_VERSION_NO < 2
+#  if defined(_MSC_VER)
+#    pragma warning(push)
+#    pragma warning(disable : 4996)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#  endif
   /**
    * Returns the singleton EventLoggerProvider.
    *
@@ -70,6 +80,13 @@ class OPENTELEMETRY_EXPORT Provider
     std::lock_guard<common::SpinLockMutex> guard(GetLock());
     GetEventProvider() = tp;
   }
+#  if defined(_MSC_VER)
+#    pragma warning(pop)
+#  elif defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
+#    pragma GCC diagnostic pop
+#  elif defined(__clang__) || defined(__apple_build_version__)
+#    pragma clang diagnostic pop
+#  endif
 #endif
 
 private:
@@ -80,10 +97,6 @@ class OPENTELEMETRY_EXPORT Provider
   }
 
 #if OPENTELEMETRY_ABI_VERSION_NO < 2
-  OPENTELEMETRY_DEPRECATED
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
-  GetEventProvider() noexcept
-  {
 #  if defined(_MSC_VER)
 #    pragma warning(push)
 #    pragma warning(disable : 4996)
@@ -95,8 +108,13 @@ class OPENTELEMETRY_EXPORT Provider
 #    pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #  endif
 
+  OPENTELEMETRY_DEPRECATED
+  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
+  GetEventProvider() noexcept
+  {
     static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
     return provider;
+  }
 
 #  if defined(_MSC_VER)
 #    pragma warning(pop)
@@ -105,7 +123,6 @@ class OPENTELEMETRY_EXPORT Provider
 #  elif defined(__clang__) || defined(__apple_build_version__)
 #    pragma clang diagnostic pop
 #  endif
-  }
 #endif
 
   OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/meter.h b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/meter.h
index 59cfb878226..390bf006e65 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/meter.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/meter.h
@@ -3,7 +3,10 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/version.h"
@@ -25,6 +28,8 @@ template <typename T>
 class Gauge;
 
 class ObservableInstrument;
+class MultiObserverResult;
+using MultiObservableCallbackPtr = void (*)(MultiObserverResult &, void *);
 
 /**
  * Handles instrument creation and provides a facility for batch recording.
@@ -169,6 +174,32 @@ class Meter
       nostd::string_view name,
       nostd::string_view description = "",
       nostd::string_view unit        = "") noexcept = 0;
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+
+  /**
+   * Registers a callback to be invoked when metrics are collected by this meter. The callback will
+   * be passed a MultiObserverResult which it can use to make observations for any or all of the
+   * instruments provided in this registration. Any measurements recorded for instruments _not_ in
+   * the initial RegisterCallback call will be discarded.
+   *
+   * @param callback the callback to be invoked.
+   * @param state the state to be passed to the callback.
+   * @param instruments the instruments to be observed.
+   * @return a unique identifier for the registered callback, which can be used to unregister the
+   * callback in DeregisterCallback.
+   */
+  virtual uintptr_t RegisterCallback(MultiObservableCallbackPtr callback,
+                                     void *state,
+                                     nostd::span<ObservableInstrument *> instruments) noexcept = 0;
+
+  /**
+   * Unregisters a callback previously registered with RegisterCallback.
+   *
+   * @param callback_id the unique identifier returned by RegisterCallback.
+   */
+  virtual void DeregisterCallback(uintptr_t callback_id) noexcept = 0;
+#endif
 };
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/multi_observer_result.h b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/multi_observer_result.h
new file mode 100644
index 00000000000..e3c62562259
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/multi_observer_result.h
@@ -0,0 +1,57 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstdint>
+
+#include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace metrics
+{
+
+class MultiObserverResult
+{
+
+public:
+  virtual ~MultiObserverResult() = default;
+
+  /**
+   * Obtain an ObserverResultT<T> for the given instrument, that can be used to record
+   * a measurement on said instrument from a multi-observer callback registered with
+   * Meter::RegisterCallback. The instrument _must_ have been included in the original
+   * call to Meter::RegisterCallback; any data points set on other instruments will be
+   * discarded.
+   *
+   * @param instrument The instrument for which to obtain an ObserverResult.
+   * @return An ObserverResultT<T> for the given instrument.
+   */
+  template <typename T>
+  ObserverResultT<T> &ForInstrument(const ObservableInstrument *instrument) = delete;
+
+protected:
+  // You can't have a virtual template, and you can't overload on return type, so we need to
+  // enumerate the options for the observer result type as separate methods to override.
+  virtual ObserverResultT<double> &ForInstrumentDouble(const ObservableInstrument *instrument) = 0;
+  virtual ObserverResultT<int64_t> &ForInstrumentInt64(const ObservableInstrument *instrument) = 0;
+};
+
+template <>
+inline ObserverResultT<double> &MultiObserverResult::ForInstrument<double>(
+    const ObservableInstrument *instrument)
+{
+  return ForInstrumentDouble(instrument);
+}
+
+template <>
+inline ObserverResultT<int64_t> &MultiObserverResult::ForInstrument<int64_t>(
+    const ObservableInstrument *instrument)
+{
+  return ForInstrumentInt64(instrument);
+}
+
+}  // namespace metrics
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/noop.h b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/noop.h
index 1d508b93877..d472f47c0f1 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/noop.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/metrics/noop.h
@@ -229,6 +229,18 @@ class NoopMeter final : public Meter
     return nostd::shared_ptr<ObservableInstrument>(
         new NoopObservableInstrument(name, description, unit));
   }
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  uintptr_t RegisterCallback(
+      MultiObservableCallbackPtr /* callback */,
+      void * /* state */,
+      nostd::span<ObservableInstrument *> /* instruments */) noexcept override
+  {
+    return 0;
+  }
+
+  void DeregisterCallback(uintptr_t /* callback_id */) noexcept override {}
+#endif
 };
 
 /**
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
index 43e7285b234..4436b532d3d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
@@ -45,7 +45,7 @@ OTABSL_NAMESPACE_BEGIN
 template <class... Types>
 class variant;
 
-OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
+OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, static_cast<std::size_t>(-1));
 
 template <class T>
 struct variant_size;
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/shared_ptr.h b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/shared_ptr.h
index 681c4eb377b..88fb07ad3ff 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/shared_ptr.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/shared_ptr.h
@@ -119,6 +119,10 @@ class shared_ptr
 
   shared_ptr &operator=(shared_ptr &&other) noexcept
   {
+    if (this == &other)
+    {
+      return *this;
+    }
     wrapper().~shared_ptr_wrapper();
     other.wrapper().MoveTo(buffer_);
     return *this;
@@ -132,6 +136,10 @@ class shared_ptr
 
   shared_ptr &operator=(const shared_ptr &other) noexcept
   {
+    if (this == &other)
+    {
+      return *this;
+    }
     wrapper().~shared_ptr_wrapper();
     other.wrapper().CopyTo(buffer_);
     return *this;
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/string_view.h b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/string_view.h
index f0e5bd9e2ac..a0c80814735 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/string_view.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/string_view.h
@@ -124,7 +124,7 @@ class string_view
       auto found = Traits::find(data() + pos, length() - pos, ch);
       if (found)
       {
-        res = found - data();
+        res = static_cast<size_type>(found - data());
       }
     }
     return res;
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/variant.h b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/variant.h
index 4abac7766a5..d465f1ad412 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/variant.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/nostd/variant.h
@@ -27,7 +27,7 @@ namespace nostd
 class bad_variant_access : public std::exception
 {
 public:
-  virtual const char *what() const noexcept override { return "bad_variant_access"; }
+  const char *what() const noexcept override { return "bad_variant_access"; }
 };
 
 [[noreturn]] inline void throw_bad_variant_access()
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h b/deps/opentelemetry-cpp/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
index 5ed2833756b..7f4365e3c82 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
@@ -12,10 +12,10 @@
 #include "opentelemetry/plugin/hook.h"
 #include "opentelemetry/version.h"
 
-#include <Windows.h>
+#include <windows.h>
 
-#include <WinBase.h>
 #include <errhandlingapi.h>
+#include <winbase.h>
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace plugin
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/db_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/db_attributes.h
index fa77366619b..67abc8a669d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/db_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/db_attributes.h
@@ -84,7 +84,7 @@ static constexpr const char *kDbOperationName = "db.operation.name";
   Summary may be available to the instrumentation through
   instrumentation hooks or other means. If it is not available, instrumentations
   that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
+  <a href="/docs/db/database-spans.md#generating-a-summary-of-the-query">Generating query
   summary</a> section.
  */
 static constexpr const char *kDbQuerySummary = "db.query.summary";
@@ -92,11 +92,10 @@ static constexpr const char *kDbQuerySummary = "db.query.summary";
 /**
   The database query being executed.
   <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
+  For sanitization see <a href="/docs/db/database-spans.md#sanitization-of-dbquerytext">Sanitization
+  of @code db.query.text @endcode</a>. For batch operations, if the individual operations are known
+  to have the same query text then that query text SHOULD be used, otherwise all of the individual
+  query texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
   specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
   though parameterized query text can potentially have sensitive data, by using a parameterized
   query the user is giving a strong signal that any sensitive data will be passed as parameter
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/error_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/error_attributes.h
index e0ef3c925ed..427a515347a 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/error_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/error_attributes.h
@@ -35,7 +35,7 @@ namespace error
   additional filters are applied.
   <p>
   If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
+  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or RPC
   status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
   error.type @endcode to capture all errors, regardless of whether they are defined within the
   domain-specific set or not.</li>
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/http_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/http_attributes.h
index 85e5244b089..b815b5d6b8d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/http_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/http_attributes.h
@@ -43,19 +43,23 @@ static constexpr const char *kHttpRequestHeader = "http.request.header";
   <p>
   HTTP request method value SHOULD be "known" to the instrumentation.
   By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
+  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a>, the PATCH method
+  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a> and the QUERY method
+  defined in <a
+  href="https://datatracker.ietf.org/doc/draft-ietf-httpbis-safe-method-w-body/?include_text=1">httpbis-safe-method-w-body</a>.
+  <p>
+  If the HTTP request method is not known to instrumentation, it MUST set the @code
+  http.request.method @endcode attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation
+  could end up converting valid HTTP request methods to @code _OTHER @endcode, then it MUST provide
+  a way to override the list of known HTTP methods. If this override is done via environment
+  variable, then the environment variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and
+  support a comma-separated list of case-sensitive known HTTP methods (this list MUST be a full
+  override of the default known method, it is not a list of known methods in addition to the
+  defaults). <p> HTTP method names are case-sensitive and @code http.request.method @endcode
+  attribute value MUST match a known HTTP method name exactly. Instrumentations for specific web
+  frameworks that consider HTTP methods to be case insensitive, SHOULD populate a canonical
+  equivalent. Tracing instrumentations that do so, MUST also set @code http.request.method_original
+  @endcode to the original value.
  */
 static constexpr const char *kHttpRequestMethod = "http.request.method";
 
@@ -97,11 +101,19 @@ static constexpr const char *kHttpResponseHeader = "http.response.header";
 static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
 
 /**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
+  The matched route template for the request. This MUST be low-cardinality and include all static
+  path segments, with dynamic path segments represented with placeholders. <p> MUST NOT be populated
+  when this is not supported by the HTTP server framework as the route attribute should have
+  low-cardinality and the URI path can NOT substitute it. SHOULD include the <a
+  href="/docs/http/http-spans.md#http-server-definitions">application root</a> if there is one. <p>
+  A static path segment is a part of the route template with a fixed, low-cardinality value. This
+  includes literal strings like @code /users/ @endcode and placeholders that are constrained to a
+  finite, predefined set of values, e.g. @code {controller} @endcode or @code {action} @endcode. <p>
+  A dynamic path segment is a placeholder for a value that can have high cardinality and is not
+  constrained to a predefined list like static path segments. <p> Instrumentations SHOULD use
+  routing information provided by the corresponding web framework. They SHOULD pick the most precise
+  source of routing information and MAY support custom route formatting. Instrumentations SHOULD
+  document the format and the API used to obtain the route string.
  */
 static constexpr const char *kHttpRoute = "http.route";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/app_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/app_attributes.h
index b8477ee3bba..dae548ec115 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/app_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/app_attributes.h
@@ -80,6 +80,24 @@ static constexpr const char *kAppScreenCoordinateX = "app.screen.coordinate.x";
  */
 static constexpr const char *kAppScreenCoordinateY = "app.screen.coordinate.y";
 
+/**
+  An identifier that uniquely differentiates this screen from other screens in the same application.
+  <p>
+  A screen represents only the part of the device display drawn by the app. It typically contains
+  multiple widgets or UI components and is larger in scope than individual widgets. Multiple screens
+  can coexist on the same display simultaneously (e.g., split view on tablets).
+ */
+static constexpr const char *kAppScreenId = "app.screen.id";
+
+/**
+  The name of an application screen.
+  <p>
+  A screen represents only the part of the device display drawn by the app. It typically contains
+  multiple widgets or UI components and is larger in scope than individual widgets. Multiple screens
+  can coexist on the same display simultaneously (e.g., split view on tablets).
+ */
+static constexpr const char *kAppScreenName = "app.screen.name";
+
 /**
   An identifier that uniquely differentiates this widget from other widgets in the same application.
   <p>
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/azure_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/azure_attributes.h
index 1618050f9d9..b8fa13674f0 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/azure_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/azure_attributes.h
@@ -39,8 +39,8 @@ static constexpr const char *kAzureCosmosdbConsistencyLevel = "azure.cosmosdb.co
   List of regions contacted during operation in the order that they were contacted. If there is more
   than one region listed, it indicates that the operation was performed on multiple regions i.e.
   cross-regional call. <p> Region name matches the format of @code displayName @endcode in <a
-  href="https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location">Azure
-  Location API</a>
+  href="https://learn.microsoft.com/rest/api/resources/subscriptions/list-locations">Azure Location
+  API</a>
  */
 static constexpr const char *kAzureCosmosdbOperationContactedRegions =
     "azure.cosmosdb.operation.contacted_regions";
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/cloud_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/cloud_attributes.h
index 236928cf823..80f22a3d8d1 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/cloud_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/cloud_attributes.h
@@ -86,6 +86,11 @@ static constexpr const char *kCloudResourceId = "cloud.resource_id";
 
 namespace CloudPlatformValues
 {
+/**
+  Akamai Cloud Compute
+ */
+static constexpr const char *kAkamaiCloudCompute = "akamai_cloud.compute";
+
 /**
   Alibaba Cloud Elastic Compute Service
  */
@@ -171,6 +176,11 @@ static constexpr const char *kAzureAppService = "azure.app_service";
  */
 static constexpr const char *kAzureOpenshift = "azure.openshift";
 
+/**
+  Google Vertex AI Agent Engine
+ */
+static constexpr const char *kGcpAgentEngine = "gcp.agent_engine";
+
 /**
   Google Bare Metal Solution (BMS)
  */
@@ -206,6 +216,11 @@ static constexpr const char *kGcpAppEngine = "gcp_app_engine";
  */
 static constexpr const char *kGcpOpenshift = "gcp_openshift";
 
+/**
+  Server on Hetzner Cloud
+ */
+static constexpr const char *kHetznerCloudServer = "hetzner.cloud_server";
+
 /**
   Red Hat OpenShift on IBM Cloud
  */
@@ -236,10 +251,20 @@ static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
  */
 static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
 
+/**
+  Vultr Cloud Compute
+ */
+static constexpr const char *kVultrCloudCompute = "vultr.cloud_compute";
+
 }  // namespace CloudPlatformValues
 
 namespace CloudProviderValues
 {
+/**
+  Akamai Cloud
+ */
+static constexpr const char *kAkamaiCloud = "akamai_cloud";
+
 /**
   Alibaba Cloud
  */
@@ -265,6 +290,11 @@ static constexpr const char *kGcp = "gcp";
  */
 static constexpr const char *kHeroku = "heroku";
 
+/**
+  Hetzner
+ */
+static constexpr const char *kHetzner = "hetzner";
+
 /**
   IBM Cloud
  */
@@ -280,6 +310,11 @@ static constexpr const char *kOracleCloud = "oracle_cloud";
  */
 static constexpr const char *kTencentCloud = "tencent_cloud";
 
+/**
+  Vultr
+ */
+static constexpr const char *kVultr = "vultr";
+
 }  // namespace CloudProviderValues
 
 }  // namespace cloud
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_attributes.h
index e0678618e28..b7342d89ff6 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_attributes.h
@@ -73,7 +73,7 @@ static constexpr const char *kContainerId = "container.id";
   <p>
   Docker defines a sha256 of the image id; @code container.image.id @endcode corresponds to the
   @code Image @endcode field from the Docker container inspect <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
+  href="https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Container/operation/ContainerInspect">API</a>
   endpoint. K8s defines a link to the container registry repository with digest @code "imageID":
   "registry.azurecr.io
   /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"
@@ -91,7 +91,8 @@ static constexpr const char *kContainerImageName = "container.image.name";
 /**
   Repo digests of the container image as provided by the container runtime.
   <p>
-  <a href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a>
+  <a
+  href="https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Image/operation/ImageInspect">Docker</a>
   and <a
   href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
   report those under the @code RepoDigests @endcode field.
@@ -100,9 +101,9 @@ static constexpr const char *kContainerImageRepoDigests = "container.image.repo_
 
 /**
   Container image tags. An example can be found in <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
-  Inspect</a>. Should be only the @code <tag> @endcode section of the full name for example from
-  @code registry.example.com/my-org/my-image:<tag> @endcode.
+  href="https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Image/operation/ImageInspect">Docker
+  Image Inspect</a>. Should be only the @code <tag> @endcode section of the full name for example
+  from @code registry.example.com/my-org/my-image:<tag> @endcode.
  */
 static constexpr const char *kContainerImageTags = "container.image.tags";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_metrics.h
index 1b867442243..9455503f914 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_metrics.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/container_metrics.h
@@ -289,6 +289,151 @@ CreateAsyncDoubleMetricContainerFilesystemUsage(metrics::Meter *meter)
                                                     unitMetricContainerFilesystemUsage);
 }
 
+/**
+  Container memory available.
+  <p>
+  Available memory for use.  This is defined as the memory limit - workingSetBytes. If memory limit
+  is undefined, the available bytes is omitted. In general, this metric can be derived from <a
+  href="https://github.com/google/cadvisor/blob/v0.53.0/docs/storage/prometheus.md#prometheus-container-metrics">cadvisor</a>
+  and by subtracting the @code container_memory_working_set_bytes @endcode metric from the @code
+  container_spec_memory_limit_bytes @endcode metric. In K8s, this metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.AvailableBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricContainerMemoryAvailable     = "container.memory.available";
+static constexpr const char *descrMetricContainerMemoryAvailable = "Container memory available.";
+static constexpr const char *unitMetricContainerMemoryAvailable  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricContainerMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricContainerMemoryAvailable,
+                                         descrMetricContainerMemoryAvailable,
+                                         unitMetricContainerMemoryAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricContainerMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricContainerMemoryAvailable,
+                                          descrMetricContainerMemoryAvailable,
+                                          unitMetricContainerMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricContainerMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricContainerMemoryAvailable,
+                                                   descrMetricContainerMemoryAvailable,
+                                                   unitMetricContainerMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricContainerMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricContainerMemoryAvailable,
+                                                    descrMetricContainerMemoryAvailable,
+                                                    unitMetricContainerMemoryAvailable);
+}
+
+/**
+  Container memory paging faults.
+  <p>
+  In general, this metric can be derived from <a
+  href="https://github.com/google/cadvisor/blob/v0.53.0/docs/storage/prometheus.md#prometheus-container-metrics">cadvisor</a>
+  and specifically the @code container_memory_failures_total{failure_type=pgfault, scope=container}
+  @endcode and @code container_memory_failures_total{failure_type=pgmajfault, scope=container}
+  @endcodemetric. In K8s, this metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.PageFaults</a>
+  and <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.MajorPageFaults</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> counter
+ */
+static constexpr const char *kMetricContainerMemoryPagingFaults = "container.memory.paging.faults";
+static constexpr const char *descrMetricContainerMemoryPagingFaults =
+    "Container memory paging faults.";
+static constexpr const char *unitMetricContainerMemoryPagingFaults = "{fault}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricContainerMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricContainerMemoryPagingFaults,
+                                    descrMetricContainerMemoryPagingFaults,
+                                    unitMetricContainerMemoryPagingFaults);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricContainerMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricContainerMemoryPagingFaults,
+                                    descrMetricContainerMemoryPagingFaults,
+                                    unitMetricContainerMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricContainerMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricContainerMemoryPagingFaults,
+                                             descrMetricContainerMemoryPagingFaults,
+                                             unitMetricContainerMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricContainerMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricContainerMemoryPagingFaults,
+                                              descrMetricContainerMemoryPagingFaults,
+                                              unitMetricContainerMemoryPagingFaults);
+}
+
+/**
+  Container memory RSS.
+  <p>
+  In general, this metric can be derived from <a
+  href="https://github.com/google/cadvisor/blob/v0.53.0/docs/storage/prometheus.md#prometheus-container-metrics">cadvisor</a>
+  and specifically the @code container_memory_rss @endcode metric. In K8s, this metric is derived
+  from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.RSSBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricContainerMemoryRss     = "container.memory.rss";
+static constexpr const char *descrMetricContainerMemoryRss = "Container memory RSS.";
+static constexpr const char *unitMetricContainerMemoryRss  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricContainerMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricContainerMemoryRss, descrMetricContainerMemoryRss,
+                                         unitMetricContainerMemoryRss);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricContainerMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricContainerMemoryRss, descrMetricContainerMemoryRss,
+                                          unitMetricContainerMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricContainerMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricContainerMemoryRss, descrMetricContainerMemoryRss, unitMetricContainerMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricContainerMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricContainerMemoryRss, descrMetricContainerMemoryRss, unitMetricContainerMemoryRss);
+}
+
 /**
   Memory usage of the container.
   <p>
@@ -328,6 +473,54 @@ CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
       kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
 }
 
+/**
+  Container memory working set.
+  <p>
+  In general, this metric can be derived from <a
+  href="https://github.com/google/cadvisor/blob/v0.53.0/docs/storage/prometheus.md#prometheus-container-metrics">cadvisor</a>
+  and specifically the @code container_memory_working_set_bytes @endcode metric. In K8s, this metric
+  is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.WorkingSetBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricContainerMemoryWorkingSet     = "container.memory.working_set";
+static constexpr const char *descrMetricContainerMemoryWorkingSet = "Container memory working set.";
+static constexpr const char *unitMetricContainerMemoryWorkingSet  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricContainerMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricContainerMemoryWorkingSet,
+                                         descrMetricContainerMemoryWorkingSet,
+                                         unitMetricContainerMemoryWorkingSet);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricContainerMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricContainerMemoryWorkingSet,
+                                          descrMetricContainerMemoryWorkingSet,
+                                          unitMetricContainerMemoryWorkingSet);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricContainerMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricContainerMemoryWorkingSet,
+                                                   descrMetricContainerMemoryWorkingSet,
+                                                   unitMetricContainerMemoryWorkingSet);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricContainerMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricContainerMemoryWorkingSet,
+                                                    descrMetricContainerMemoryWorkingSet,
+                                                    unitMetricContainerMemoryWorkingSet);
+}
+
 /**
   Network bytes for the container.
   <p>
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/db_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/db_attributes.h
index 31b8f2b74e3..0384eab4cd0 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/db_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/db_attributes.h
@@ -229,8 +229,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestContentL
   Deprecated, use @code db.response.status_code @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code db.response.status_code @endcode.", "reason": "renamed", "renamed_to":
-  "db.response.status_code"}
+  {"note": "Use @code db.response.status_code @endcode instead.", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbStatusCode =
     "db.cosmosdb.status_code";
@@ -390,15 +389,18 @@ static constexpr const char *kDbOperationParameter = "db.operation.parameter";
   @code db.query.parameter.<key> @endcode SHOULD match
   up with the parameterized placeholders present in @code db.query.text @endcode.
   <p>
+  It is RECOMMENDED to capture the value as provided by the application
+  without attempting to do any case normalization.
+  <p>
   @code db.query.parameter.<key> @endcode SHOULD NOT be captured on batch operations.
   <p>
   Examples:
   <ul>
     <li>For a query @code SELECT * FROM users where username =  %s @endcode with the parameter @code
   "jdoe" @endcode, the attribute @code db.query.parameter.0 @endcode SHOULD be set to @code "jdoe"
-  @endcode.</li> <li>For a query @code "SELECT * FROM users WHERE username = %(username)s; @endcode
+  @endcode.</li> <li>For a query @code "SELECT * FROM users WHERE username = %(userName)s; @endcode
   with parameter
-  @code username = "jdoe" @endcode, the attribute @code db.query.parameter.username @endcode SHOULD
+  @code userName = "jdoe" @endcode, the attribute @code db.query.parameter.userName @endcode SHOULD
   be set to @code "jdoe" @endcode.</li>
   </ul>
  */
@@ -414,7 +416,7 @@ static constexpr const char *kDbQueryParameter = "db.query.parameter";
   Summary may be available to the instrumentation through
   instrumentation hooks or other means. If it is not available, instrumentations
   that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
+  <a href="/docs/db/database-spans.md#generating-a-summary-of-the-query">Generating query
   summary</a> section.
  */
 static constexpr const char *kDbQuerySummary = "db.query.summary";
@@ -422,11 +424,10 @@ static constexpr const char *kDbQuerySummary = "db.query.summary";
 /**
   The database query being executed.
   <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
+  For sanitization see <a href="/docs/db/database-spans.md#sanitization-of-dbquerytext">Sanitization
+  of @code db.query.text @endcode</a>. For batch operations, if the individual operations are known
+  to have the same query text then that query text SHOULD be used, otherwise all of the individual
+  query texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
   specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
   though parameterized query text can potentially have sensitive data, by using a parameterized
   query the user is giving a strong signal that any sensitive data will be passed as parameter
@@ -439,8 +440,7 @@ static constexpr const char *kDbQueryText = "db.query.text";
   Deprecated, use @code db.namespace @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
+  {"note": "Uncategorized.", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
     "db.redis.database_index";
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/dns_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/dns_attributes.h
index 827d4d51da3..39dc7fe570e 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/dns_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/dns_attributes.h
@@ -27,10 +27,8 @@ static constexpr const char *kDnsAnswers = "dns.answers";
 /**
   The name being queried.
   <p>
-  If the name field contains non-printable characters (below 32 or above 126), those characters
-  should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be
-  escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
-  respectively.
+  The name represents the queried domain name as it appears in the DNS query without any additional
+  normalization.
  */
 static constexpr const char *kDnsQuestionName = "dns.question.name";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/enduser_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
index d117dd268e1..2487dbe7911 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
@@ -40,8 +40,7 @@ static constexpr const char *kEnduserPseudoId = "enduser.pseudo.id";
   Deprecated, use @code user.roles @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code user.roles @endcode.", "reason": "renamed", "renamed_to":
-  "user.roles"}
+  {"note": "Use @code user.roles @endcode instead.", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/error_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/error_attributes.h
index 439ae7bb119..2efa4b48768 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/error_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/error_attributes.h
@@ -47,7 +47,7 @@ static constexpr const char *kErrorMessage = "error.message";
   additional filters are applied.
   <p>
   If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
+  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or RPC
   status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
   error.type @endcode to capture all errors, regardless of whether they are defined within the
   domain-specific set or not.</li>
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/event_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/event_attributes.h
index de4d30a5706..42ecce2c25d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/event_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/event_attributes.h
@@ -23,7 +23,8 @@ namespace event
   Identifies the class / type of event.
 
   @deprecated
-  {"note": "Replaced by EventName top-level field on the LogRecord.\n", "reason": "uncategorized"}
+  {"note": "The value of this attribute MUST now be set as the value of the EventName field on the
+  LogRecord to indicate that the LogRecord represents an Event.\n", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kEventName = "event.name";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/faas_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/faas_attributes.h
index 9f9690824be..0427a12d575 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/faas_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/faas_attributes.h
@@ -142,9 +142,9 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
   (Services):</strong> The <a
   href="https://cloud.google.com/run/docs/managing/revisions">revision</a> (i.e., the function name
   plus the revision suffix).</li> <li><strong>Google Cloud Functions:</strong> The value of the <a
-  href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">@code
-  K_REVISION @endcode environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not
-  applicable. Do not set this attribute.</li>
+  href="https://cloud.google.com/run/docs/container-contract#services-env-vars">@code K_REVISION
+  @endcode environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not applicable. Do
+  not set this attribute.</li>
   </ul>
  */
 static constexpr const char *kFaasVersion = "faas.version";
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gcp_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gcp_attributes.h
index 7be353eb7ea..74ddef337df 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gcp_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gcp_attributes.h
@@ -80,6 +80,66 @@ static constexpr const char *kGcpApphubWorkloadEnvironmentType =
  */
 static constexpr const char *kGcpApphubWorkloadId = "gcp.apphub.workload.id";
 
+/**
+  The container within GCP where the AppHub destination application is defined.
+ */
+static constexpr const char *kGcpApphubDestinationApplicationContainer =
+    "gcp.apphub_destination.application.container";
+
+/**
+  The name of the destination application as configured in AppHub.
+ */
+static constexpr const char *kGcpApphubDestinationApplicationId =
+    "gcp.apphub_destination.application.id";
+
+/**
+  The GCP zone or region where the destination application is defined.
+ */
+static constexpr const char *kGcpApphubDestinationApplicationLocation =
+    "gcp.apphub_destination.application.location";
+
+/**
+  Criticality of a destination workload indicates its importance to the business as specified in <a
+  href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">AppHub type
+  enum</a>
+ */
+static constexpr const char *kGcpApphubDestinationServiceCriticalityType =
+    "gcp.apphub_destination.service.criticality_type";
+
+/**
+  Software lifecycle stage of a destination service as defined <a
+  href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">AppHub
+  environment type</a>
+ */
+static constexpr const char *kGcpApphubDestinationServiceEnvironmentType =
+    "gcp.apphub_destination.service.environment_type";
+
+/**
+  The name of the destination service as configured in AppHub.
+ */
+static constexpr const char *kGcpApphubDestinationServiceId = "gcp.apphub_destination.service.id";
+
+/**
+  Criticality of a destination workload indicates its importance to the business as specified in <a
+  href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">AppHub type
+  enum</a>
+ */
+static constexpr const char *kGcpApphubDestinationWorkloadCriticalityType =
+    "gcp.apphub_destination.workload.criticality_type";
+
+/**
+  Environment of a destination workload is the stage of a software lifecycle as provided in the <a
+  href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">AppHub
+  environment type</a>
+ */
+static constexpr const char *kGcpApphubDestinationWorkloadEnvironmentType =
+    "gcp.apphub_destination.workload.environment_type";
+
+/**
+  The name of the destination workload as configured in AppHub.
+ */
+static constexpr const char *kGcpApphubDestinationWorkloadId = "gcp.apphub_destination.workload.id";
+
 /**
   Identifies the Google Cloud service for which the official client library is intended.
   <p>
@@ -216,6 +276,102 @@ static constexpr const char *kDevelopment = "DEVELOPMENT";
 
 }  // namespace GcpApphubWorkloadEnvironmentTypeValues
 
+namespace GcpApphubDestinationServiceCriticalityTypeValues
+{
+/**
+  Mission critical service.
+ */
+static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
+
+/**
+  High impact.
+ */
+static constexpr const char *kHigh = "HIGH";
+
+/**
+  Medium impact.
+ */
+static constexpr const char *kMedium = "MEDIUM";
+
+/**
+  Low impact.
+ */
+static constexpr const char *kLow = "LOW";
+
+}  // namespace GcpApphubDestinationServiceCriticalityTypeValues
+
+namespace GcpApphubDestinationServiceEnvironmentTypeValues
+{
+/**
+  Production environment.
+ */
+static constexpr const char *kProduction = "PRODUCTION";
+
+/**
+  Staging environment.
+ */
+static constexpr const char *kStaging = "STAGING";
+
+/**
+  Test environment.
+ */
+static constexpr const char *kTest = "TEST";
+
+/**
+  Development environment.
+ */
+static constexpr const char *kDevelopment = "DEVELOPMENT";
+
+}  // namespace GcpApphubDestinationServiceEnvironmentTypeValues
+
+namespace GcpApphubDestinationWorkloadCriticalityTypeValues
+{
+/**
+  Mission critical service.
+ */
+static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
+
+/**
+  High impact.
+ */
+static constexpr const char *kHigh = "HIGH";
+
+/**
+  Medium impact.
+ */
+static constexpr const char *kMedium = "MEDIUM";
+
+/**
+  Low impact.
+ */
+static constexpr const char *kLow = "LOW";
+
+}  // namespace GcpApphubDestinationWorkloadCriticalityTypeValues
+
+namespace GcpApphubDestinationWorkloadEnvironmentTypeValues
+{
+/**
+  Production environment.
+ */
+static constexpr const char *kProduction = "PRODUCTION";
+
+/**
+  Staging environment.
+ */
+static constexpr const char *kStaging = "STAGING";
+
+/**
+  Test environment.
+ */
+static constexpr const char *kTest = "TEST";
+
+/**
+  Development environment.
+ */
+static constexpr const char *kDevelopment = "DEVELOPMENT";
+
+}  // namespace GcpApphubDestinationWorkloadEnvironmentTypeValues
+
 }  // namespace gcp
 }  // namespace semconv
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
index 50bfff5317f..d7407c4143a 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
@@ -61,6 +61,37 @@ static constexpr const char *kGenAiConversationId = "gen_ai.conversation.id";
  */
 static constexpr const char *kGenAiDataSourceId = "gen_ai.data_source.id";
 
+/**
+  The number of dimensions the resulting output embeddings should have.
+ */
+static constexpr const char *kGenAiEmbeddingsDimensionCount = "gen_ai.embeddings.dimension.count";
+
+/**
+  A free-form explanation for the assigned score provided by the evaluator.
+ */
+static constexpr const char *kGenAiEvaluationExplanation = "gen_ai.evaluation.explanation";
+
+/**
+  The name of the evaluation metric used for the GenAI response.
+ */
+static constexpr const char *kGenAiEvaluationName = "gen_ai.evaluation.name";
+
+/**
+  Human readable label for evaluation.
+  <p>
+  This attribute provides a human-readable interpretation of the evaluation score produced by an
+  evaluator. For example, a score value of 1 could mean "relevant" in one evaluation system and "not
+  relevant" in another, depending on the scoring range and evaluator. The label SHOULD have low
+  cardinality. Possible values depend on the evaluation metric and evaluator used; implementations
+  SHOULD document the possible values.
+ */
+static constexpr const char *kGenAiEvaluationScoreLabel = "gen_ai.evaluation.score.label";
+
+/**
+  The evaluation score returned by the evaluator.
+ */
+static constexpr const char *kGenAiEvaluationScoreValue = "gen_ai.evaluation.score.value";
+
 /**
   The chat history provided to the model as an input.
   <p>
@@ -180,6 +211,11 @@ static constexpr const char *kGenAiOutputType = "gen_ai.output.type";
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
 
+/**
+  The name of the prompt that uniquely identifies it.
+ */
+static constexpr const char *kGenAiPromptName = "gen_ai.prompt.name";
+
 /**
   The Generative AI provider as identified by the client or server instrumentation.
   <p>
@@ -313,11 +349,52 @@ static constexpr const char *kGenAiSystemInstructions = "gen_ai.system_instructi
  */
 static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
 
+/**
+  Parameters passed to the tool call.
+  <blockquote>
+  [!WARNING]
+  This attribute may contain sensitive information.</blockquote>
+  <p>
+  It's expected to be an object - in case a serialized string is available
+  to the instrumentation, the instrumentation SHOULD do the best effort to
+  deserialize it to an object. When recorded on spans, it MAY be recorded as a JSON string if
+  structured format is not supported and SHOULD be recorded in structured form otherwise.
+ */
+static constexpr const char *kGenAiToolCallArguments = "gen_ai.tool.call.arguments";
+
 /**
   The tool call identifier.
  */
 static constexpr const char *kGenAiToolCallId = "gen_ai.tool.call.id";
 
+/**
+  The result returned by the tool call (if any and if execution was successful).
+  <blockquote>
+  [!WARNING]
+  This attribute may contain sensitive information.</blockquote>
+  <p>
+  It's expected to be an object - in case a serialized string is available
+  to the instrumentation, the instrumentation SHOULD do the best effort to
+  deserialize it to an object. When recorded on spans, it MAY be recorded as a JSON string if
+  structured format is not supported and SHOULD be recorded in structured form otherwise.
+ */
+static constexpr const char *kGenAiToolCallResult = "gen_ai.tool.call.result";
+
+/**
+  The list of source system tool definitions available to the GenAI agent or model.
+  <p>
+  The value of this attribute matches source system tool definition format.
+  <p>
+  It's expected to be an array of objects where each object represents a tool definition. In case a
+  serialized string is available to the instrumentation, the instrumentation SHOULD do the best
+  effort to deserialize it to an array. When recorded on spans, it MAY be recorded as a JSON string
+  if structured format is not supported and SHOULD be recorded in structured form otherwise. <p>
+  Since this attribute could be large, it's NOT RECOMMENDED to populate
+  it by default. Instrumentations MAY provide a way to enable
+  populating this attribute.
+ */
+static constexpr const char *kGenAiToolDefinitions = "gen_ai.tool.definitions";
+
 /**
   The tool description.
  */
@@ -604,13 +681,21 @@ static constexpr const char *kCohere = "cohere";
 
 /**
   Azure AI Inference
+
+  @deprecated
+  {"note": "Replaced by @code azure.ai.inference @endcode.", "reason": "renamed", "renamed_to":
+  "azure.ai.inference"}
  */
-static constexpr const char *kAzAiInference = "az.ai.inference";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kAzAiInference = "az.ai.inference";
 
 /**
   Azure OpenAI
+
+  @deprecated
+  {"note": "Replaced by @code azure.ai.openai @endcode.", "reason": "renamed", "renamed_to":
+  "azure.ai.openai"}
  */
-static constexpr const char *kAzAiOpenai = "az.ai.openai";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kAzAiOpenai = "az.ai.openai";
 
 /**
   Azure AI Inference
@@ -639,11 +724,8 @@ static constexpr const char *kPerplexity = "perplexity";
 
 /**
   xAI
-
-  @deprecated
-  {"note": "Replaced by @code x_ai @endcode.", "reason": "renamed", "renamed_to": "x_ai"}
  */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kXai = "xai";
+static constexpr const char *kXai = "xai";
 
 /**
   DeepSeek
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/http_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/http_attributes.h
index f8cebe1751f..1af52bbb62b 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/http_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/http_attributes.h
@@ -34,11 +34,12 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.clie
 static constexpr const char *kHttpConnectionState = "http.connection.state";
 
 /**
-  Deprecated, use @code network.protocol.name @endcode instead.
+  Deprecated, use @code network.protocol.name @endcode and @code network.protocol.version @endcode
+  instead.
 
   @deprecated
-  {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to":
-  "network.protocol.name"}
+  {"note": "Split into @code network.protocol.name @endcode and @code network.protocol.version
+  @endcode", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
 
@@ -93,19 +94,23 @@ static constexpr const char *kHttpRequestHeader = "http.request.header";
   <p>
   HTTP request method value SHOULD be "known" to the instrumentation.
   By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
+  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a>, the PATCH method
+  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a> and the QUERY method
+  defined in <a
+  href="https://datatracker.ietf.org/doc/draft-ietf-httpbis-safe-method-w-body/?include_text=1">httpbis-safe-method-w-body</a>.
+  <p>
+  If the HTTP request method is not known to instrumentation, it MUST set the @code
+  http.request.method @endcode attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation
+  could end up converting valid HTTP request methods to @code _OTHER @endcode, then it MUST provide
+  a way to override the list of known HTTP methods. If this override is done via environment
+  variable, then the environment variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and
+  support a comma-separated list of case-sensitive known HTTP methods (this list MUST be a full
+  override of the default known method, it is not a list of known methods in addition to the
+  defaults). <p> HTTP method names are case-sensitive and @code http.request.method @endcode
+  attribute value MUST match a known HTTP method name exactly. Instrumentations for specific web
+  frameworks that consider HTTP methods to be case insensitive, SHOULD populate a canonical
+  equivalent. Tracing instrumentations that do so, MUST also set @code http.request.method_original
+  @endcode to the original value.
  */
 static constexpr const char *kHttpRequestMethod = "http.request.method";
 
@@ -209,11 +214,19 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength
     "http.response_content_length_uncompressed";
 
 /**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
+  The matched route template for the request. This MUST be low-cardinality and include all static
+  path segments, with dynamic path segments represented with placeholders. <p> MUST NOT be populated
+  when this is not supported by the HTTP server framework as the route attribute should have
+  low-cardinality and the URI path can NOT substitute it. SHOULD include the <a
+  href="/docs/http/http-spans.md#http-server-definitions">application root</a> if there is one. <p>
+  A static path segment is a part of the route template with a fixed, low-cardinality value. This
+  includes literal strings like @code /users/ @endcode and placeholders that are constrained to a
+  finite, predefined set of values, e.g. @code {controller} @endcode or @code {action} @endcode. <p>
+  A dynamic path segment is a placeholder for a value that can have high cardinality and is not
+  constrained to a predefined list like static path segments. <p> Instrumentations SHOULD use
+  routing information provided by the corresponding web framework. They SHOULD pick the most precise
+  source of routing information and MAY support custom route formatting. Instrumentations SHOULD
+  document the format and the API used to obtain the route string.
  */
 static constexpr const char *kHttpRoute = "http.route";
 
@@ -364,6 +377,11 @@ static constexpr const char *kPut = "PUT";
  */
 static constexpr const char *kTrace = "TRACE";
 
+/**
+  QUERY method.
+ */
+static constexpr const char *kQuery = "QUERY";
+
 /**
   Any HTTP method that the instrumentation has no prior knowledge of.
  */
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/jsonrpc_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/jsonrpc_attributes.h
new file mode 100644
index 00000000000..a89d6d3826a
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/jsonrpc_attributes.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace jsonrpc
+{
+
+/**
+  Protocol version, as specified in the @code jsonrpc @endcode property of the request and its
+  corresponding response.
+ */
+static constexpr const char *kJsonrpcProtocolVersion = "jsonrpc.protocol.version";
+
+/**
+  A string representation of the @code id @endcode property of the request and its corresponding
+  response. <p> Under the <a href="https://www.jsonrpc.org/specification">JSON-RPC
+  specification</a>, the @code id @endcode property may be a string, number, null, or omitted
+  entirely. When omitted, the request is treated as a notification. Using @code null @endcode is not
+  equivalent to omitting the @code id @endcode, but it is discouraged. Instrumentations SHOULD NOT
+  capture this attribute when the @code id @endcode is @code null @endcode or omitted.
+ */
+static constexpr const char *kJsonrpcRequestId = "jsonrpc.request.id";
+
+}  // namespace jsonrpc
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
index 80ef2a964ba..b3361f35198 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
@@ -365,6 +365,29 @@ static constexpr const char *kK8sNodeUid = "k8s.node.uid";
  */
 static constexpr const char *kK8sPodAnnotation = "k8s.pod.annotation";
 
+/**
+  Specifies the hostname of the Pod.
+  <p>
+  The K8s Pod spec has an optional hostname field, which can be used to specify a hostname.
+  Refer to <a
+  href="https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-hostname-and-subdomain-field">K8s
+  docs</a> for more information about this field. <p> This attribute aligns with the @code hostname
+  @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#podspec-v1-core">K8s
+  PodSpec</a>.
+ */
+static constexpr const char *kK8sPodHostname = "k8s.pod.hostname";
+
+/**
+  IP address allocated to the Pod.
+  <p>
+  This attribute aligns with the @code podIP @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#podstatus-v1-core">K8s
+  PodStatus</a>.
+ */
+static constexpr const char *kK8sPodIp = "k8s.pod.ip";
+
 /**
   The label placed on the Pod, the @code <key> @endcode being the label name, the value being the
   label value. <p> Examples: <ul> <li>A label @code app @endcode with value @code my-app @endcode
@@ -391,6 +414,33 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kK8sPodLabels = "k8s.pod.l
  */
 static constexpr const char *kK8sPodName = "k8s.pod.name";
 
+/**
+  The start timestamp of the Pod.
+  <p>
+  Date and time at which the object was acknowledged by the Kubelet.
+  This is before the Kubelet pulled the container image(s) for the pod.
+  <p>
+  This attribute aligns with the @code startTime @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#podstatus-v1-core">K8s
+  PodStatus</a>, in ISO 8601 (RFC 3339 compatible) format.
+ */
+static constexpr const char *kK8sPodStartTime = "k8s.pod.start_time";
+
+/**
+  The phase for the pod. Corresponds to the @code phase @endcode field of the: <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#podstatus-v1-core">K8s
+  PodStatus</a>
+ */
+static constexpr const char *kK8sPodStatusPhase = "k8s.pod.status.phase";
+
+/**
+  The reason for the pod state. Corresponds to the @code reason @endcode field of the: <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#podstatus-v1-core">K8s
+  PodStatus</a>
+ */
+static constexpr const char *kK8sPodStatusReason = "k8s.pod.status.reason";
+
 /**
   The UID of the Pod.
  */
@@ -450,7 +500,7 @@ static constexpr const char *kK8sResourcequotaName = "k8s.resourcequota.name";
   string (e.g., count/deployments.apps, count/pods), or, for certain core Kubernetes resources, just
   the resource name (e.g., pods, services, configmaps). Both forms are supported by Kubernetes for
   object count quotas. See <a
-  href="https://kubernetes.io/docs/concepts/policy/resource-quotas/#object-count-quota">Kubernetes
+  href="https://kubernetes.io/docs/concepts/policy/resource-quotas/#quota-on-object-count">Kubernetes
   Resource Quotas documentation</a> for more details.
  */
 static constexpr const char *kK8sResourcequotaResourceName = "k8s.resourcequota.resource_name";
@@ -633,6 +683,72 @@ static constexpr const char *kNetworkUnavailable = "NetworkUnavailable";
 
 }  // namespace K8sNodeConditionTypeValues
 
+namespace K8sPodStatusPhaseValues
+{
+/**
+  The pod has been accepted by the system, but one or more of the containers has not been started.
+  This includes time before being bound to a node, as well as time spent pulling images onto the
+  host.
+ */
+static constexpr const char *kPending = "Pending";
+
+/**
+  The pod has been bound to a node and all of the containers have been started. At least one
+  container is still running or is in the process of being restarted.
+ */
+static constexpr const char *kRunning = "Running";
+
+/**
+  All containers in the pod have voluntarily terminated with a container exit code of 0, and the
+  system is not going to restart any of these containers.
+ */
+static constexpr const char *kSucceeded = "Succeeded";
+
+/**
+  All containers in the pod have terminated, and at least one container has terminated in a failure
+  (exited with a non-zero exit code or was stopped by the system).
+ */
+static constexpr const char *kFailed = "Failed";
+
+/**
+  For some reason the state of the pod could not be obtained, typically due to an error in
+  communicating with the host of the pod.
+ */
+static constexpr const char *kUnknown = "Unknown";
+
+}  // namespace K8sPodStatusPhaseValues
+
+namespace K8sPodStatusReasonValues
+{
+/**
+  The pod is evicted.
+ */
+static constexpr const char *kEvicted = "Evicted";
+
+/**
+  The pod is in a status because of its node affinity
+ */
+static constexpr const char *kNodeAffinity = "NodeAffinity";
+
+/**
+  The reason on a pod when its state cannot be confirmed as kubelet is unresponsive on the node it
+  is (was) running.
+ */
+static constexpr const char *kNodeLost = "NodeLost";
+
+/**
+  The node is shutdown
+ */
+static constexpr const char *kShutdown = "Shutdown";
+
+/**
+  The pod was rejected admission to the node because of an error during admission that could not be
+  categorized.
+ */
+static constexpr const char *kUnexpectedAdmissionError = "UnexpectedAdmissionError";
+
+}  // namespace K8sPodStatusReasonValues
+
 namespace K8sVolumeTypeValues
 {
 /**
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_metrics.h
index 678b24ff85d..e925e6a8ff4 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_metrics.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/k8s_metrics.h
@@ -60,6 +60,53 @@ CreateAsyncDoubleMetricK8sContainerCpuLimit(metrics::Meter *meter)
       kMetricK8sContainerCpuLimit, descrMetricK8sContainerCpuLimit, unitMetricK8sContainerCpuLimit);
 }
 
+/**
+  The ratio of container CPU usage to its CPU limit.
+  <p>
+  The value range is [0.0,1.0]. A value of 1.0 means the container is using 100% of its CPU limit.
+  If the CPU limit is not set, this metric SHOULD NOT be emitted for that container. <p> gauge
+ */
+static constexpr const char *kMetricK8sContainerCpuLimitUtilization =
+    "k8s.container.cpu.limit_utilization";
+static constexpr const char *descrMetricK8sContainerCpuLimitUtilization =
+    "The ratio of container CPU usage to its CPU limit.";
+static constexpr const char *unitMetricK8sContainerCpuLimitUtilization = "1";
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+
+static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
+CreateSyncInt64MetricK8sContainerCpuLimitUtilization(metrics::Meter *meter)
+{
+  return meter->CreateInt64Gauge(kMetricK8sContainerCpuLimitUtilization,
+                                 descrMetricK8sContainerCpuLimitUtilization,
+                                 unitMetricK8sContainerCpuLimitUtilization);
+}
+
+static inline nostd::unique_ptr<metrics::Gauge<double>>
+CreateSyncDoubleMetricK8sContainerCpuLimitUtilization(metrics::Meter *meter)
+{
+  return meter->CreateDoubleGauge(kMetricK8sContainerCpuLimitUtilization,
+                                  descrMetricK8sContainerCpuLimitUtilization,
+                                  unitMetricK8sContainerCpuLimitUtilization);
+}
+#endif /* OPENTELEMETRY_ABI_VERSION_NO */
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sContainerCpuLimitUtilization(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableGauge(kMetricK8sContainerCpuLimitUtilization,
+                                           descrMetricK8sContainerCpuLimitUtilization,
+                                           unitMetricK8sContainerCpuLimitUtilization);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sContainerCpuLimitUtilization(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableGauge(kMetricK8sContainerCpuLimitUtilization,
+                                            descrMetricK8sContainerCpuLimitUtilization,
+                                            unitMetricK8sContainerCpuLimitUtilization);
+}
+
 /**
   CPU resource requested for the container.
   <p>
@@ -104,6 +151,52 @@ CreateAsyncDoubleMetricK8sContainerCpuRequest(metrics::Meter *meter)
                                                     unitMetricK8sContainerCpuRequest);
 }
 
+/**
+  The ratio of container CPU usage to its CPU request.
+  <p>
+  gauge
+ */
+static constexpr const char *kMetricK8sContainerCpuRequestUtilization =
+    "k8s.container.cpu.request_utilization";
+static constexpr const char *descrMetricK8sContainerCpuRequestUtilization =
+    "The ratio of container CPU usage to its CPU request.";
+static constexpr const char *unitMetricK8sContainerCpuRequestUtilization = "1";
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+
+static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
+CreateSyncInt64MetricK8sContainerCpuRequestUtilization(metrics::Meter *meter)
+{
+  return meter->CreateInt64Gauge(kMetricK8sContainerCpuRequestUtilization,
+                                 descrMetricK8sContainerCpuRequestUtilization,
+                                 unitMetricK8sContainerCpuRequestUtilization);
+}
+
+static inline nostd::unique_ptr<metrics::Gauge<double>>
+CreateSyncDoubleMetricK8sContainerCpuRequestUtilization(metrics::Meter *meter)
+{
+  return meter->CreateDoubleGauge(kMetricK8sContainerCpuRequestUtilization,
+                                  descrMetricK8sContainerCpuRequestUtilization,
+                                  unitMetricK8sContainerCpuRequestUtilization);
+}
+#endif /* OPENTELEMETRY_ABI_VERSION_NO */
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sContainerCpuRequestUtilization(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableGauge(kMetricK8sContainerCpuRequestUtilization,
+                                           descrMetricK8sContainerCpuRequestUtilization,
+                                           unitMetricK8sContainerCpuRequestUtilization);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sContainerCpuRequestUtilization(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableGauge(kMetricK8sContainerCpuRequestUtilization,
+                                            descrMetricK8sContainerCpuRequestUtilization,
+                                            unitMetricK8sContainerCpuRequestUtilization);
+}
+
 /**
   Maximum ephemeral storage resource limit set for the container.
   <p>
@@ -548,40 +641,42 @@ CreateAsyncDoubleMetricK8sContainerStorageRequest(metrics::Meter *meter)
 }
 
 /**
-  The number of actively running jobs for a cronjob.
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
+  Deprecated, use @code k8s.cronjob.job.active @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.cronjob.job.active @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.cronjob.job.active"} <p> This metric aligns with the @code active @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
   CronJobStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sCronjobActiveJobs = "k8s.cronjob.active_jobs";
-static constexpr const char *descrMetricK8sCronjobActiveJobs =
-    "The number of actively running jobs for a cronjob.";
-static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sCronjobActiveJobs =
+    "k8s.cronjob.active_jobs";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sCronjobActiveJobs =
+    "Deprecated, use `k8s.cronjob.job.active` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(
       kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(
       kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(
       kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
@@ -589,21 +684,64 @@ CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
 }
 
 /**
-  Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod.
+  The number of actively running jobs for a cronjob.
   <p>
-  This metric aligns with the @code currentNumberScheduled @endcode field of the
+  This metric aligns with the @code active @endcode field of the
   <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
+  CronJobStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sCronjobJobActive = "k8s.cronjob.job.active";
+static constexpr const char *descrMetricK8sCronjobJobActive =
+    "The number of actively running jobs for a cronjob.";
+static constexpr const char *unitMetricK8sCronjobJobActive = "{job}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sCronjobJobActive(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sCronjobJobActive, descrMetricK8sCronjobJobActive,
+                                         unitMetricK8sCronjobJobActive);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sCronjobJobActive(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricK8sCronjobJobActive, descrMetricK8sCronjobJobActive, unitMetricK8sCronjobJobActive);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sCronjobJobActive(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sCronjobJobActive, descrMetricK8sCronjobJobActive, unitMetricK8sCronjobJobActive);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sCronjobJobActive(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sCronjobJobActive, descrMetricK8sCronjobJobActive, unitMetricK8sCronjobJobActive);
+}
+
+/**
+  Deprecated, use @code k8s.daemonset.node.current_scheduled @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.daemonset.node.current_scheduled @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.daemonset.node.current_scheduled"} <p> This metric aligns with the @code
+  currentNumberScheduled @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
   DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
     "k8s.daemonset.current_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
-    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon "
-    "pod.";
-static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes = "{node}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
+    "Deprecated, use `k8s.daemonset.node.current_scheduled` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes =
+    "{node}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
@@ -611,7 +749,7 @@ CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
                                          unitMetricK8sDaemonsetCurrentScheduledNodes);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
@@ -619,7 +757,7 @@ CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
                                           unitMetricK8sDaemonsetCurrentScheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
@@ -627,7 +765,7 @@ CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
                                                    unitMetricK8sDaemonsetCurrentScheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
@@ -636,19 +774,23 @@ CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
 }
 
 /**
-  Number of nodes that should be running the daemon pod (including nodes currently running the
-  daemon pod). <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
+  Deprecated, use @code k8s.daemonset.node.desired_scheduled @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.daemonset.node.desired_scheduled @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.daemonset.node.desired_scheduled"} <p> This metric aligns with the @code
+  desiredNumberScheduled @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
   DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
     "k8s.daemonset.desired_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
-    "Number of nodes that should be running the daemon pod (including nodes currently running the "
-    "daemon pod).";
-static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes = "{node}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
+    "Deprecated, use `k8s.daemonset.node.desired_scheduled` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes =
+    "{node}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
@@ -656,7 +798,7 @@ CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
                                          unitMetricK8sDaemonsetDesiredScheduledNodes);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
@@ -664,7 +806,7 @@ CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
                                           unitMetricK8sDaemonsetDesiredScheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
@@ -672,7 +814,7 @@ CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
                                                    unitMetricK8sDaemonsetDesiredScheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
@@ -681,20 +823,23 @@ CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
 }
 
 /**
-  Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod.
-  <p>
-  This metric aligns with the @code numberMisscheduled @endcode field of the
-  <a
+  Deprecated, use @code k8s.daemonset.node.misscheduled @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.daemonset.node.misscheduled @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.daemonset.node.misscheduled"} <p> This metric aligns with the @code
+  numberMisscheduled @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
   DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
     "k8s.daemonset.misscheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
-    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod.";
-static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes = "{node}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
+    "Deprecated, use `k8s.daemonset.node.misscheduled` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes =
+    "{node}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
@@ -702,7 +847,7 @@ CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
                                          unitMetricK8sDaemonsetMisscheduledNodes);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
@@ -710,7 +855,7 @@ CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
                                           unitMetricK8sDaemonsetMisscheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
@@ -718,7 +863,7 @@ CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
                                                    unitMetricK8sDaemonsetMisscheduledNodes);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
@@ -727,212 +872,503 @@ CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
 }
 
 /**
-  Number of nodes that should be running the daemon pod and have one or more of the daemon pod
-  running and ready. <p> This metric aligns with the @code numberReady @endcode field of the <a
+  Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod.
+  <p>
+  This metric aligns with the @code currentNumberScheduled @endcode field of the
+  <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
   DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDaemonsetReadyNodes = "k8s.daemonset.ready_nodes";
-static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
-    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
-    "running and ready.";
-static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
+static constexpr const char *kMetricK8sDaemonsetNodeCurrentScheduled =
+    "k8s.daemonset.node.current_scheduled";
+static constexpr const char *descrMetricK8sDaemonsetNodeCurrentScheduled =
+    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon "
+    "pod.";
+static constexpr const char *unitMetricK8sDaemonsetNodeCurrentScheduled = "{node}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+CreateSyncInt64MetricK8sDaemonsetNodeCurrentScheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                         descrMetricK8sDaemonsetReadyNodes,
-                                         unitMetricK8sDaemonsetReadyNodes);
+  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetNodeCurrentScheduled,
+                                         descrMetricK8sDaemonsetNodeCurrentScheduled,
+                                         unitMetricK8sDaemonsetNodeCurrentScheduled);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sDaemonsetNodeCurrentScheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                          descrMetricK8sDaemonsetReadyNodes,
-                                          unitMetricK8sDaemonsetReadyNodes);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetNodeCurrentScheduled,
+                                          descrMetricK8sDaemonsetNodeCurrentScheduled,
+                                          unitMetricK8sDaemonsetNodeCurrentScheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sDaemonsetNodeCurrentScheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                   descrMetricK8sDaemonsetReadyNodes,
-                                                   unitMetricK8sDaemonsetReadyNodes);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetNodeCurrentScheduled,
+                                                   descrMetricK8sDaemonsetNodeCurrentScheduled,
+                                                   unitMetricK8sDaemonsetNodeCurrentScheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sDaemonsetNodeCurrentScheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                    descrMetricK8sDaemonsetReadyNodes,
-                                                    unitMetricK8sDaemonsetReadyNodes);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetNodeCurrentScheduled,
+                                                    descrMetricK8sDaemonsetNodeCurrentScheduled,
+                                                    unitMetricK8sDaemonsetNodeCurrentScheduled);
 }
 
 /**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  deployment. <p> This metric aligns with the @code availableReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
-  DeploymentStatus</a>. <p> updowncounter
+  Number of nodes that should be running the daemon pod (including nodes currently running the
+  daemon pod). <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
+  DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDeploymentAvailablePods = "k8s.deployment.available_pods";
-static constexpr const char *descrMetricK8sDeploymentAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "deployment.";
-static constexpr const char *unitMetricK8sDeploymentAvailablePods = "{pod}";
+static constexpr const char *kMetricK8sDaemonsetNodeDesiredScheduled =
+    "k8s.daemonset.node.desired_scheduled";
+static constexpr const char *descrMetricK8sDaemonsetNodeDesiredScheduled =
+    "Number of nodes that should be running the daemon pod (including nodes currently running the "
+    "daemon pod).";
+static constexpr const char *unitMetricK8sDaemonsetNodeDesiredScheduled = "{node}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+CreateSyncInt64MetricK8sDaemonsetNodeDesiredScheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                         descrMetricK8sDeploymentAvailablePods,
-                                         unitMetricK8sDeploymentAvailablePods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetNodeDesiredScheduled,
+                                         descrMetricK8sDaemonsetNodeDesiredScheduled,
+                                         unitMetricK8sDaemonsetNodeDesiredScheduled);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sDaemonsetNodeDesiredScheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                          descrMetricK8sDeploymentAvailablePods,
-                                          unitMetricK8sDeploymentAvailablePods);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetNodeDesiredScheduled,
+                                          descrMetricK8sDaemonsetNodeDesiredScheduled,
+                                          unitMetricK8sDaemonsetNodeDesiredScheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sDaemonsetNodeDesiredScheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                   descrMetricK8sDeploymentAvailablePods,
-                                                   unitMetricK8sDeploymentAvailablePods);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetNodeDesiredScheduled,
+                                                   descrMetricK8sDaemonsetNodeDesiredScheduled,
+                                                   unitMetricK8sDaemonsetNodeDesiredScheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sDaemonsetNodeDesiredScheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                    descrMetricK8sDeploymentAvailablePods,
-                                                    unitMetricK8sDeploymentAvailablePods);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetNodeDesiredScheduled,
+                                                    descrMetricK8sDaemonsetNodeDesiredScheduled,
+                                                    unitMetricK8sDaemonsetNodeDesiredScheduled);
 }
 
 /**
-  Number of desired replica pods in this deployment.
+  Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod.
   <p>
-  This metric aligns with the @code replicas @endcode field of the
+  This metric aligns with the @code numberMisscheduled @endcode field of the
   <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
-  DeploymentSpec</a>. <p> updowncounter
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
+  DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sDeploymentDesiredPods = "k8s.deployment.desired_pods";
-static constexpr const char *descrMetricK8sDeploymentDesiredPods =
-    "Number of desired replica pods in this deployment.";
-static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
+static constexpr const char *kMetricK8sDaemonsetNodeMisscheduled =
+    "k8s.daemonset.node.misscheduled";
+static constexpr const char *descrMetricK8sDaemonsetNodeMisscheduled =
+    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod.";
+static constexpr const char *unitMetricK8sDaemonsetNodeMisscheduled = "{node}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+CreateSyncInt64MetricK8sDaemonsetNodeMisscheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                         descrMetricK8sDeploymentDesiredPods,
-                                         unitMetricK8sDeploymentDesiredPods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetNodeMisscheduled,
+                                         descrMetricK8sDaemonsetNodeMisscheduled,
+                                         unitMetricK8sDaemonsetNodeMisscheduled);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sDaemonsetNodeMisscheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                          descrMetricK8sDeploymentDesiredPods,
-                                          unitMetricK8sDeploymentDesiredPods);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetNodeMisscheduled,
+                                          descrMetricK8sDaemonsetNodeMisscheduled,
+                                          unitMetricK8sDaemonsetNodeMisscheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sDaemonsetNodeMisscheduled(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                   descrMetricK8sDeploymentDesiredPods,
-                                                   unitMetricK8sDeploymentDesiredPods);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetNodeMisscheduled,
+                                                   descrMetricK8sDaemonsetNodeMisscheduled,
+                                                   unitMetricK8sDaemonsetNodeMisscheduled);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sDaemonsetNodeMisscheduled(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                    descrMetricK8sDeploymentDesiredPods,
-                                                    unitMetricK8sDeploymentDesiredPods);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetNodeMisscheduled,
+                                                    descrMetricK8sDaemonsetNodeMisscheduled,
+                                                    unitMetricK8sDaemonsetNodeMisscheduled);
 }
 
 /**
-  Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
-  autoscaler. <p> This metric aligns with the @code currentReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> updowncounter
+  Number of nodes that should be running the daemon pod and have one or more of the daemon pod
+  running and ready. <p> This metric aligns with the @code numberReady @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
+  DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sHpaCurrentPods = "k8s.hpa.current_pods";
-static constexpr const char *descrMetricK8sHpaCurrentPods =
-    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
-    "autoscaler.";
-static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
+static constexpr const char *kMetricK8sDaemonsetNodeReady = "k8s.daemonset.node.ready";
+static constexpr const char *descrMetricK8sDaemonsetNodeReady =
+    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
+    "running and ready.";
+static constexpr const char *unitMetricK8sDaemonsetNodeReady = "{node}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
+CreateSyncInt64MetricK8sDaemonsetNodeReady(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                         unitMetricK8sHpaCurrentPods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetNodeReady,
+                                         descrMetricK8sDaemonsetNodeReady,
+                                         unitMetricK8sDaemonsetNodeReady);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sDaemonsetNodeReady(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                          unitMetricK8sHpaCurrentPods);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetNodeReady,
+                                          descrMetricK8sDaemonsetNodeReady,
+                                          unitMetricK8sDaemonsetNodeReady);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sDaemonsetNodeReady(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetNodeReady,
+                                                   descrMetricK8sDaemonsetNodeReady,
+                                                   unitMetricK8sDaemonsetNodeReady);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sDaemonsetNodeReady(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetNodeReady,
+                                                    descrMetricK8sDaemonsetNodeReady,
+                                                    unitMetricK8sDaemonsetNodeReady);
 }
 
 /**
-  Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
-  the autoscaler. <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> updowncounter
+  Deprecated, use @code k8s.daemonset.node.ready @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.daemonset.node.ready @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.daemonset.node.ready"} <p> This metric aligns with the @code numberReady
+  @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
+  DaemonSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sHpaDesiredPods = "k8s.hpa.desired_pods";
-static constexpr const char *descrMetricK8sHpaDesiredPods =
-    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
-    "by the autoscaler.";
-static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDaemonsetReadyNodes =
+    "k8s.daemonset.ready_nodes";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
+    "Deprecated, use `k8s.daemonset.node.ready` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                         unitMetricK8sHpaDesiredPods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
+                                         descrMetricK8sDaemonsetReadyNodes,
+                                         unitMetricK8sDaemonsetReadyNodes);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
+                                          descrMetricK8sDaemonsetReadyNodes,
+                                          unitMetricK8sDaemonsetReadyNodes);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
+                                                   descrMetricK8sDaemonsetReadyNodes,
+                                                   unitMetricK8sDaemonsetReadyNodes);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
+                                                    descrMetricK8sDaemonsetReadyNodes,
+                                                    unitMetricK8sDaemonsetReadyNodes);
+}
+
+/**
+  Deprecated, use @code k8s.deployment.pod.available @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.deployment.pod.available @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.deployment.pod.available"} <p> This metric aligns with the @code
+  availableReplicas @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
+  DeploymentStatus</a>. <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDeploymentAvailablePods =
+    "k8s.deployment.available_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDeploymentAvailablePods =
+    "Deprecated, use `k8s.deployment.pod.available` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDeploymentAvailablePods =
+    "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
+                                         descrMetricK8sDeploymentAvailablePods,
+                                         unitMetricK8sDeploymentAvailablePods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
+                                          descrMetricK8sDeploymentAvailablePods,
+                                          unitMetricK8sDeploymentAvailablePods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
+                                                   descrMetricK8sDeploymentAvailablePods,
+                                                   unitMetricK8sDeploymentAvailablePods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
+                                                    descrMetricK8sDeploymentAvailablePods,
+                                                    unitMetricK8sDeploymentAvailablePods);
+}
+
+/**
+  Deprecated, use @code k8s.deployment.pod.desired @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.deployment.pod.desired @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.deployment.pod.desired"} <p> This metric aligns with the @code replicas
+  @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
+  DeploymentSpec</a>. <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sDeploymentDesiredPods =
+    "k8s.deployment.desired_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sDeploymentDesiredPods =
+    "Deprecated, use `k8s.deployment.pod.desired` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
+                                         descrMetricK8sDeploymentDesiredPods,
+                                         unitMetricK8sDeploymentDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
+                                          descrMetricK8sDeploymentDesiredPods,
+                                          unitMetricK8sDeploymentDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
+                                                   descrMetricK8sDeploymentDesiredPods,
+                                                   unitMetricK8sDeploymentDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
+                                                    descrMetricK8sDeploymentDesiredPods,
+                                                    unitMetricK8sDeploymentDesiredPods);
+}
+
+/**
+  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
+  deployment. <p> This metric aligns with the @code availableReplicas @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
+  DeploymentStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sDeploymentPodAvailable = "k8s.deployment.pod.available";
+static constexpr const char *descrMetricK8sDeploymentPodAvailable =
+    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
+    "deployment.";
+static constexpr const char *unitMetricK8sDeploymentPodAvailable = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sDeploymentPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentPodAvailable,
+                                         descrMetricK8sDeploymentPodAvailable,
+                                         unitMetricK8sDeploymentPodAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sDeploymentPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentPodAvailable,
+                                          descrMetricK8sDeploymentPodAvailable,
+                                          unitMetricK8sDeploymentPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sDeploymentPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentPodAvailable,
+                                                   descrMetricK8sDeploymentPodAvailable,
+                                                   unitMetricK8sDeploymentPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sDeploymentPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentPodAvailable,
+                                                    descrMetricK8sDeploymentPodAvailable,
+                                                    unitMetricK8sDeploymentPodAvailable);
+}
+
+/**
+  Number of desired replica pods in this deployment.
+  <p>
+  This metric aligns with the @code replicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
+  DeploymentSpec</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sDeploymentPodDesired = "k8s.deployment.pod.desired";
+static constexpr const char *descrMetricK8sDeploymentPodDesired =
+    "Number of desired replica pods in this deployment.";
+static constexpr const char *unitMetricK8sDeploymentPodDesired = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sDeploymentPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentPodDesired,
+                                         descrMetricK8sDeploymentPodDesired,
+                                         unitMetricK8sDeploymentPodDesired);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sDeploymentPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentPodDesired,
+                                          descrMetricK8sDeploymentPodDesired,
+                                          unitMetricK8sDeploymentPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sDeploymentPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentPodDesired,
+                                                   descrMetricK8sDeploymentPodDesired,
+                                                   unitMetricK8sDeploymentPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sDeploymentPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentPodDesired,
+                                                    descrMetricK8sDeploymentPodDesired,
+                                                    unitMetricK8sDeploymentPodDesired);
+}
+
+/**
+  Deprecated, use @code k8s.hpa.pod.current @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.hpa.pod.current @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.hpa.pod.current"} <p> This metric aligns with the @code currentReplicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
+  HorizontalPodAutoscalerStatus</a> <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sHpaCurrentPods =
+    "k8s.hpa.current_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sHpaCurrentPods =
+    "Deprecated, use `k8s.hpa.pod.current` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
+                                         unitMetricK8sHpaCurrentPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
+                                          unitMetricK8sHpaCurrentPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
+}
+
+/**
+  Deprecated, use @code k8s.hpa.pod.desired @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.hpa.pod.desired @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.hpa.pod.desired"} <p> This metric aligns with the @code desiredReplicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
+  HorizontalPodAutoscalerStatus</a> <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sHpaDesiredPods =
+    "k8s.hpa.desired_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sHpaDesiredPods =
+    "Deprecated, use `k8s.hpa.pod.desired` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
+                                         unitMetricK8sHpaDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
                                           unitMetricK8sHpaDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(
       kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
@@ -940,41 +1376,42 @@ CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
 }
 
 /**
-  The upper limit for the number of replica pods to which the autoscaler can scale up.
-  <p>
-  This metric aligns with the @code maxReplicas @endcode field of the
-  <a
+  Deprecated, use @code k8s.hpa.pod.max @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.hpa.pod.max @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.hpa.pod.max"} <p> This metric aligns with the @code maxReplicas @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
   HorizontalPodAutoscalerSpec</a> <p> updowncounter
  */
-static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
-static constexpr const char *descrMetricK8sHpaMaxPods =
-    "The upper limit for the number of replica pods to which the autoscaler can scale up.";
-static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sHpaMaxPods =
+    "Deprecated, use `k8s.hpa.pod.max` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sHpaMaxPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
                                          unitMetricK8sHpaMaxPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sHpaMaxPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
                                           unitMetricK8sHpaMaxPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sHpaMaxPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
                                                    unitMetricK8sHpaMaxPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sHpaMaxPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
                                                     unitMetricK8sHpaMaxPods);
@@ -1136,81 +1573,246 @@ CreateAsyncDoubleMetricK8sHpaMetricTargetCpuValue(metrics::Meter *meter)
 }
 
 /**
-  The lower limit for the number of replica pods to which the autoscaler can scale down.
-  <p>
-  This metric aligns with the @code minReplicas @endcode field of the
-  <a
+  Deprecated, use @code k8s.hpa.pod.min @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.hpa.pod.min @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.hpa.pod.min"} <p> This metric aligns with the @code minReplicas @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
   HorizontalPodAutoscalerSpec</a> <p> updowncounter
  */
-static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
-static constexpr const char *descrMetricK8sHpaMinPods =
-    "The lower limit for the number of replica pods to which the autoscaler can scale down.";
-static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sHpaMinPods =
+    "Deprecated, use `k8s.hpa.pod.min` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sHpaMinPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
                                          unitMetricK8sHpaMinPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sHpaMinPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
                                           unitMetricK8sHpaMinPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sHpaMinPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
                                                    unitMetricK8sHpaMinPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sHpaMinPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
                                                     unitMetricK8sHpaMinPods);
 }
 
 /**
-  The number of pending and actively running pods for a job.
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> updowncounter
+  Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
+  autoscaler. <p> This metric aligns with the @code currentReplicas @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
+  HorizontalPodAutoscalerStatus</a> <p> updowncounter
  */
-static constexpr const char *kMetricK8sJobActivePods = "k8s.job.active_pods";
-static constexpr const char *descrMetricK8sJobActivePods =
-    "The number of pending and actively running pods for a job.";
-static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
+static constexpr const char *kMetricK8sHpaPodCurrent = "k8s.hpa.pod.current";
+static constexpr const char *descrMetricK8sHpaPodCurrent =
+    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
+    "autoscaler.";
+static constexpr const char *unitMetricK8sHpaPodCurrent = "{pod}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
+CreateSyncInt64MetricK8sHpaPodCurrent(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                         unitMetricK8sJobActivePods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaPodCurrent, descrMetricK8sHpaPodCurrent,
+                                         unitMetricK8sHpaPodCurrent);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sHpaPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaPodCurrent, descrMetricK8sHpaPodCurrent,
+                                          unitMetricK8sHpaPodCurrent);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sHpaPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sHpaPodCurrent, descrMetricK8sHpaPodCurrent, unitMetricK8sHpaPodCurrent);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sHpaPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sHpaPodCurrent, descrMetricK8sHpaPodCurrent, unitMetricK8sHpaPodCurrent);
+}
+
+/**
+  Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
+  the autoscaler. <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
+  HorizontalPodAutoscalerStatus</a> <p> updowncounter
+ */
+static constexpr const char *kMetricK8sHpaPodDesired = "k8s.hpa.pod.desired";
+static constexpr const char *descrMetricK8sHpaPodDesired =
+    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
+    "by the autoscaler.";
+static constexpr const char *unitMetricK8sHpaPodDesired = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sHpaPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaPodDesired, descrMetricK8sHpaPodDesired,
+                                         unitMetricK8sHpaPodDesired);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sHpaPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaPodDesired, descrMetricK8sHpaPodDesired,
+                                          unitMetricK8sHpaPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sHpaPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sHpaPodDesired, descrMetricK8sHpaPodDesired, unitMetricK8sHpaPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sHpaPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sHpaPodDesired, descrMetricK8sHpaPodDesired, unitMetricK8sHpaPodDesired);
+}
+
+/**
+  The upper limit for the number of replica pods to which the autoscaler can scale up.
+  <p>
+  This metric aligns with the @code maxReplicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
+  HorizontalPodAutoscalerSpec</a> <p> updowncounter
+ */
+static constexpr const char *kMetricK8sHpaPodMax = "k8s.hpa.pod.max";
+static constexpr const char *descrMetricK8sHpaPodMax =
+    "The upper limit for the number of replica pods to which the autoscaler can scale up.";
+static constexpr const char *unitMetricK8sHpaPodMax = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaPodMax(
+    metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaPodMax, descrMetricK8sHpaPodMax,
+                                         unitMetricK8sHpaPodMax);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaPodMax(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaPodMax, descrMetricK8sHpaPodMax,
+                                          unitMetricK8sHpaPodMax);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaPodMax(
+    metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaPodMax, descrMetricK8sHpaPodMax,
+                                                   unitMetricK8sHpaPodMax);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaPodMax(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaPodMax, descrMetricK8sHpaPodMax,
+                                                    unitMetricK8sHpaPodMax);
+}
+
+/**
+  The lower limit for the number of replica pods to which the autoscaler can scale down.
+  <p>
+  This metric aligns with the @code minReplicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
+  HorizontalPodAutoscalerSpec</a> <p> updowncounter
+ */
+static constexpr const char *kMetricK8sHpaPodMin = "k8s.hpa.pod.min";
+static constexpr const char *descrMetricK8sHpaPodMin =
+    "The lower limit for the number of replica pods to which the autoscaler can scale down.";
+static constexpr const char *unitMetricK8sHpaPodMin = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaPodMin(
+    metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sHpaPodMin, descrMetricK8sHpaPodMin,
+                                         unitMetricK8sHpaPodMin);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaPodMin(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaPodMin, descrMetricK8sHpaPodMin,
+                                          unitMetricK8sHpaPodMin);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaPodMin(
+    metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaPodMin, descrMetricK8sHpaPodMin,
+                                                   unitMetricK8sHpaPodMin);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaPodMin(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaPodMin, descrMetricK8sHpaPodMin,
+                                                    unitMetricK8sHpaPodMin);
+}
+
+/**
+  Deprecated, use @code k8s.job.pod.active @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.job.pod.active @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.job.pod.active"} <p> This metric aligns with the @code active @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
+  JobStatus</a>. <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sJobActivePods =
+    "k8s.job.active_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sJobActivePods =
+    "Deprecated, use `k8s.job.pod.active` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
+                                         unitMetricK8sJobActivePods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
                                           unitMetricK8sJobActivePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(
       kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
@@ -1218,19 +1820,23 @@ CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
 }
 
 /**
-  The desired number of successfully finished pods the job should be run with.
-  <p>
-  This metric aligns with the @code completions @endcode field of the
-  <a
+  Deprecated, use @code k8s.job.pod.desired_successful @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.job.pod.desired_successful @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.job.pod.desired_successful"} <p> This metric aligns with the @code completions
+  @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
   JobSpec</a>.. <p> updowncounter
  */
-static constexpr const char *kMetricK8sJobDesiredSuccessfulPods = "k8s.job.desired_successful_pods";
-static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
-    "The desired number of successfully finished pods the job should be run with.";
-static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sJobDesiredSuccessfulPods =
+    "k8s.job.desired_successful_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
+    "Deprecated, use `k8s.job.pod.desired_successful` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods =
+    "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
@@ -1238,7 +1844,7 @@ CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
                                          unitMetricK8sJobDesiredSuccessfulPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
@@ -1246,7 +1852,7 @@ CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
                                           unitMetricK8sJobDesiredSuccessfulPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
@@ -1254,7 +1860,7 @@ CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
                                                    unitMetricK8sJobDesiredSuccessfulPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
@@ -1263,46 +1869,223 @@ CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
 }
 
 /**
-  The number of pods which reached phase Failed for a job.
-  <p>
-  This metric aligns with the @code failed @endcode field of the
-  <a
+  Deprecated, use @code k8s.job.pod.failed @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.job.pod.failed @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.job.pod.failed"} <p> This metric aligns with the @code failed @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
   JobStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sJobFailedPods = "k8s.job.failed_pods";
-static constexpr const char *descrMetricK8sJobFailedPods =
-    "The number of pods which reached phase Failed for a job.";
-static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sJobFailedPods =
+    "k8s.job.failed_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sJobFailedPods =
+    "Deprecated, use `k8s.job.pod.failed` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
                                          unitMetricK8sJobFailedPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
                                           unitMetricK8sJobFailedPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(
       kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
       kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
 }
 
+/**
+  Deprecated, use @code k8s.job.pod.max_parallel @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.job.pod.max_parallel @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.job.pod.max_parallel"} <p> This metric aligns with the @code parallelism
+  @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
+  JobSpec</a>. <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sJobMaxParallelPods =
+    "k8s.job.max_parallel_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sJobMaxParallelPods =
+    "Deprecated, use `k8s.job.pod.max_parallel` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
+                                         descrMetricK8sJobMaxParallelPods,
+                                         unitMetricK8sJobMaxParallelPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
+                                          descrMetricK8sJobMaxParallelPods,
+                                          unitMetricK8sJobMaxParallelPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
+                                                   descrMetricK8sJobMaxParallelPods,
+                                                   unitMetricK8sJobMaxParallelPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
+                                                    descrMetricK8sJobMaxParallelPods,
+                                                    unitMetricK8sJobMaxParallelPods);
+}
+
+/**
+  The number of pending and actively running pods for a job.
+  <p>
+  This metric aligns with the @code active @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
+  JobStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sJobPodActive = "k8s.job.pod.active";
+static constexpr const char *descrMetricK8sJobPodActive =
+    "The number of pending and actively running pods for a job.";
+static constexpr const char *unitMetricK8sJobPodActive = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobPodActive(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobPodActive, descrMetricK8sJobPodActive,
+                                         unitMetricK8sJobPodActive);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobPodActive(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sJobPodActive, descrMetricK8sJobPodActive,
+                                          unitMetricK8sJobPodActive);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sJobPodActive(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sJobPodActive, descrMetricK8sJobPodActive, unitMetricK8sJobPodActive);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sJobPodActive(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sJobPodActive, descrMetricK8sJobPodActive, unitMetricK8sJobPodActive);
+}
+
+/**
+  The desired number of successfully finished pods the job should be run with.
+  <p>
+  This metric aligns with the @code completions @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
+  JobSpec</a>.. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sJobPodDesiredSuccessful = "k8s.job.pod.desired_successful";
+static constexpr const char *descrMetricK8sJobPodDesiredSuccessful =
+    "The desired number of successfully finished pods the job should be run with.";
+static constexpr const char *unitMetricK8sJobPodDesiredSuccessful = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobPodDesiredSuccessful(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobPodDesiredSuccessful,
+                                         descrMetricK8sJobPodDesiredSuccessful,
+                                         unitMetricK8sJobPodDesiredSuccessful);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobPodDesiredSuccessful(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sJobPodDesiredSuccessful,
+                                          descrMetricK8sJobPodDesiredSuccessful,
+                                          unitMetricK8sJobPodDesiredSuccessful);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sJobPodDesiredSuccessful(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobPodDesiredSuccessful,
+                                                   descrMetricK8sJobPodDesiredSuccessful,
+                                                   unitMetricK8sJobPodDesiredSuccessful);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sJobPodDesiredSuccessful(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobPodDesiredSuccessful,
+                                                    descrMetricK8sJobPodDesiredSuccessful,
+                                                    unitMetricK8sJobPodDesiredSuccessful);
+}
+
+/**
+  The number of pods which reached phase Failed for a job.
+  <p>
+  This metric aligns with the @code failed @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
+  JobStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sJobPodFailed = "k8s.job.pod.failed";
+static constexpr const char *descrMetricK8sJobPodFailed =
+    "The number of pods which reached phase Failed for a job.";
+static constexpr const char *unitMetricK8sJobPodFailed = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobPodFailed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobPodFailed, descrMetricK8sJobPodFailed,
+                                         unitMetricK8sJobPodFailed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobPodFailed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sJobPodFailed, descrMetricK8sJobPodFailed,
+                                          unitMetricK8sJobPodFailed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sJobPodFailed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sJobPodFailed, descrMetricK8sJobPodFailed, unitMetricK8sJobPodFailed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sJobPodFailed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sJobPodFailed, descrMetricK8sJobPodFailed, unitMetricK8sJobPodFailed);
+}
+
 /**
   The max desired number of pods the job should run at any given time.
   <p>
@@ -1311,78 +2094,117 @@ CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
   JobSpec</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sJobMaxParallelPods = "k8s.job.max_parallel_pods";
-static constexpr const char *descrMetricK8sJobMaxParallelPods =
+static constexpr const char *kMetricK8sJobPodMaxParallel = "k8s.job.pod.max_parallel";
+static constexpr const char *descrMetricK8sJobPodMaxParallel =
     "The max desired number of pods the job should run at any given time.";
-static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
+static constexpr const char *unitMetricK8sJobPodMaxParallel = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sJobPodMaxParallel(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricK8sJobPodMaxParallel, descrMetricK8sJobPodMaxParallel, unitMetricK8sJobPodMaxParallel);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sJobPodMaxParallel(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricK8sJobPodMaxParallel, descrMetricK8sJobPodMaxParallel, unitMetricK8sJobPodMaxParallel);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sJobPodMaxParallel(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sJobPodMaxParallel, descrMetricK8sJobPodMaxParallel, unitMetricK8sJobPodMaxParallel);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sJobPodMaxParallel(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sJobPodMaxParallel, descrMetricK8sJobPodMaxParallel, unitMetricK8sJobPodMaxParallel);
+}
+
+/**
+  The number of pods which reached phase Succeeded for a job.
+  <p>
+  This metric aligns with the @code succeeded @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
+  JobStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sJobPodSuccessful = "k8s.job.pod.successful";
+static constexpr const char *descrMetricK8sJobPodSuccessful =
+    "The number of pods which reached phase Succeeded for a job.";
+static constexpr const char *unitMetricK8sJobPodSuccessful = "{pod}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
+CreateSyncInt64MetricK8sJobPodSuccessful(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
-                                         descrMetricK8sJobMaxParallelPods,
-                                         unitMetricK8sJobMaxParallelPods);
+  return meter->CreateInt64UpDownCounter(kMetricK8sJobPodSuccessful, descrMetricK8sJobPodSuccessful,
+                                         unitMetricK8sJobPodSuccessful);
 }
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sJobPodSuccessful(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                          descrMetricK8sJobMaxParallelPods,
-                                          unitMetricK8sJobMaxParallelPods);
+  return meter->CreateDoubleUpDownCounter(
+      kMetricK8sJobPodSuccessful, descrMetricK8sJobPodSuccessful, unitMetricK8sJobPodSuccessful);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sJobPodSuccessful(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                   descrMetricK8sJobMaxParallelPods,
-                                                   unitMetricK8sJobMaxParallelPods);
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sJobPodSuccessful, descrMetricK8sJobPodSuccessful, unitMetricK8sJobPodSuccessful);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sJobPodSuccessful(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                    descrMetricK8sJobMaxParallelPods,
-                                                    unitMetricK8sJobMaxParallelPods);
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sJobPodSuccessful, descrMetricK8sJobPodSuccessful, unitMetricK8sJobPodSuccessful);
 }
 
 /**
-  The number of pods which reached phase Succeeded for a job.
-  <p>
-  This metric aligns with the @code succeeded @endcode field of the
-  <a
+  Deprecated, use @code k8s.job.pod.successful @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.job.pod.successful @endcode.", "reason": "renamed", "renamed_to":
+  "k8s.job.pod.successful"} <p> This metric aligns with the @code succeeded @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
   JobStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sJobSuccessfulPods = "k8s.job.successful_pods";
-static constexpr const char *descrMetricK8sJobSuccessfulPods =
-    "The number of pods which reached phase Succeeded for a job.";
-static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sJobSuccessfulPods =
+    "k8s.job.successful_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sJobSuccessfulPods =
+    "Deprecated, use `k8s.job.pod.successful` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(
       kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(
       kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(
       kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
@@ -1428,16 +2250,19 @@ CreateAsyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
 }
 
 /**
-  Amount of cpu allocatable on the node.
-  <p>
-  updowncounter
+  Deprecated, use @code k8s.node.cpu.allocatable @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.node.cpu.allocatable @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.node.cpu.allocatable"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sNodeAllocatableCpu = "k8s.node.allocatable.cpu";
-static constexpr const char *descrMetricK8sNodeAllocatableCpu =
-    "Amount of cpu allocatable on the node.";
-static constexpr const char *unitMetricK8sNodeAllocatableCpu = "{cpu}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sNodeAllocatableCpu =
+    "k8s.node.allocatable.cpu";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sNodeAllocatableCpu =
+    "Deprecated, use `k8s.node.cpu.allocatable` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sNodeAllocatableCpu = "{cpu}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sNodeAllocatableCpu(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sNodeAllocatableCpu,
@@ -1445,7 +2270,7 @@ CreateSyncInt64MetricK8sNodeAllocatableCpu(metrics::Meter *meter)
                                          unitMetricK8sNodeAllocatableCpu);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sNodeAllocatableCpu(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sNodeAllocatableCpu,
@@ -1453,7 +2278,7 @@ CreateSyncDoubleMetricK8sNodeAllocatableCpu(metrics::Meter *meter)
                                           unitMetricK8sNodeAllocatableCpu);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sNodeAllocatableCpu(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeAllocatableCpu,
@@ -1461,7 +2286,7 @@ CreateAsyncInt64MetricK8sNodeAllocatableCpu(metrics::Meter *meter)
                                                    unitMetricK8sNodeAllocatableCpu);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sNodeAllocatableCpu(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeAllocatableCpu,
@@ -1470,17 +2295,21 @@ CreateAsyncDoubleMetricK8sNodeAllocatableCpu(metrics::Meter *meter)
 }
 
 /**
-  Amount of ephemeral-storage allocatable on the node.
-  <p>
-  updowncounter
+  Deprecated, use @code k8s.node.ephemeral_storage.allocatable @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.node.ephemeral_storage.allocatable @endcode.", "reason":
+  "renamed", "renamed_to": "k8s.node.ephemeral_storage.allocatable"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sNodeAllocatableEphemeralStorage =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sNodeAllocatableEphemeralStorage =
     "k8s.node.allocatable.ephemeral_storage";
-static constexpr const char *descrMetricK8sNodeAllocatableEphemeralStorage =
-    "Amount of ephemeral-storage allocatable on the node.";
-static constexpr const char *unitMetricK8sNodeAllocatableEphemeralStorage = "By";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricK8sNodeAllocatableEphemeralStorage =
+        "Deprecated, use `k8s.node.ephemeral_storage.allocatable` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sNodeAllocatableEphemeralStorage =
+    "By";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sNodeAllocatableEphemeralStorage,
@@ -1488,7 +2317,7 @@ CreateSyncInt64MetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
                                          unitMetricK8sNodeAllocatableEphemeralStorage);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sNodeAllocatableEphemeralStorage,
@@ -1496,7 +2325,7 @@ CreateSyncDoubleMetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
                                           unitMetricK8sNodeAllocatableEphemeralStorage);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeAllocatableEphemeralStorage,
@@ -1504,7 +2333,7 @@ CreateAsyncInt64MetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
                                                    unitMetricK8sNodeAllocatableEphemeralStorage);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeAllocatableEphemeralStorage,
@@ -1513,16 +2342,19 @@ CreateAsyncDoubleMetricK8sNodeAllocatableEphemeralStorage(metrics::Meter *meter)
 }
 
 /**
-  Amount of memory allocatable on the node.
-  <p>
-  updowncounter
+  Deprecated, use @code k8s.node.memory.allocatable @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.node.memory.allocatable @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.node.memory.allocatable"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sNodeAllocatableMemory = "k8s.node.allocatable.memory";
-static constexpr const char *descrMetricK8sNodeAllocatableMemory =
-    "Amount of memory allocatable on the node.";
-static constexpr const char *unitMetricK8sNodeAllocatableMemory = "By";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sNodeAllocatableMemory =
+    "k8s.node.allocatable.memory";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sNodeAllocatableMemory =
+    "Deprecated, use `k8s.node.memory.allocatable` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sNodeAllocatableMemory = "By";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sNodeAllocatableMemory(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sNodeAllocatableMemory,
@@ -1530,7 +2362,7 @@ CreateSyncInt64MetricK8sNodeAllocatableMemory(metrics::Meter *meter)
                                          unitMetricK8sNodeAllocatableMemory);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sNodeAllocatableMemory(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sNodeAllocatableMemory,
@@ -1538,7 +2370,7 @@ CreateSyncDoubleMetricK8sNodeAllocatableMemory(metrics::Meter *meter)
                                           unitMetricK8sNodeAllocatableMemory);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sNodeAllocatableMemory(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeAllocatableMemory,
@@ -1546,7 +2378,7 @@ CreateAsyncInt64MetricK8sNodeAllocatableMemory(metrics::Meter *meter)
                                                    unitMetricK8sNodeAllocatableMemory);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sNodeAllocatableMemory(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeAllocatableMemory,
@@ -1555,16 +2387,19 @@ CreateAsyncDoubleMetricK8sNodeAllocatableMemory(metrics::Meter *meter)
 }
 
 /**
-  Amount of pods allocatable on the node.
-  <p>
-  updowncounter
+  Deprecated, use @code k8s.node.pod.allocatable @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.node.pod.allocatable @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.node.pod.allocatable"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sNodeAllocatablePods = "k8s.node.allocatable.pods";
-static constexpr const char *descrMetricK8sNodeAllocatablePods =
-    "Amount of pods allocatable on the node.";
-static constexpr const char *unitMetricK8sNodeAllocatablePods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sNodeAllocatablePods =
+    "k8s.node.allocatable.pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sNodeAllocatablePods =
+    "Deprecated, use `k8s.node.pod.allocatable` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sNodeAllocatablePods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sNodeAllocatablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sNodeAllocatablePods,
@@ -1572,7 +2407,7 @@ CreateSyncInt64MetricK8sNodeAllocatablePods(metrics::Meter *meter)
                                          unitMetricK8sNodeAllocatablePods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sNodeAllocatablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sNodeAllocatablePods,
@@ -1580,7 +2415,7 @@ CreateSyncDoubleMetricK8sNodeAllocatablePods(metrics::Meter *meter)
                                           unitMetricK8sNodeAllocatablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sNodeAllocatablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeAllocatablePods,
@@ -1588,7 +2423,7 @@ CreateAsyncInt64MetricK8sNodeAllocatablePods(metrics::Meter *meter)
                                                    unitMetricK8sNodeAllocatablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sNodeAllocatablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeAllocatablePods,
@@ -1640,6 +2475,48 @@ CreateAsyncDoubleMetricK8sNodeConditionStatus(metrics::Meter *meter)
                                                     unitMetricK8sNodeConditionStatus);
 }
 
+/**
+  Amount of cpu allocatable on the node.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sNodeCpuAllocatable = "k8s.node.cpu.allocatable";
+static constexpr const char *descrMetricK8sNodeCpuAllocatable =
+    "Amount of cpu allocatable on the node.";
+static constexpr const char *unitMetricK8sNodeCpuAllocatable = "{cpu}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeCpuAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeCpuAllocatable,
+                                         descrMetricK8sNodeCpuAllocatable,
+                                         unitMetricK8sNodeCpuAllocatable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeCpuAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeCpuAllocatable,
+                                          descrMetricK8sNodeCpuAllocatable,
+                                          unitMetricK8sNodeCpuAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeCpuAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeCpuAllocatable,
+                                                   descrMetricK8sNodeCpuAllocatable,
+                                                   unitMetricK8sNodeCpuAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeCpuAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeCpuAllocatable,
+                                                    descrMetricK8sNodeCpuAllocatable,
+                                                    unitMetricK8sNodeCpuAllocatable);
+}
+
 /**
   Total CPU time consumed.
   <p>
@@ -1722,6 +2599,49 @@ CreateAsyncDoubleMetricK8sNodeCpuUsage(metrics::Meter *meter)
                                             unitMetricK8sNodeCpuUsage);
 }
 
+/**
+  Amount of ephemeral-storage allocatable on the node.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sNodeEphemeralStorageAllocatable =
+    "k8s.node.ephemeral_storage.allocatable";
+static constexpr const char *descrMetricK8sNodeEphemeralStorageAllocatable =
+    "Amount of ephemeral-storage allocatable on the node.";
+static constexpr const char *unitMetricK8sNodeEphemeralStorageAllocatable = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeEphemeralStorageAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeEphemeralStorageAllocatable,
+                                         descrMetricK8sNodeEphemeralStorageAllocatable,
+                                         unitMetricK8sNodeEphemeralStorageAllocatable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeEphemeralStorageAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeEphemeralStorageAllocatable,
+                                          descrMetricK8sNodeEphemeralStorageAllocatable,
+                                          unitMetricK8sNodeEphemeralStorageAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeEphemeralStorageAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeEphemeralStorageAllocatable,
+                                                   descrMetricK8sNodeEphemeralStorageAllocatable,
+                                                   unitMetricK8sNodeEphemeralStorageAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeEphemeralStorageAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeEphemeralStorageAllocatable,
+                                                    descrMetricK8sNodeEphemeralStorageAllocatable,
+                                                    unitMetricK8sNodeEphemeralStorageAllocatable);
+}
+
 /**
   Node filesystem available bytes.
   <p>
@@ -1869,6 +2789,184 @@ CreateAsyncDoubleMetricK8sNodeFilesystemUsage(metrics::Meter *meter)
                                                     unitMetricK8sNodeFilesystemUsage);
 }
 
+/**
+  Amount of memory allocatable on the node.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sNodeMemoryAllocatable = "k8s.node.memory.allocatable";
+static constexpr const char *descrMetricK8sNodeMemoryAllocatable =
+    "Amount of memory allocatable on the node.";
+static constexpr const char *unitMetricK8sNodeMemoryAllocatable = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeMemoryAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeMemoryAllocatable,
+                                         descrMetricK8sNodeMemoryAllocatable,
+                                         unitMetricK8sNodeMemoryAllocatable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeMemoryAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeMemoryAllocatable,
+                                          descrMetricK8sNodeMemoryAllocatable,
+                                          unitMetricK8sNodeMemoryAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeMemoryAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeMemoryAllocatable,
+                                                   descrMetricK8sNodeMemoryAllocatable,
+                                                   unitMetricK8sNodeMemoryAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeMemoryAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeMemoryAllocatable,
+                                                    descrMetricK8sNodeMemoryAllocatable,
+                                                    unitMetricK8sNodeMemoryAllocatable);
+}
+
+/**
+  Node memory available.
+  <p>
+  Available memory for use.  This is defined as the memory limit - workingSetBytes. If memory limit
+  is undefined, the available bytes is omitted. This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.AvailableBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#NodeStats">NodeStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sNodeMemoryAvailable     = "k8s.node.memory.available";
+static constexpr const char *descrMetricK8sNodeMemoryAvailable = "Node memory available.";
+static constexpr const char *unitMetricK8sNodeMemoryAvailable  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeMemoryAvailable,
+                                         descrMetricK8sNodeMemoryAvailable,
+                                         unitMetricK8sNodeMemoryAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeMemoryAvailable,
+                                          descrMetricK8sNodeMemoryAvailable,
+                                          unitMetricK8sNodeMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeMemoryAvailable,
+                                                   descrMetricK8sNodeMemoryAvailable,
+                                                   unitMetricK8sNodeMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeMemoryAvailable,
+                                                    descrMetricK8sNodeMemoryAvailable,
+                                                    unitMetricK8sNodeMemoryAvailable);
+}
+
+/**
+  Node memory paging faults.
+  <p>
+  Cumulative number of major/minor page faults.
+  This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.PageFaults</a>
+  and <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.MajorPageFaults</a>
+  fields of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#NodeStats">NodeStats.Memory</a>
+  of the Kubelet's stats API. <p> counter
+ */
+static constexpr const char *kMetricK8sNodeMemoryPagingFaults     = "k8s.node.memory.paging.faults";
+static constexpr const char *descrMetricK8sNodeMemoryPagingFaults = "Node memory paging faults.";
+static constexpr const char *unitMetricK8sNodeMemoryPagingFaults  = "{fault}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricK8sNodeMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricK8sNodeMemoryPagingFaults,
+                                    descrMetricK8sNodeMemoryPagingFaults,
+                                    unitMetricK8sNodeMemoryPagingFaults);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricK8sNodeMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricK8sNodeMemoryPagingFaults,
+                                    descrMetricK8sNodeMemoryPagingFaults,
+                                    unitMetricK8sNodeMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricK8sNodeMemoryPagingFaults,
+                                             descrMetricK8sNodeMemoryPagingFaults,
+                                             unitMetricK8sNodeMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricK8sNodeMemoryPagingFaults,
+                                              descrMetricK8sNodeMemoryPagingFaults,
+                                              unitMetricK8sNodeMemoryPagingFaults);
+}
+
+/**
+  Node memory RSS.
+  <p>
+  The amount of anonymous and swap cache memory (includes transparent hugepages).
+  This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.RSSBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#NodeStats">NodeStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sNodeMemoryRss     = "k8s.node.memory.rss";
+static constexpr const char *descrMetricK8sNodeMemoryRss = "Node memory RSS.";
+static constexpr const char *unitMetricK8sNodeMemoryRss  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeMemoryRss, descrMetricK8sNodeMemoryRss,
+                                         unitMetricK8sNodeMemoryRss);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeMemoryRss, descrMetricK8sNodeMemoryRss,
+                                          unitMetricK8sNodeMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sNodeMemoryRss, descrMetricK8sNodeMemoryRss, unitMetricK8sNodeMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sNodeMemoryRss, descrMetricK8sNodeMemoryRss, unitMetricK8sNodeMemoryRss);
+}
+
 /**
   Memory usage of the Node.
   <p>
@@ -1885,30 +2983,76 @@ static constexpr const char *unitMetricK8sNodeMemoryUsage  = "By";
 static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeMemoryUsage(
     metrics::Meter *meter)
 {
-  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                 unitMetricK8sNodeMemoryUsage);
+  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
+                                 unitMetricK8sNodeMemoryUsage);
+}
+
+static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
+                                  unitMetricK8sNodeMemoryUsage);
+}
+#endif /* OPENTELEMETRY_ABI_VERSION_NO */
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
+                                           unitMetricK8sNodeMemoryUsage);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableGauge(
+      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
+}
+
+/**
+  Node memory working set.
+  <p>
+  The amount of working set memory. This includes recently accessed memory, dirty memory, and kernel
+  memory. WorkingSetBytes is <= UsageBytes. This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.WorkingSetBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#NodeStats">NodeStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sNodeMemoryWorkingSet     = "k8s.node.memory.working_set";
+static constexpr const char *descrMetricK8sNodeMemoryWorkingSet = "Node memory working set.";
+static constexpr const char *unitMetricK8sNodeMemoryWorkingSet  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodeMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodeMemoryWorkingSet,
+                                         descrMetricK8sNodeMemoryWorkingSet,
+                                         unitMetricK8sNodeMemoryWorkingSet);
 }
 
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodeMemoryWorkingSet(metrics::Meter *meter)
 {
-  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                  unitMetricK8sNodeMemoryUsage);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodeMemoryWorkingSet,
+                                          descrMetricK8sNodeMemoryWorkingSet,
+                                          unitMetricK8sNodeMemoryWorkingSet);
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sNodeMemoryWorkingSet(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                           unitMetricK8sNodeMemoryUsage);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodeMemoryWorkingSet,
+                                                   descrMetricK8sNodeMemoryWorkingSet,
+                                                   unitMetricK8sNodeMemoryWorkingSet);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sNodeMemoryWorkingSet(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableGauge(
-      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodeMemoryWorkingSet,
+                                                    descrMetricK8sNodeMemoryWorkingSet,
+                                                    unitMetricK8sNodeMemoryWorkingSet);
 }
 
 /**
@@ -1985,6 +3129,48 @@ CreateAsyncDoubleMetricK8sNodeNetworkIo(metrics::Meter *meter)
                                               unitMetricK8sNodeNetworkIo);
 }
 
+/**
+  Amount of pods allocatable on the node.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sNodePodAllocatable = "k8s.node.pod.allocatable";
+static constexpr const char *descrMetricK8sNodePodAllocatable =
+    "Amount of pods allocatable on the node.";
+static constexpr const char *unitMetricK8sNodePodAllocatable = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sNodePodAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sNodePodAllocatable,
+                                         descrMetricK8sNodePodAllocatable,
+                                         unitMetricK8sNodePodAllocatable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sNodePodAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sNodePodAllocatable,
+                                          descrMetricK8sNodePodAllocatable,
+                                          unitMetricK8sNodePodAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sNodePodAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sNodePodAllocatable,
+                                                   descrMetricK8sNodePodAllocatable,
+                                                   unitMetricK8sNodePodAllocatable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sNodePodAllocatable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sNodePodAllocatable,
+                                                    descrMetricK8sNodePodAllocatable,
+                                                    unitMetricK8sNodePodAllocatable);
+}
+
 /**
   The time the Node has been running.
   <p>
@@ -2256,6 +3442,142 @@ CreateAsyncDoubleMetricK8sPodFilesystemUsage(metrics::Meter *meter)
                                                     unitMetricK8sPodFilesystemUsage);
 }
 
+/**
+  Pod memory available.
+  <p>
+  Available memory for use.  This is defined as the memory limit - workingSetBytes. If memory limit
+  is undefined, the available bytes is omitted. This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.AvailableBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sPodMemoryAvailable     = "k8s.pod.memory.available";
+static constexpr const char *descrMetricK8sPodMemoryAvailable = "Pod memory available.";
+static constexpr const char *unitMetricK8sPodMemoryAvailable  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sPodMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sPodMemoryAvailable,
+                                         descrMetricK8sPodMemoryAvailable,
+                                         unitMetricK8sPodMemoryAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sPodMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sPodMemoryAvailable,
+                                          descrMetricK8sPodMemoryAvailable,
+                                          unitMetricK8sPodMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sPodMemoryAvailable,
+                                                   descrMetricK8sPodMemoryAvailable,
+                                                   unitMetricK8sPodMemoryAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodMemoryAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sPodMemoryAvailable,
+                                                    descrMetricK8sPodMemoryAvailable,
+                                                    unitMetricK8sPodMemoryAvailable);
+}
+
+/**
+  Pod memory paging faults.
+  <p>
+  Cumulative number of major/minor page faults.
+  This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.PageFaults</a>
+  and <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.MajorPageFaults</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> counter
+ */
+static constexpr const char *kMetricK8sPodMemoryPagingFaults     = "k8s.pod.memory.paging.faults";
+static constexpr const char *descrMetricK8sPodMemoryPagingFaults = "Pod memory paging faults.";
+static constexpr const char *unitMetricK8sPodMemoryPagingFaults  = "{fault}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricK8sPodMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricK8sPodMemoryPagingFaults,
+                                    descrMetricK8sPodMemoryPagingFaults,
+                                    unitMetricK8sPodMemoryPagingFaults);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricK8sPodMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricK8sPodMemoryPagingFaults,
+                                    descrMetricK8sPodMemoryPagingFaults,
+                                    unitMetricK8sPodMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricK8sPodMemoryPagingFaults,
+                                             descrMetricK8sPodMemoryPagingFaults,
+                                             unitMetricK8sPodMemoryPagingFaults);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodMemoryPagingFaults(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricK8sPodMemoryPagingFaults,
+                                              descrMetricK8sPodMemoryPagingFaults,
+                                              unitMetricK8sPodMemoryPagingFaults);
+}
+
+/**
+  Pod memory RSS.
+  <p>
+  The amount of anonymous and swap cache memory (includes transparent hugepages).
+  This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.RSSBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sPodMemoryRss     = "k8s.pod.memory.rss";
+static constexpr const char *descrMetricK8sPodMemoryRss = "Pod memory RSS.";
+static constexpr const char *unitMetricK8sPodMemoryRss  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sPodMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sPodMemoryRss, descrMetricK8sPodMemoryRss,
+                                         unitMetricK8sPodMemoryRss);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sPodMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sPodMemoryRss, descrMetricK8sPodMemoryRss,
+                                          unitMetricK8sPodMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sPodMemoryRss, descrMetricK8sPodMemoryRss, unitMetricK8sPodMemoryRss);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodMemoryRss(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sPodMemoryRss, descrMetricK8sPodMemoryRss, unitMetricK8sPodMemoryRss);
+}
+
 /**
   Memory usage of the Pod.
   <p>
@@ -2298,6 +3620,52 @@ CreateAsyncDoubleMetricK8sPodMemoryUsage(metrics::Meter *meter)
                                             unitMetricK8sPodMemoryUsage);
 }
 
+/**
+  Pod memory working set.
+  <p>
+  The amount of working set memory. This includes recently accessed memory, dirty memory, and kernel
+  memory. WorkingSetBytes is <= UsageBytes. This metric is derived from the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#MemoryStats">MemoryStats.WorkingSetBytes</a>
+  field of the <a
+  href="https://pkg.go.dev/k8s.io/kubelet@v0.34.0/pkg/apis/stats/v1alpha1#PodStats">PodStats.Memory</a>
+  of the Kubelet's stats API. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sPodMemoryWorkingSet     = "k8s.pod.memory.working_set";
+static constexpr const char *descrMetricK8sPodMemoryWorkingSet = "Pod memory working set.";
+static constexpr const char *unitMetricK8sPodMemoryWorkingSet  = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sPodMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sPodMemoryWorkingSet,
+                                         descrMetricK8sPodMemoryWorkingSet,
+                                         unitMetricK8sPodMemoryWorkingSet);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sPodMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sPodMemoryWorkingSet,
+                                          descrMetricK8sPodMemoryWorkingSet,
+                                          unitMetricK8sPodMemoryWorkingSet);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sPodMemoryWorkingSet,
+                                                   descrMetricK8sPodMemoryWorkingSet,
+                                                   unitMetricK8sPodMemoryWorkingSet);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodMemoryWorkingSet(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sPodMemoryWorkingSet,
+                                                    descrMetricK8sPodMemoryWorkingSet,
+                                                    unitMetricK8sPodMemoryWorkingSet);
+}
+
 /**
   Pod network errors.
   <p>
@@ -2372,6 +3740,88 @@ CreateAsyncDoubleMetricK8sPodNetworkIo(metrics::Meter *meter)
                                               unitMetricK8sPodNetworkIo);
 }
 
+/**
+  Describes number of K8s Pods that are currently in a given phase.
+  <p>
+  All possible pod phases will be reported at each time interval to avoid missing metrics.
+  Only the value corresponding to the current phase will be non-zero.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sPodStatusPhase = "k8s.pod.status.phase";
+static constexpr const char *descrMetricK8sPodStatusPhase =
+    "Describes number of K8s Pods that are currently in a given phase.";
+static constexpr const char *unitMetricK8sPodStatusPhase = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sPodStatusPhase(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sPodStatusPhase, descrMetricK8sPodStatusPhase,
+                                         unitMetricK8sPodStatusPhase);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sPodStatusPhase(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sPodStatusPhase, descrMetricK8sPodStatusPhase,
+                                          unitMetricK8sPodStatusPhase);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodStatusPhase(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sPodStatusPhase, descrMetricK8sPodStatusPhase, unitMetricK8sPodStatusPhase);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodStatusPhase(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sPodStatusPhase, descrMetricK8sPodStatusPhase, unitMetricK8sPodStatusPhase);
+}
+
+/**
+  Describes the number of K8s Pods that are currently in a state for a given reason.
+  <p>
+  All possible pod status reasons will be reported at each time interval to avoid missing metrics.
+  Only the value corresponding to the current reason will be non-zero.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricK8sPodStatusReason = "k8s.pod.status.reason";
+static constexpr const char *descrMetricK8sPodStatusReason =
+    "Describes the number of K8s Pods that are currently in a state for a given reason.";
+static constexpr const char *unitMetricK8sPodStatusReason = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sPodStatusReason(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sPodStatusReason, descrMetricK8sPodStatusReason,
+                                         unitMetricK8sPodStatusReason);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sPodStatusReason(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sPodStatusReason, descrMetricK8sPodStatusReason,
+                                          unitMetricK8sPodStatusReason);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sPodStatusReason(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricK8sPodStatusReason, descrMetricK8sPodStatusReason, unitMetricK8sPodStatusReason);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sPodStatusReason(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricK8sPodStatusReason, descrMetricK8sPodStatusReason, unitMetricK8sPodStatusReason);
+}
+
 /**
   The time the Pod has been running.
   <p>
@@ -2690,18 +4140,23 @@ CreateAsyncDoubleMetricK8sPodVolumeUsage(metrics::Meter *meter)
 }
 
 /**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replicaset. <p> This metric aligns with the @code availableReplicas @endcode field of the <a
+  Deprecated, use @code k8s.replicaset.pod.available @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.replicaset.pod.available @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.replicaset.pod.available"} <p> This metric aligns with the @code
+  availableReplicas @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
   ReplicaSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sReplicasetAvailablePods = "k8s.replicaset.available_pods";
-static constexpr const char *descrMetricK8sReplicasetAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replicaset.";
-static constexpr const char *unitMetricK8sReplicasetAvailablePods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicasetAvailablePods =
+    "k8s.replicaset.available_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sReplicasetAvailablePods =
+    "Deprecated, use `k8s.replicaset.pod.available` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sReplicasetAvailablePods =
+    "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetAvailablePods,
@@ -2709,7 +4164,7 @@ CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
                                          unitMetricK8sReplicasetAvailablePods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetAvailablePods,
@@ -2717,7 +4172,7 @@ CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
                                           unitMetricK8sReplicasetAvailablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
@@ -2725,7 +4180,7 @@ CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
                                                    unitMetricK8sReplicasetAvailablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
@@ -2734,19 +4189,22 @@ CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
 }
 
 /**
-  Number of desired replica pods in this replicaset.
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
+  Deprecated, use @code k8s.replicaset.pod.desired @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.replicaset.pod.desired @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.replicaset.pod.desired"} <p> This metric aligns with the @code replicas
+  @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
   ReplicaSetSpec</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sReplicasetDesiredPods = "k8s.replicaset.desired_pods";
-static constexpr const char *descrMetricK8sReplicasetDesiredPods =
-    "Number of desired replica pods in this replicaset.";
-static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicasetDesiredPods =
+    "k8s.replicaset.desired_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sReplicasetDesiredPods =
+    "Deprecated, use `k8s.replicaset.pod.desired` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetDesiredPods,
@@ -2754,42 +4212,131 @@ CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
                                          unitMetricK8sReplicasetDesiredPods);
 }
 
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
+                                          descrMetricK8sReplicasetDesiredPods,
+                                          unitMetricK8sReplicasetDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
+                                                   descrMetricK8sReplicasetDesiredPods,
+                                                   unitMetricK8sReplicasetDesiredPods);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
+                                                    descrMetricK8sReplicasetDesiredPods,
+                                                    unitMetricK8sReplicasetDesiredPods);
+}
+
+/**
+  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
+  replicaset. <p> This metric aligns with the @code availableReplicas @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
+  ReplicaSetStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sReplicasetPodAvailable = "k8s.replicaset.pod.available";
+static constexpr const char *descrMetricK8sReplicasetPodAvailable =
+    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
+    "replicaset.";
+static constexpr const char *unitMetricK8sReplicasetPodAvailable = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sReplicasetPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetPodAvailable,
+                                         descrMetricK8sReplicasetPodAvailable,
+                                         unitMetricK8sReplicasetPodAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sReplicasetPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetPodAvailable,
+                                          descrMetricK8sReplicasetPodAvailable,
+                                          unitMetricK8sReplicasetPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sReplicasetPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetPodAvailable,
+                                                   descrMetricK8sReplicasetPodAvailable,
+                                                   unitMetricK8sReplicasetPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sReplicasetPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetPodAvailable,
+                                                    descrMetricK8sReplicasetPodAvailable,
+                                                    unitMetricK8sReplicasetPodAvailable);
+}
+
+/**
+  Number of desired replica pods in this replicaset.
+  <p>
+  This metric aligns with the @code replicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
+  ReplicaSetSpec</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sReplicasetPodDesired = "k8s.replicaset.pod.desired";
+static constexpr const char *descrMetricK8sReplicasetPodDesired =
+    "Number of desired replica pods in this replicaset.";
+static constexpr const char *unitMetricK8sReplicasetPodDesired = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sReplicasetPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetPodDesired,
+                                         descrMetricK8sReplicasetPodDesired,
+                                         unitMetricK8sReplicasetPodDesired);
+}
+
 static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+CreateSyncDoubleMetricK8sReplicasetPodDesired(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                          descrMetricK8sReplicasetDesiredPods,
-                                          unitMetricK8sReplicasetDesiredPods);
+  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetPodDesired,
+                                          descrMetricK8sReplicasetPodDesired,
+                                          unitMetricK8sReplicasetPodDesired);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+CreateAsyncInt64MetricK8sReplicasetPodDesired(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                   descrMetricK8sReplicasetDesiredPods,
-                                                   unitMetricK8sReplicasetDesiredPods);
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetPodDesired,
+                                                   descrMetricK8sReplicasetPodDesired,
+                                                   unitMetricK8sReplicasetPodDesired);
 }
 
 static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
+CreateAsyncDoubleMetricK8sReplicasetPodDesired(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                    descrMetricK8sReplicasetDesiredPods,
-                                                    unitMetricK8sReplicasetDesiredPods);
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetPodDesired,
+                                                    descrMetricK8sReplicasetPodDesired,
+                                                    unitMetricK8sReplicasetPodDesired);
 }
 
 /**
-  Deprecated, use @code k8s.replicationcontroller.available_pods @endcode instead.
+  Deprecated, use @code k8s.replicationcontroller.pod.available @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.available_pods"} <p> updowncounter
+  {"note": "Replaced by @code k8s.replicationcontroller.pod.available @endcode.", "reason":
+  "renamed", "renamed_to": "k8s.replicationcontroller.pod.available"} <p> updowncounter
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods =
     "k8s.replication_controller.available_pods";
 OPENTELEMETRY_DEPRECATED static constexpr const char
     *descrMetricK8sReplicationControllerAvailablePods =
-        "Deprecated, use `k8s.replicationcontroller.available_pods` instead.";
+        "Deprecated, use `k8s.replicationcontroller.pod.available` instead.";
 OPENTELEMETRY_DEPRECATED static constexpr const char
     *unitMetricK8sReplicationControllerAvailablePods = "{pod}";
 
@@ -2827,17 +4374,17 @@ CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *met
 }
 
 /**
-  Deprecated, use @code k8s.replicationcontroller.desired_pods @endcode instead.
+  Deprecated, use @code k8s.replicationcontroller.pod.desired @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.desired_pods"} <p> updowncounter
+  {"note": "Replaced by @code k8s.replicationcontroller.pod.desired @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.replicationcontroller.pod.desired"} <p> updowncounter
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods =
     "k8s.replication_controller.desired_pods";
 OPENTELEMETRY_DEPRECATED static constexpr const char
     *descrMetricK8sReplicationControllerDesiredPods =
-        "Deprecated, use `k8s.replicationcontroller.desired_pods` instead.";
+        "Deprecated, use `k8s.replicationcontroller.pod.desired` instead.";
 OPENTELEMETRY_DEPRECATED static constexpr const char
     *unitMetricK8sReplicationControllerDesiredPods = "{pod}";
 
@@ -2874,20 +4421,21 @@ CreateAsyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter
 }
 
 /**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replication controller. <p> This metric aligns with the @code availableReplicas @endcode field of
-  the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
-  ReplicationControllerStatus</a> <p> updowncounter
+  Deprecated, use @code k8s.replicationcontroller.pod.available @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.replicationcontroller.pod.available @endcode.", "reason":
+  "renamed", "renamed_to": "k8s.replicationcontroller.pod.available"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
     "k8s.replicationcontroller.available_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replication controller.";
-static constexpr const char *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricK8sReplicationcontrollerAvailablePods =
+        "Deprecated, use `k8s.replicationcontroller.pod.available` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
@@ -2895,7 +4443,7 @@ CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter
                                          unitMetricK8sReplicationcontrollerAvailablePods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
@@ -2903,7 +4451,7 @@ CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *mete
                                           unitMetricK8sReplicationcontrollerAvailablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
@@ -2911,7 +4459,7 @@ CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *mete
                                                    unitMetricK8sReplicationcontrollerAvailablePods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(
@@ -2921,20 +4469,21 @@ CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *met
 }
 
 /**
-  Number of desired replica pods in this replication controller.
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
-  ReplicationControllerSpec</a> <p> updowncounter
+  Deprecated, use @code k8s.replicationcontroller.pod.desired @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.replicationcontroller.pod.desired @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.replicationcontroller.pod.desired"} <p> updowncounter
  */
-static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
     "k8s.replicationcontroller.desired_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerDesiredPods =
-    "Number of desired replica pods in this replication controller.";
-static constexpr const char *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *descrMetricK8sReplicationcontrollerDesiredPods =
+        "Deprecated, use `k8s.replicationcontroller.pod.desired` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char
+    *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
@@ -2942,7 +4491,7 @@ CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
                                          unitMetricK8sReplicationcontrollerDesiredPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
@@ -2950,7 +4499,7 @@ CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
                                           unitMetricK8sReplicationcontrollerDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
@@ -2958,7 +4507,7 @@ CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
                                                    unitMetricK8sReplicationcontrollerDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
@@ -2966,6 +4515,98 @@ CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter
                                                     unitMetricK8sReplicationcontrollerDesiredPods);
 }
 
+/**
+  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
+  replication controller. <p> This metric aligns with the @code availableReplicas @endcode field of
+  the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
+  ReplicationControllerStatus</a> <p> updowncounter
+ */
+static constexpr const char *kMetricK8sReplicationcontrollerPodAvailable =
+    "k8s.replicationcontroller.pod.available";
+static constexpr const char *descrMetricK8sReplicationcontrollerPodAvailable =
+    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
+    "replication controller.";
+static constexpr const char *unitMetricK8sReplicationcontrollerPodAvailable = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sReplicationcontrollerPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerPodAvailable,
+                                         descrMetricK8sReplicationcontrollerPodAvailable,
+                                         unitMetricK8sReplicationcontrollerPodAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sReplicationcontrollerPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerPodAvailable,
+                                          descrMetricK8sReplicationcontrollerPodAvailable,
+                                          unitMetricK8sReplicationcontrollerPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sReplicationcontrollerPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerPodAvailable,
+                                                   descrMetricK8sReplicationcontrollerPodAvailable,
+                                                   unitMetricK8sReplicationcontrollerPodAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sReplicationcontrollerPodAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerPodAvailable,
+                                                    descrMetricK8sReplicationcontrollerPodAvailable,
+                                                    unitMetricK8sReplicationcontrollerPodAvailable);
+}
+
+/**
+  Number of desired replica pods in this replication controller.
+  <p>
+  This metric aligns with the @code replicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
+  ReplicationControllerSpec</a> <p> updowncounter
+ */
+static constexpr const char *kMetricK8sReplicationcontrollerPodDesired =
+    "k8s.replicationcontroller.pod.desired";
+static constexpr const char *descrMetricK8sReplicationcontrollerPodDesired =
+    "Number of desired replica pods in this replication controller.";
+static constexpr const char *unitMetricK8sReplicationcontrollerPodDesired = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sReplicationcontrollerPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerPodDesired,
+                                         descrMetricK8sReplicationcontrollerPodDesired,
+                                         unitMetricK8sReplicationcontrollerPodDesired);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sReplicationcontrollerPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerPodDesired,
+                                          descrMetricK8sReplicationcontrollerPodDesired,
+                                          unitMetricK8sReplicationcontrollerPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sReplicationcontrollerPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerPodDesired,
+                                                   descrMetricK8sReplicationcontrollerPodDesired,
+                                                   unitMetricK8sReplicationcontrollerPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sReplicationcontrollerPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerPodDesired,
+                                                    descrMetricK8sReplicationcontrollerPodDesired,
+                                                    unitMetricK8sReplicationcontrollerPodDesired);
+}
+
 /**
   The CPU limits in a specific namespace.
   The value represents the configured quota limit of the resource in the namespace.
@@ -3949,19 +5590,22 @@ CreateAsyncDoubleMetricK8sResourcequotaStorageRequestUsed(metrics::Meter *meter)
 }
 
 /**
-  The number of replica pods created by the statefulset controller from the statefulset version
-  indicated by currentRevision. <p> This metric aligns with the @code currentReplicas @endcode field
-  of the <a
+  Deprecated, use @code k8s.statefulset.pod.current @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.statefulset.pod.current @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.statefulset.pod.current"} <p> This metric aligns with the @code currentReplicas
+  @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
   StatefulSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sStatefulsetCurrentPods = "k8s.statefulset.current_pods";
-static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
-    "The number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by currentRevision.";
-static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sStatefulsetCurrentPods =
+    "k8s.statefulset.current_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
+    "Deprecated, use `k8s.statefulset.pod.current` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetCurrentPods,
@@ -3969,7 +5613,7 @@ CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
                                          unitMetricK8sStatefulsetCurrentPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetCurrentPods,
@@ -3977,7 +5621,7 @@ CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
                                           unitMetricK8sStatefulsetCurrentPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
@@ -3985,7 +5629,7 @@ CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
                                                    unitMetricK8sStatefulsetCurrentPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
@@ -3994,19 +5638,22 @@ CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
 }
 
 /**
-  Number of desired replica pods in this statefulset.
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
+  Deprecated, use @code k8s.statefulset.pod.desired @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.statefulset.pod.desired @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.statefulset.pod.desired"} <p> This metric aligns with the @code replicas
+  @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
   StatefulSetSpec</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sStatefulsetDesiredPods = "k8s.statefulset.desired_pods";
-static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
-    "Number of desired replica pods in this statefulset.";
-static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sStatefulsetDesiredPods =
+    "k8s.statefulset.desired_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
+    "Deprecated, use `k8s.statefulset.pod.desired` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetDesiredPods,
@@ -4014,7 +5661,7 @@ CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
                                          unitMetricK8sStatefulsetDesiredPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetDesiredPods,
@@ -4022,7 +5669,7 @@ CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
                                           unitMetricK8sStatefulsetDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
@@ -4030,7 +5677,7 @@ CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
                                                    unitMetricK8sStatefulsetDesiredPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
@@ -4038,6 +5685,96 @@ CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
                                                     unitMetricK8sStatefulsetDesiredPods);
 }
 
+/**
+  The number of replica pods created by the statefulset controller from the statefulset version
+  indicated by currentRevision. <p> This metric aligns with the @code currentReplicas @endcode field
+  of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
+  StatefulSetStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sStatefulsetPodCurrent = "k8s.statefulset.pod.current";
+static constexpr const char *descrMetricK8sStatefulsetPodCurrent =
+    "The number of replica pods created by the statefulset controller from the statefulset version "
+    "indicated by currentRevision.";
+static constexpr const char *unitMetricK8sStatefulsetPodCurrent = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sStatefulsetPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetPodCurrent,
+                                         descrMetricK8sStatefulsetPodCurrent,
+                                         unitMetricK8sStatefulsetPodCurrent);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sStatefulsetPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetPodCurrent,
+                                          descrMetricK8sStatefulsetPodCurrent,
+                                          unitMetricK8sStatefulsetPodCurrent);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sStatefulsetPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetPodCurrent,
+                                                   descrMetricK8sStatefulsetPodCurrent,
+                                                   unitMetricK8sStatefulsetPodCurrent);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sStatefulsetPodCurrent(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetPodCurrent,
+                                                    descrMetricK8sStatefulsetPodCurrent,
+                                                    unitMetricK8sStatefulsetPodCurrent);
+}
+
+/**
+  Number of desired replica pods in this statefulset.
+  <p>
+  This metric aligns with the @code replicas @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
+  StatefulSetSpec</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sStatefulsetPodDesired = "k8s.statefulset.pod.desired";
+static constexpr const char *descrMetricK8sStatefulsetPodDesired =
+    "Number of desired replica pods in this statefulset.";
+static constexpr const char *unitMetricK8sStatefulsetPodDesired = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sStatefulsetPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetPodDesired,
+                                         descrMetricK8sStatefulsetPodDesired,
+                                         unitMetricK8sStatefulsetPodDesired);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sStatefulsetPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetPodDesired,
+                                          descrMetricK8sStatefulsetPodDesired,
+                                          unitMetricK8sStatefulsetPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sStatefulsetPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetPodDesired,
+                                                   descrMetricK8sStatefulsetPodDesired,
+                                                   unitMetricK8sStatefulsetPodDesired);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sStatefulsetPodDesired(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetPodDesired,
+                                                    descrMetricK8sStatefulsetPodDesired,
+                                                    unitMetricK8sStatefulsetPodDesired);
+}
+
 /**
   The number of replica pods created for this statefulset with a Ready Condition.
   <p>
@@ -4046,12 +5783,105 @@ CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
   StatefulSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sStatefulsetReadyPods = "k8s.statefulset.ready_pods";
-static constexpr const char *descrMetricK8sStatefulsetReadyPods =
+static constexpr const char *kMetricK8sStatefulsetPodReady = "k8s.statefulset.pod.ready";
+static constexpr const char *descrMetricK8sStatefulsetPodReady =
     "The number of replica pods created for this statefulset with a Ready Condition.";
-static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
+static constexpr const char *unitMetricK8sStatefulsetPodReady = "{pod}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sStatefulsetPodReady(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetPodReady,
+                                         descrMetricK8sStatefulsetPodReady,
+                                         unitMetricK8sStatefulsetPodReady);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sStatefulsetPodReady(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetPodReady,
+                                          descrMetricK8sStatefulsetPodReady,
+                                          unitMetricK8sStatefulsetPodReady);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sStatefulsetPodReady(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetPodReady,
+                                                   descrMetricK8sStatefulsetPodReady,
+                                                   unitMetricK8sStatefulsetPodReady);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sStatefulsetPodReady(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetPodReady,
+                                                    descrMetricK8sStatefulsetPodReady,
+                                                    unitMetricK8sStatefulsetPodReady);
+}
+
+/**
+  Number of replica pods created by the statefulset controller from the statefulset version
+  indicated by updateRevision. <p> This metric aligns with the @code updatedReplicas @endcode field
+  of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
+  StatefulSetStatus</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricK8sStatefulsetPodUpdated = "k8s.statefulset.pod.updated";
+static constexpr const char *descrMetricK8sStatefulsetPodUpdated =
+    "Number of replica pods created by the statefulset controller from the statefulset version "
+    "indicated by updateRevision.";
+static constexpr const char *unitMetricK8sStatefulsetPodUpdated = "{pod}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricK8sStatefulsetPodUpdated(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetPodUpdated,
+                                         descrMetricK8sStatefulsetPodUpdated,
+                                         unitMetricK8sStatefulsetPodUpdated);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricK8sStatefulsetPodUpdated(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetPodUpdated,
+                                          descrMetricK8sStatefulsetPodUpdated,
+                                          unitMetricK8sStatefulsetPodUpdated);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricK8sStatefulsetPodUpdated(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetPodUpdated,
+                                                   descrMetricK8sStatefulsetPodUpdated,
+                                                   unitMetricK8sStatefulsetPodUpdated);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricK8sStatefulsetPodUpdated(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetPodUpdated,
+                                                    descrMetricK8sStatefulsetPodUpdated,
+                                                    unitMetricK8sStatefulsetPodUpdated);
+}
+
+/**
+  Deprecated, use @code k8s.statefulset.pod.ready @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.statefulset.pod.ready @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.statefulset.pod.ready"} <p> This metric aligns with the @code readyReplicas
+  @endcode field of the <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
+  StatefulSetStatus</a>. <p> updowncounter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sStatefulsetReadyPods =
+    "k8s.statefulset.ready_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sStatefulsetReadyPods =
+    "Deprecated, use `k8s.statefulset.pod.ready` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetReadyPods,
@@ -4059,7 +5889,7 @@ CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
                                          unitMetricK8sStatefulsetReadyPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetReadyPods,
@@ -4067,7 +5897,7 @@ CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
                                           unitMetricK8sStatefulsetReadyPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
@@ -4075,7 +5905,7 @@ CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
                                                    unitMetricK8sStatefulsetReadyPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
@@ -4084,19 +5914,22 @@ CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
 }
 
 /**
-  Number of replica pods created by the statefulset controller from the statefulset version
-  indicated by updateRevision. <p> This metric aligns with the @code updatedReplicas @endcode field
-  of the <a
+  Deprecated, use @code k8s.statefulset.pod.updated @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code k8s.statefulset.pod.updated @endcode.", "reason": "renamed",
+  "renamed_to": "k8s.statefulset.pod.updated"} <p> This metric aligns with the @code updatedReplicas
+  @endcode field of the <a
   href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
   StatefulSetStatus</a>. <p> updowncounter
  */
-static constexpr const char *kMetricK8sStatefulsetUpdatedPods = "k8s.statefulset.updated_pods";
-static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
-    "Number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by updateRevision.";
-static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sStatefulsetUpdatedPods =
+    "k8s.statefulset.updated_pods";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
+    "Deprecated, use `k8s.statefulset.pod.updated` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetUpdatedPods,
@@ -4104,7 +5937,7 @@ CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
                                          unitMetricK8sStatefulsetUpdatedPods);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
@@ -4112,7 +5945,7 @@ CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
                                           unitMetricK8sStatefulsetUpdatedPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
@@ -4120,7 +5953,7 @@ CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
                                                    unitMetricK8sStatefulsetUpdatedPods);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/linux_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/linux_attributes.h
index 18e77516bc6..c95497a78f1 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/linux_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/linux_attributes.h
@@ -21,8 +21,13 @@ namespace linux
 
 /**
   The Linux Slab memory state
+
+  @deprecated
+  {"note": "Replaced by @code system.memory.linux.slab.state @endcode.", "reason": "renamed",
+  "renamed_to": "system.memory.linux.slab.state"}
  */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kLinuxMemorySlabState =
+    "linux.memory.slab.state";
 
 namespace LinuxMemorySlabStateValues
 {
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_attributes.h
new file mode 100644
index 00000000000..225444694b0
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_attributes.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace mcp
+{
+
+/**
+  The name of the request or notification method.
+ */
+static constexpr const char *kMcpMethodName = "mcp.method.name";
+
+/**
+  The <a href="https://modelcontextprotocol.io/specification/versioning">version</a> of the Model
+  Context Protocol used.
+ */
+static constexpr const char *kMcpProtocolVersion = "mcp.protocol.version";
+
+/**
+  The value of the resource uri.
+  <p>
+  This is a URI of the resource provided in the following requests or notifications: @code
+  resources/read @endcode, @code resources/subscribe @endcode, @code resources/unsubscribe @endcode,
+  or @code notifications/resources/updated @endcode.
+ */
+static constexpr const char *kMcpResourceUri = "mcp.resource.uri";
+
+/**
+  Identifies <a
+  href="https://modelcontextprotocol.io/specification/2025-06-18/basic/transports#session-management">MCP
+  session</a>.
+ */
+static constexpr const char *kMcpSessionId = "mcp.session.id";
+
+namespace McpMethodNameValues
+{
+/**
+  Notification cancelling a previously-issued request.
+ */
+static constexpr const char *kNotificationsCancelled = "notifications/cancelled";
+
+/**
+  Request to initialize the MCP client.
+ */
+static constexpr const char *kInitialize = "initialize";
+
+/**
+  Notification indicating that the MCP client has been initialized.
+ */
+static constexpr const char *kNotificationsInitialized = "notifications/initialized";
+
+/**
+  Notification indicating the progress for a long-running operation.
+ */
+static constexpr const char *kNotificationsProgress = "notifications/progress";
+
+/**
+  Request to check that the other party is still alive.
+ */
+static constexpr const char *kPing = "ping";
+
+/**
+  Request to list resources available on server.
+ */
+static constexpr const char *kResourcesList = "resources/list";
+
+/**
+  Request to list resource templates available on server.
+ */
+static constexpr const char *kResourcesTemplatesList = "resources/templates/list";
+
+/**
+  Request to read a resource.
+ */
+static constexpr const char *kResourcesRead = "resources/read";
+
+/**
+  Notification indicating that the list of resources has changed.
+ */
+static constexpr const char *kNotificationsResourcesListChanged =
+    "notifications/resources/list_changed";
+
+/**
+  Request to subscribe to a resource.
+ */
+static constexpr const char *kResourcesSubscribe = "resources/subscribe";
+
+/**
+  Request to unsubscribe from resource updates.
+ */
+static constexpr const char *kResourcesUnsubscribe = "resources/unsubscribe";
+
+/**
+  Notification indicating that a resource has been updated.
+ */
+static constexpr const char *kNotificationsResourcesUpdated = "notifications/resources/updated";
+
+/**
+  Request to list prompts available on server.
+ */
+static constexpr const char *kPromptsList = "prompts/list";
+
+/**
+  Request to get a prompt.
+ */
+static constexpr const char *kPromptsGet = "prompts/get";
+
+/**
+  Notification indicating that the list of prompts has changed.
+ */
+static constexpr const char *kNotificationsPromptsListChanged =
+    "notifications/prompts/list_changed";
+
+/**
+  Request to list tools available on server.
+ */
+static constexpr const char *kToolsList = "tools/list";
+
+/**
+  Request to call a tool.
+ */
+static constexpr const char *kToolsCall = "tools/call";
+
+/**
+  Notification indicating that the list of tools has changed.
+ */
+static constexpr const char *kNotificationsToolsListChanged = "notifications/tools/list_changed";
+
+/**
+  Request to set the logging level.
+ */
+static constexpr const char *kLoggingSetLevel = "logging/setLevel";
+
+/**
+  Notification indicating that a message has been received.
+ */
+static constexpr const char *kNotificationsMessage = "notifications/message";
+
+/**
+  Request to create a sampling message.
+ */
+static constexpr const char *kSamplingCreateMessage = "sampling/createMessage";
+
+/**
+  Request to complete a prompt.
+ */
+static constexpr const char *kCompletionComplete = "completion/complete";
+
+/**
+  Request to list roots available on server.
+ */
+static constexpr const char *kRootsList = "roots/list";
+
+/**
+  Notification indicating that the list of roots has changed.
+ */
+static constexpr const char *kNotificationsRootsListChanged = "notifications/roots/list_changed";
+
+/**
+  Request from the server to elicit additional information from the user via the client
+ */
+static constexpr const char *kElicitationCreate = "elicitation/create";
+
+}  // namespace McpMethodNameValues
+
+}  // namespace mcp
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_metrics.h
new file mode 100644
index 00000000000..39e95c2debf
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/mcp_metrics.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace mcp
+{
+
+/**
+  The duration of the MCP request or notification as observed on the sender from the time it was
+  sent until the response or ack is received. <p> histogram
+ */
+static constexpr const char *kMetricMcpClientOperationDuration = "mcp.client.operation.duration";
+static constexpr const char *descrMetricMcpClientOperationDuration =
+    "The duration of the MCP request or notification as observed on the sender from the time it was sent until the response or ack is received.
+    ";
+    static constexpr const char *unitMetricMcpClientOperationDuration = "s";
+
+static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricMcpClientOperationDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricMcpClientOperationDuration,
+                                      descrMetricMcpClientOperationDuration,
+                                      unitMetricMcpClientOperationDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricMcpClientOperationDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricMcpClientOperationDuration,
+                                      descrMetricMcpClientOperationDuration,
+                                      unitMetricMcpClientOperationDuration);
+}
+
+/**
+  The duration of the MCP session as observed on the MCP client.
+  <p>
+  histogram
+ */
+static constexpr const char *kMetricMcpClientSessionDuration = "mcp.client.session.duration";
+static constexpr const char *descrMetricMcpClientSessionDuration =
+    "The duration of the MCP session as observed on the MCP client.";
+static constexpr const char *unitMetricMcpClientSessionDuration = "s";
+
+static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricMcpClientSessionDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricMcpClientSessionDuration,
+                                      descrMetricMcpClientSessionDuration,
+                                      unitMetricMcpClientSessionDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricMcpClientSessionDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricMcpClientSessionDuration,
+                                      descrMetricMcpClientSessionDuration,
+                                      unitMetricMcpClientSessionDuration);
+}
+
+/**
+  MCP request or notification duration as observed on the receiver from the time it was received
+  until the result or ack is sent. <p> histogram
+ */
+static constexpr const char *kMetricMcpServerOperationDuration = "mcp.server.operation.duration";
+static constexpr const char *descrMetricMcpServerOperationDuration =
+    "MCP request or notification duration as observed on the receiver from the time it was received until the result or ack is sent.
+    ";
+    static constexpr const char *unitMetricMcpServerOperationDuration = "s";
+
+static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricMcpServerOperationDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricMcpServerOperationDuration,
+                                      descrMetricMcpServerOperationDuration,
+                                      unitMetricMcpServerOperationDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricMcpServerOperationDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricMcpServerOperationDuration,
+                                      descrMetricMcpServerOperationDuration,
+                                      unitMetricMcpServerOperationDuration);
+}
+
+/**
+  The duration of the MCP session as observed on the MCP server.
+  <p>
+  histogram
+ */
+static constexpr const char *kMetricMcpServerSessionDuration = "mcp.server.session.duration";
+static constexpr const char *descrMetricMcpServerSessionDuration =
+    "The duration of the MCP session as observed on the MCP server.";
+static constexpr const char *unitMetricMcpServerSessionDuration = "s";
+
+static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricMcpServerSessionDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricMcpServerSessionDuration,
+                                      descrMetricMcpServerSessionDuration,
+                                      unitMetricMcpServerSessionDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricMcpServerSessionDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricMcpServerSessionDuration,
+                                      descrMetricMcpServerSessionDuration,
+                                      unitMetricMcpServerSessionDuration);
+}
+
+}  // namespace mcp
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/messaging_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
index 4a3e48eac16..6bd5ae81003 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
@@ -164,8 +164,8 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGro
   Deprecated, use @code messaging.destination.partition.id @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code messaging.destination.partition.id @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.destination.partition.id"}
+  {"note": "Record string representation of the partition id in @code
+  messaging.destination.partition.id @endcode attribute.", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
     "messaging.kafka.destination.partition";
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_attributes.h
new file mode 100644
index 00000000000..41aec45907c
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_attributes.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace nfs
+{
+
+/**
+  NFSv4+ operation name.
+ */
+static constexpr const char *kNfsOperationName = "nfs.operation.name";
+
+/**
+  Linux: one of "hit" (NFSD_STATS_RC_HITS), "miss" (NFSD_STATS_RC_MISSES), or "nocache"
+  (NFSD_STATS_RC_NOCACHE -- uncacheable)
+ */
+static constexpr const char *kNfsServerRepcacheStatus = "nfs.server.repcache.status";
+
+}  // namespace nfs
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_metrics.h
new file mode 100644
index 00000000000..5d08b13bc0a
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/nfs_metrics.h
@@ -0,0 +1,692 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace nfs
+{
+
+/**
+  Reports the count of kernel NFS client TCP segments and UDP datagrams handled.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.netudpcnt and svc_stat.nettcpcnt
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientNetCount = "nfs.client.net.count";
+static constexpr const char *descrMetricNfsClientNetCount =
+    "Reports the count of kernel NFS client TCP segments and UDP datagrams handled.";
+static constexpr const char *unitMetricNfsClientNetCount = "{record}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricNfsClientNetCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientNetCount, descrMetricNfsClientNetCount,
+                                    unitMetricNfsClientNetCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricNfsClientNetCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientNetCount, descrMetricNfsClientNetCount,
+                                    unitMetricNfsClientNetCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientNetCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientNetCount, descrMetricNfsClientNetCount,
+                                             unitMetricNfsClientNetCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientNetCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricNfsClientNetCount, descrMetricNfsClientNetCount, unitMetricNfsClientNetCount);
+}
+
+/**
+  Reports the count of kernel NFS client TCP connections accepted.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.nettcpconn
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientNetTcpConnectionAccepted =
+    "nfs.client.net.tcp.connection.accepted";
+static constexpr const char *descrMetricNfsClientNetTcpConnectionAccepted =
+    "Reports the count of kernel NFS client TCP connections accepted.";
+static constexpr const char *unitMetricNfsClientNetTcpConnectionAccepted = "{connection}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsClientNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientNetTcpConnectionAccepted,
+                                    descrMetricNfsClientNetTcpConnectionAccepted,
+                                    unitMetricNfsClientNetTcpConnectionAccepted);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsClientNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientNetTcpConnectionAccepted,
+                                    descrMetricNfsClientNetTcpConnectionAccepted,
+                                    unitMetricNfsClientNetTcpConnectionAccepted);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientNetTcpConnectionAccepted,
+                                             descrMetricNfsClientNetTcpConnectionAccepted,
+                                             unitMetricNfsClientNetTcpConnectionAccepted);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsClientNetTcpConnectionAccepted,
+                                              descrMetricNfsClientNetTcpConnectionAccepted,
+                                              unitMetricNfsClientNetTcpConnectionAccepted);
+}
+
+/**
+  Reports the count of kernel NFSv4+ client operations.
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientOperationCount = "nfs.client.operation.count";
+static constexpr const char *descrMetricNfsClientOperationCount =
+    "Reports the count of kernel NFSv4+ client operations.";
+static constexpr const char *unitMetricNfsClientOperationCount = "{operation}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsClientOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientOperationCount,
+                                    descrMetricNfsClientOperationCount,
+                                    unitMetricNfsClientOperationCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsClientOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientOperationCount,
+                                    descrMetricNfsClientOperationCount,
+                                    unitMetricNfsClientOperationCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientOperationCount,
+                                             descrMetricNfsClientOperationCount,
+                                             unitMetricNfsClientOperationCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsClientOperationCount,
+                                              descrMetricNfsClientOperationCount,
+                                              unitMetricNfsClientOperationCount);
+}
+
+/**
+  Reports the count of kernel NFS client procedures.
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientProcedureCount = "nfs.client.procedure.count";
+static constexpr const char *descrMetricNfsClientProcedureCount =
+    "Reports the count of kernel NFS client procedures.";
+static constexpr const char *unitMetricNfsClientProcedureCount = "{procedure}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsClientProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientProcedureCount,
+                                    descrMetricNfsClientProcedureCount,
+                                    unitMetricNfsClientProcedureCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsClientProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientProcedureCount,
+                                    descrMetricNfsClientProcedureCount,
+                                    unitMetricNfsClientProcedureCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientProcedureCount,
+                                             descrMetricNfsClientProcedureCount,
+                                             unitMetricNfsClientProcedureCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsClientProcedureCount,
+                                              descrMetricNfsClientProcedureCount,
+                                              unitMetricNfsClientProcedureCount);
+}
+
+/**
+  Reports the count of kernel NFS client RPC authentication refreshes.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.rpcauthrefresh
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientRpcAuthrefreshCount =
+    "nfs.client.rpc.authrefresh.count";
+static constexpr const char *descrMetricNfsClientRpcAuthrefreshCount =
+    "Reports the count of kernel NFS client RPC authentication refreshes.";
+static constexpr const char *unitMetricNfsClientRpcAuthrefreshCount = "{authrefresh}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsClientRpcAuthrefreshCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientRpcAuthrefreshCount,
+                                    descrMetricNfsClientRpcAuthrefreshCount,
+                                    unitMetricNfsClientRpcAuthrefreshCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsClientRpcAuthrefreshCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientRpcAuthrefreshCount,
+                                    descrMetricNfsClientRpcAuthrefreshCount,
+                                    unitMetricNfsClientRpcAuthrefreshCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientRpcAuthrefreshCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientRpcAuthrefreshCount,
+                                             descrMetricNfsClientRpcAuthrefreshCount,
+                                             unitMetricNfsClientRpcAuthrefreshCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientRpcAuthrefreshCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsClientRpcAuthrefreshCount,
+                                              descrMetricNfsClientRpcAuthrefreshCount,
+                                              unitMetricNfsClientRpcAuthrefreshCount);
+}
+
+/**
+  Reports the count of kernel NFS client RPCs sent, regardless of whether they're accepted/rejected
+  by the server. <p> Linux: this metric is taken from the Linux kernel's svc_stat.rpccnt <p> counter
+ */
+static constexpr const char *kMetricNfsClientRpcCount = "nfs.client.rpc.count";
+static constexpr const char *descrMetricNfsClientRpcCount =
+    "Reports the count of kernel NFS client RPCs sent, regardless of whether they're "
+    "accepted/rejected by the server.";
+static constexpr const char *unitMetricNfsClientRpcCount = "{request}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricNfsClientRpcCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientRpcCount, descrMetricNfsClientRpcCount,
+                                    unitMetricNfsClientRpcCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricNfsClientRpcCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientRpcCount, descrMetricNfsClientRpcCount,
+                                    unitMetricNfsClientRpcCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientRpcCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientRpcCount, descrMetricNfsClientRpcCount,
+                                             unitMetricNfsClientRpcCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientRpcCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricNfsClientRpcCount, descrMetricNfsClientRpcCount, unitMetricNfsClientRpcCount);
+}
+
+/**
+  Reports the count of kernel NFS client RPC retransmits.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.rpcretrans
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsClientRpcRetransmitCount = "nfs.client.rpc.retransmit.count";
+static constexpr const char *descrMetricNfsClientRpcRetransmitCount =
+    "Reports the count of kernel NFS client RPC retransmits.";
+static constexpr const char *unitMetricNfsClientRpcRetransmitCount = "{retransmit}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsClientRpcRetransmitCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsClientRpcRetransmitCount,
+                                    descrMetricNfsClientRpcRetransmitCount,
+                                    unitMetricNfsClientRpcRetransmitCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsClientRpcRetransmitCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsClientRpcRetransmitCount,
+                                    descrMetricNfsClientRpcRetransmitCount,
+                                    unitMetricNfsClientRpcRetransmitCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsClientRpcRetransmitCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsClientRpcRetransmitCount,
+                                             descrMetricNfsClientRpcRetransmitCount,
+                                             unitMetricNfsClientRpcRetransmitCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsClientRpcRetransmitCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsClientRpcRetransmitCount,
+                                              descrMetricNfsClientRpcRetransmitCount,
+                                              unitMetricNfsClientRpcRetransmitCount);
+}
+
+/**
+  Reports the count of kernel NFS server stale file handles.
+  <p>
+  Linux: this metric is taken from the Linux kernel NFSD_STATS_FH_STALE counter in the nfsd_net
+  struct <p> counter
+ */
+static constexpr const char *kMetricNfsServerFhStaleCount = "nfs.server.fh.stale.count";
+static constexpr const char *descrMetricNfsServerFhStaleCount =
+    "Reports the count of kernel NFS server stale file handles.";
+static constexpr const char *unitMetricNfsServerFhStaleCount = "{fh}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsServerFhStaleCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerFhStaleCount, descrMetricNfsServerFhStaleCount,
+                                    unitMetricNfsServerFhStaleCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsServerFhStaleCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerFhStaleCount, descrMetricNfsServerFhStaleCount,
+                                    unitMetricNfsServerFhStaleCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerFhStaleCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerFhStaleCount,
+                                             descrMetricNfsServerFhStaleCount,
+                                             unitMetricNfsServerFhStaleCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerFhStaleCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerFhStaleCount,
+                                              descrMetricNfsServerFhStaleCount,
+                                              unitMetricNfsServerFhStaleCount);
+}
+
+/**
+  Reports the count of kernel NFS server bytes returned to receive and transmit (read and write)
+  requests. <p> Linux: this metric is taken from the Linux kernel NFSD_STATS_IO_READ and
+  NFSD_STATS_IO_WRITE counters in the nfsd_net struct <p> counter
+ */
+static constexpr const char *kMetricNfsServerIo = "nfs.server.io";
+static constexpr const char *descrMetricNfsServerIo =
+    "Reports the count of kernel NFS server bytes returned to receive and transmit (read and "
+    "write) requests.";
+static constexpr const char *unitMetricNfsServerIo = "By";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricNfsServerIo(
+    metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerIo, descrMetricNfsServerIo,
+                                    unitMetricNfsServerIo);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricNfsServerIo(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerIo, descrMetricNfsServerIo,
+                                    unitMetricNfsServerIo);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricNfsServerIo(
+    metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerIo, descrMetricNfsServerIo,
+                                             unitMetricNfsServerIo);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricNfsServerIo(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerIo, descrMetricNfsServerIo,
+                                              unitMetricNfsServerIo);
+}
+
+/**
+  Reports the count of kernel NFS server TCP segments and UDP datagrams handled.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.nettcpcnt and svc_stat.netudpcnt
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsServerNetCount = "nfs.server.net.count";
+static constexpr const char *descrMetricNfsServerNetCount =
+    "Reports the count of kernel NFS server TCP segments and UDP datagrams handled.";
+static constexpr const char *unitMetricNfsServerNetCount = "{record}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricNfsServerNetCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerNetCount, descrMetricNfsServerNetCount,
+                                    unitMetricNfsServerNetCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricNfsServerNetCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerNetCount, descrMetricNfsServerNetCount,
+                                    unitMetricNfsServerNetCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerNetCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerNetCount, descrMetricNfsServerNetCount,
+                                             unitMetricNfsServerNetCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerNetCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricNfsServerNetCount, descrMetricNfsServerNetCount, unitMetricNfsServerNetCount);
+}
+
+/**
+  Reports the count of kernel NFS server TCP connections accepted.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.nettcpconn
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsServerNetTcpConnectionAccepted =
+    "nfs.server.net.tcp.connection.accepted";
+static constexpr const char *descrMetricNfsServerNetTcpConnectionAccepted =
+    "Reports the count of kernel NFS server TCP connections accepted.";
+static constexpr const char *unitMetricNfsServerNetTcpConnectionAccepted = "{connection}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsServerNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerNetTcpConnectionAccepted,
+                                    descrMetricNfsServerNetTcpConnectionAccepted,
+                                    unitMetricNfsServerNetTcpConnectionAccepted);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsServerNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerNetTcpConnectionAccepted,
+                                    descrMetricNfsServerNetTcpConnectionAccepted,
+                                    unitMetricNfsServerNetTcpConnectionAccepted);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerNetTcpConnectionAccepted,
+                                             descrMetricNfsServerNetTcpConnectionAccepted,
+                                             unitMetricNfsServerNetTcpConnectionAccepted);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerNetTcpConnectionAccepted(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerNetTcpConnectionAccepted,
+                                              descrMetricNfsServerNetTcpConnectionAccepted,
+                                              unitMetricNfsServerNetTcpConnectionAccepted);
+}
+
+/**
+  Reports the count of kernel NFSv4+ server operations.
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsServerOperationCount = "nfs.server.operation.count";
+static constexpr const char *descrMetricNfsServerOperationCount =
+    "Reports the count of kernel NFSv4+ server operations.";
+static constexpr const char *unitMetricNfsServerOperationCount = "{operation}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsServerOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerOperationCount,
+                                    descrMetricNfsServerOperationCount,
+                                    unitMetricNfsServerOperationCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsServerOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerOperationCount,
+                                    descrMetricNfsServerOperationCount,
+                                    unitMetricNfsServerOperationCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerOperationCount,
+                                             descrMetricNfsServerOperationCount,
+                                             unitMetricNfsServerOperationCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerOperationCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerOperationCount,
+                                              descrMetricNfsServerOperationCount,
+                                              unitMetricNfsServerOperationCount);
+}
+
+/**
+  Reports the count of kernel NFS server procedures.
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsServerProcedureCount = "nfs.server.procedure.count";
+static constexpr const char *descrMetricNfsServerProcedureCount =
+    "Reports the count of kernel NFS server procedures.";
+static constexpr const char *unitMetricNfsServerProcedureCount = "{procedure}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsServerProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerProcedureCount,
+                                    descrMetricNfsServerProcedureCount,
+                                    unitMetricNfsServerProcedureCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsServerProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerProcedureCount,
+                                    descrMetricNfsServerProcedureCount,
+                                    unitMetricNfsServerProcedureCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerProcedureCount,
+                                             descrMetricNfsServerProcedureCount,
+                                             unitMetricNfsServerProcedureCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerProcedureCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerProcedureCount,
+                                              descrMetricNfsServerProcedureCount,
+                                              unitMetricNfsServerProcedureCount);
+}
+
+/**
+  Reports the kernel NFS server reply cache request count by cache hit status.
+  <p>
+  counter
+ */
+static constexpr const char *kMetricNfsServerRepcacheRequests = "nfs.server.repcache.requests";
+static constexpr const char *descrMetricNfsServerRepcacheRequests =
+    "Reports the kernel NFS server reply cache request count by cache hit status.";
+static constexpr const char *unitMetricNfsServerRepcacheRequests = "{request}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricNfsServerRepcacheRequests(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerRepcacheRequests,
+                                    descrMetricNfsServerRepcacheRequests,
+                                    unitMetricNfsServerRepcacheRequests);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricNfsServerRepcacheRequests(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerRepcacheRequests,
+                                    descrMetricNfsServerRepcacheRequests,
+                                    unitMetricNfsServerRepcacheRequests);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerRepcacheRequests(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerRepcacheRequests,
+                                             descrMetricNfsServerRepcacheRequests,
+                                             unitMetricNfsServerRepcacheRequests);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerRepcacheRequests(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(kMetricNfsServerRepcacheRequests,
+                                              descrMetricNfsServerRepcacheRequests,
+                                              unitMetricNfsServerRepcacheRequests);
+}
+
+/**
+  Reports the count of kernel NFS server RPCs handled.
+  <p>
+  Linux: this metric is taken from the Linux kernel's svc_stat.rpccnt, the count of good RPCs. This
+  metric can have an error.type of "format", "auth", or "client" for svc_stat.badfmt,
+  svc_stat.badauth, and svc_stat.badclnt. <p> counter
+ */
+static constexpr const char *kMetricNfsServerRpcCount = "nfs.server.rpc.count";
+static constexpr const char *descrMetricNfsServerRpcCount =
+    "Reports the count of kernel NFS server RPCs handled.";
+static constexpr const char *unitMetricNfsServerRpcCount = "{request}";
+
+static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricNfsServerRpcCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricNfsServerRpcCount, descrMetricNfsServerRpcCount,
+                                    unitMetricNfsServerRpcCount);
+}
+
+static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricNfsServerRpcCount(
+    metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricNfsServerRpcCount, descrMetricNfsServerRpcCount,
+                                    unitMetricNfsServerRpcCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerRpcCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(kMetricNfsServerRpcCount, descrMetricNfsServerRpcCount,
+                                             unitMetricNfsServerRpcCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerRpcCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricNfsServerRpcCount, descrMetricNfsServerRpcCount, unitMetricNfsServerRpcCount);
+}
+
+/**
+  Reports the count of kernel NFS server available threads.
+  <p>
+  Linux: this metric is taken from the Linux kernel nfsd_th_cnt variable
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricNfsServerThreadCount = "nfs.server.thread.count";
+static constexpr const char *descrMetricNfsServerThreadCount =
+    "Reports the count of kernel NFS server available threads.";
+static constexpr const char *unitMetricNfsServerThreadCount = "{thread}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricNfsServerThreadCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricNfsServerThreadCount, descrMetricNfsServerThreadCount, unitMetricNfsServerThreadCount);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricNfsServerThreadCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricNfsServerThreadCount, descrMetricNfsServerThreadCount, unitMetricNfsServerThreadCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricNfsServerThreadCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricNfsServerThreadCount, descrMetricNfsServerThreadCount, unitMetricNfsServerThreadCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricNfsServerThreadCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricNfsServerThreadCount, descrMetricNfsServerThreadCount, unitMetricNfsServerThreadCount);
+}
+
+}  // namespace nfs
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/onc_rpc_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/onc_rpc_attributes.h
new file mode 100644
index 00000000000..afd4487268b
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/onc_rpc_attributes.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace onc_rpc
+{
+
+/**
+  ONC/Sun RPC procedure name.
+ */
+static constexpr const char *kOncRpcProcedureName = "onc_rpc.procedure.name";
+
+/**
+  ONC/Sun RPC procedure number.
+ */
+static constexpr const char *kOncRpcProcedureNumber = "onc_rpc.procedure.number";
+
+/**
+  ONC/Sun RPC program name.
+ */
+static constexpr const char *kOncRpcProgramName = "onc_rpc.program.name";
+
+/**
+  ONC/Sun RPC program version.
+ */
+static constexpr const char *kOncRpcVersion = "onc_rpc.version";
+
+}  // namespace onc_rpc
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_attributes.h
new file mode 100644
index 00000000000..fe3f5da2c3a
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_attributes.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace openshift
+{
+
+/**
+  The name of the cluster quota.
+ */
+static constexpr const char *kOpenshiftClusterquotaName = "openshift.clusterquota.name";
+
+/**
+  The UID of the cluster quota.
+ */
+static constexpr const char *kOpenshiftClusterquotaUid = "openshift.clusterquota.uid";
+
+}  // namespace openshift
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_metrics.h
new file mode 100644
index 00000000000..f2e7ab2c268
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/openshift_metrics.h
@@ -0,0 +1,1065 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace openshift
+{
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaCpuLimitHard =
+    "openshift.clusterquota.cpu.limit.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaCpuLimitHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaCpuLimitHard = "{cpu}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaCpuLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaCpuLimitHard,
+                                         descrMetricOpenshiftClusterquotaCpuLimitHard,
+                                         unitMetricOpenshiftClusterquotaCpuLimitHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaCpuLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitHard,
+                                          descrMetricOpenshiftClusterquotaCpuLimitHard,
+                                          unitMetricOpenshiftClusterquotaCpuLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaCpuLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitHard,
+                                                   descrMetricOpenshiftClusterquotaCpuLimitHard,
+                                                   unitMetricOpenshiftClusterquotaCpuLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaCpuLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitHard,
+                                                    descrMetricOpenshiftClusterquotaCpuLimitHard,
+                                                    unitMetricOpenshiftClusterquotaCpuLimitHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaCpuLimitUsed =
+    "openshift.clusterquota.cpu.limit.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaCpuLimitUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaCpuLimitUsed = "{cpu}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaCpuLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaCpuLimitUsed,
+                                         descrMetricOpenshiftClusterquotaCpuLimitUsed,
+                                         unitMetricOpenshiftClusterquotaCpuLimitUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaCpuLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitUsed,
+                                          descrMetricOpenshiftClusterquotaCpuLimitUsed,
+                                          unitMetricOpenshiftClusterquotaCpuLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaCpuLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitUsed,
+                                                   descrMetricOpenshiftClusterquotaCpuLimitUsed,
+                                                   unitMetricOpenshiftClusterquotaCpuLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaCpuLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuLimitUsed,
+                                                    descrMetricOpenshiftClusterquotaCpuLimitUsed,
+                                                    unitMetricOpenshiftClusterquotaCpuLimitUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaCpuRequestHard =
+    "openshift.clusterquota.cpu.request.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaCpuRequestHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaCpuRequestHard = "{cpu}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaCpuRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaCpuRequestHard,
+                                         descrMetricOpenshiftClusterquotaCpuRequestHard,
+                                         unitMetricOpenshiftClusterquotaCpuRequestHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaCpuRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestHard,
+                                          descrMetricOpenshiftClusterquotaCpuRequestHard,
+                                          unitMetricOpenshiftClusterquotaCpuRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaCpuRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestHard,
+                                                   descrMetricOpenshiftClusterquotaCpuRequestHard,
+                                                   unitMetricOpenshiftClusterquotaCpuRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaCpuRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestHard,
+                                                    descrMetricOpenshiftClusterquotaCpuRequestHard,
+                                                    unitMetricOpenshiftClusterquotaCpuRequestHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaCpuRequestUsed =
+    "openshift.clusterquota.cpu.request.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaCpuRequestUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaCpuRequestUsed = "{cpu}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaCpuRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaCpuRequestUsed,
+                                         descrMetricOpenshiftClusterquotaCpuRequestUsed,
+                                         unitMetricOpenshiftClusterquotaCpuRequestUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaCpuRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestUsed,
+                                          descrMetricOpenshiftClusterquotaCpuRequestUsed,
+                                          unitMetricOpenshiftClusterquotaCpuRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaCpuRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestUsed,
+                                                   descrMetricOpenshiftClusterquotaCpuRequestUsed,
+                                                   unitMetricOpenshiftClusterquotaCpuRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaCpuRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaCpuRequestUsed,
+                                                    descrMetricOpenshiftClusterquotaCpuRequestUsed,
+                                                    unitMetricOpenshiftClusterquotaCpuRequestUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaEphemeralStorageLimitHard =
+    "openshift.clusterquota.ephemeral_storage.limit.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaEphemeralStorageLimitHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaEphemeralStorageLimitHard = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaEphemeralStorageLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+                                         descrMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+                                         unitMetricOpenshiftClusterquotaEphemeralStorageLimitHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaEphemeralStorageLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+                                          descrMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+                                          unitMetricOpenshiftClusterquotaEphemeralStorageLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaEphemeralStorageLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaEphemeralStorageLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageLimitHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageLimitHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaEphemeralStorageLimitUsed =
+    "openshift.clusterquota.ephemeral_storage.limit.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaEphemeralStorageLimitUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaEphemeralStorageLimitUsed = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaEphemeralStorageLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+                                         descrMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+                                         unitMetricOpenshiftClusterquotaEphemeralStorageLimitUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaEphemeralStorageLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+                                          descrMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+                                          unitMetricOpenshiftClusterquotaEphemeralStorageLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaEphemeralStorageLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaEphemeralStorageLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageLimitUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageLimitUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaEphemeralStorageRequestHard =
+    "openshift.clusterquota.ephemeral_storage.request.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaEphemeralStorageRequestHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaEphemeralStorageRequestHard = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaEphemeralStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaEphemeralStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaEphemeralStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaEphemeralStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestHard,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaEphemeralStorageRequestUsed =
+    "openshift.clusterquota.ephemeral_storage.request.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaEphemeralStorageRequestUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaEphemeralStorageRequestUsed = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaEphemeralStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaEphemeralStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaEphemeralStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaEphemeralStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaEphemeralStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaEphemeralStorageRequestUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaHugepageCountRequestHard =
+    "openshift.clusterquota.hugepage_count.request.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaHugepageCountRequestHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaHugepageCountRequestHard =
+        "{hugepage}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaHugepageCountRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaHugepageCountRequestHard,
+                                         descrMetricOpenshiftClusterquotaHugepageCountRequestHard,
+                                         unitMetricOpenshiftClusterquotaHugepageCountRequestHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaHugepageCountRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaHugepageCountRequestHard,
+                                          descrMetricOpenshiftClusterquotaHugepageCountRequestHard,
+                                          unitMetricOpenshiftClusterquotaHugepageCountRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaHugepageCountRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaHugepageCountRequestHard,
+      descrMetricOpenshiftClusterquotaHugepageCountRequestHard,
+      unitMetricOpenshiftClusterquotaHugepageCountRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaHugepageCountRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaHugepageCountRequestHard,
+      descrMetricOpenshiftClusterquotaHugepageCountRequestHard,
+      unitMetricOpenshiftClusterquotaHugepageCountRequestHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaHugepageCountRequestUsed =
+    "openshift.clusterquota.hugepage_count.request.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaHugepageCountRequestUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaHugepageCountRequestUsed =
+        "{hugepage}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaHugepageCountRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+                                         descrMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+                                         unitMetricOpenshiftClusterquotaHugepageCountRequestUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaHugepageCountRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+                                          descrMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+                                          unitMetricOpenshiftClusterquotaHugepageCountRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaHugepageCountRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+      descrMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+      unitMetricOpenshiftClusterquotaHugepageCountRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaHugepageCountRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+      descrMetricOpenshiftClusterquotaHugepageCountRequestUsed,
+      unitMetricOpenshiftClusterquotaHugepageCountRequestUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaMemoryLimitHard =
+    "openshift.clusterquota.memory.limit.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaMemoryLimitHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaMemoryLimitHard = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaMemoryLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitHard,
+                                         descrMetricOpenshiftClusterquotaMemoryLimitHard,
+                                         unitMetricOpenshiftClusterquotaMemoryLimitHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaMemoryLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitHard,
+                                          descrMetricOpenshiftClusterquotaMemoryLimitHard,
+                                          unitMetricOpenshiftClusterquotaMemoryLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaMemoryLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitHard,
+                                                   descrMetricOpenshiftClusterquotaMemoryLimitHard,
+                                                   unitMetricOpenshiftClusterquotaMemoryLimitHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaMemoryLimitHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitHard,
+                                                    descrMetricOpenshiftClusterquotaMemoryLimitHard,
+                                                    unitMetricOpenshiftClusterquotaMemoryLimitHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaMemoryLimitUsed =
+    "openshift.clusterquota.memory.limit.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaMemoryLimitUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaMemoryLimitUsed = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaMemoryLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                         descrMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                         unitMetricOpenshiftClusterquotaMemoryLimitUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaMemoryLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                          descrMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                          unitMetricOpenshiftClusterquotaMemoryLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaMemoryLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                                   descrMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                                   unitMetricOpenshiftClusterquotaMemoryLimitUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaMemoryLimitUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                                    descrMetricOpenshiftClusterquotaMemoryLimitUsed,
+                                                    unitMetricOpenshiftClusterquotaMemoryLimitUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaMemoryRequestHard =
+    "openshift.clusterquota.memory.request.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaMemoryRequestHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaMemoryRequestHard = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaMemoryRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaMemoryRequestHard,
+                                         descrMetricOpenshiftClusterquotaMemoryRequestHard,
+                                         unitMetricOpenshiftClusterquotaMemoryRequestHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaMemoryRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaMemoryRequestHard,
+                                          descrMetricOpenshiftClusterquotaMemoryRequestHard,
+                                          unitMetricOpenshiftClusterquotaMemoryRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaMemoryRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaMemoryRequestHard,
+      descrMetricOpenshiftClusterquotaMemoryRequestHard,
+      unitMetricOpenshiftClusterquotaMemoryRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaMemoryRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaMemoryRequestHard,
+      descrMetricOpenshiftClusterquotaMemoryRequestHard,
+      unitMetricOpenshiftClusterquotaMemoryRequestHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaMemoryRequestUsed =
+    "openshift.clusterquota.memory.request.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaMemoryRequestUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaMemoryRequestUsed = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaMemoryRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaMemoryRequestUsed,
+                                         descrMetricOpenshiftClusterquotaMemoryRequestUsed,
+                                         unitMetricOpenshiftClusterquotaMemoryRequestUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaMemoryRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaMemoryRequestUsed,
+                                          descrMetricOpenshiftClusterquotaMemoryRequestUsed,
+                                          unitMetricOpenshiftClusterquotaMemoryRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaMemoryRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaMemoryRequestUsed,
+      descrMetricOpenshiftClusterquotaMemoryRequestUsed,
+      unitMetricOpenshiftClusterquotaMemoryRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaMemoryRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaMemoryRequestUsed,
+      descrMetricOpenshiftClusterquotaMemoryRequestUsed,
+      unitMetricOpenshiftClusterquotaMemoryRequestUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaObjectCountHard =
+    "openshift.clusterquota.object_count.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaObjectCountHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaObjectCountHard = "{object}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaObjectCountHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaObjectCountHard,
+                                         descrMetricOpenshiftClusterquotaObjectCountHard,
+                                         unitMetricOpenshiftClusterquotaObjectCountHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaObjectCountHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaObjectCountHard,
+                                          descrMetricOpenshiftClusterquotaObjectCountHard,
+                                          unitMetricOpenshiftClusterquotaObjectCountHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaObjectCountHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaObjectCountHard,
+                                                   descrMetricOpenshiftClusterquotaObjectCountHard,
+                                                   unitMetricOpenshiftClusterquotaObjectCountHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaObjectCountHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaObjectCountHard,
+                                                    descrMetricOpenshiftClusterquotaObjectCountHard,
+                                                    unitMetricOpenshiftClusterquotaObjectCountHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaObjectCountUsed =
+    "openshift.clusterquota.object_count.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaObjectCountUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaObjectCountUsed = "{object}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaObjectCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaObjectCountUsed,
+                                         descrMetricOpenshiftClusterquotaObjectCountUsed,
+                                         unitMetricOpenshiftClusterquotaObjectCountUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaObjectCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaObjectCountUsed,
+                                          descrMetricOpenshiftClusterquotaObjectCountUsed,
+                                          unitMetricOpenshiftClusterquotaObjectCountUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaObjectCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricOpenshiftClusterquotaObjectCountUsed,
+                                                   descrMetricOpenshiftClusterquotaObjectCountUsed,
+                                                   unitMetricOpenshiftClusterquotaObjectCountUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaObjectCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricOpenshiftClusterquotaObjectCountUsed,
+                                                    descrMetricOpenshiftClusterquotaObjectCountUsed,
+                                                    unitMetricOpenshiftClusterquotaObjectCountUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  The @code k8s.storageclass.name @endcode should be required when a resource quota is defined for a
+  specific storage class. <p> updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard =
+    "openshift.clusterquota.persistentvolumeclaim_count.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard =
+        "{persistentvolumeclaim}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaPersistentvolumeclaimCountHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaPersistentvolumeclaimCountHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  The @code k8s.storageclass.name @endcode should be required when a resource quota is defined for a
+  specific storage class. <p> updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed =
+    "openshift.clusterquota.persistentvolumeclaim_count.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed =
+        "{persistentvolumeclaim}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      descrMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed,
+      unitMetricOpenshiftClusterquotaPersistentvolumeclaimCountUsed);
+}
+
+/**
+  The enforced hard limit of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Hard @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  The @code k8s.storageclass.name @endcode should be required when a resource quota is defined for a
+  specific storage class. <p> updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaStorageRequestHard =
+    "openshift.clusterquota.storage.request.hard";
+static constexpr const char *descrMetricOpenshiftClusterquotaStorageRequestHard =
+    "The enforced hard limit of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaStorageRequestHard = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaStorageRequestHard,
+                                         descrMetricOpenshiftClusterquotaStorageRequestHard,
+                                         unitMetricOpenshiftClusterquotaStorageRequestHard);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaStorageRequestHard,
+                                          descrMetricOpenshiftClusterquotaStorageRequestHard,
+                                          unitMetricOpenshiftClusterquotaStorageRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaStorageRequestHard,
+      descrMetricOpenshiftClusterquotaStorageRequestHard,
+      unitMetricOpenshiftClusterquotaStorageRequestHard);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaStorageRequestHard(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaStorageRequestHard,
+      descrMetricOpenshiftClusterquotaStorageRequestHard,
+      unitMetricOpenshiftClusterquotaStorageRequestHard);
+}
+
+/**
+  The current observed total usage of the resource across all projects.
+  <p>
+  This metric is retrieved from the @code Status.Total.Used @endcode field of the
+  <a
+  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcequotastatus-v1-core">K8s
+  ResourceQuotaStatus</a> of the <a
+  href="https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#status-total">ClusterResourceQuota</a>.
+  <p>
+  The @code k8s.storageclass.name @endcode should be required when a resource quota is defined for a
+  specific storage class. <p> updowncounter
+ */
+static constexpr const char *kMetricOpenshiftClusterquotaStorageRequestUsed =
+    "openshift.clusterquota.storage.request.used";
+static constexpr const char *descrMetricOpenshiftClusterquotaStorageRequestUsed =
+    "The current observed total usage of the resource across all projects.
+    ";
+    static constexpr const char *unitMetricOpenshiftClusterquotaStorageRequestUsed = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricOpenshiftClusterquotaStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricOpenshiftClusterquotaStorageRequestUsed,
+                                         descrMetricOpenshiftClusterquotaStorageRequestUsed,
+                                         unitMetricOpenshiftClusterquotaStorageRequestUsed);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricOpenshiftClusterquotaStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricOpenshiftClusterquotaStorageRequestUsed,
+                                          descrMetricOpenshiftClusterquotaStorageRequestUsed,
+                                          unitMetricOpenshiftClusterquotaStorageRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricOpenshiftClusterquotaStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaStorageRequestUsed);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricOpenshiftClusterquotaStorageRequestUsed(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(
+      kMetricOpenshiftClusterquotaStorageRequestUsed,
+      descrMetricOpenshiftClusterquotaStorageRequestUsed,
+      unitMetricOpenshiftClusterquotaStorageRequestUsed);
+}
+
+}  // namespace openshift
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/otel_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/otel_attributes.h
index 20f7bd7786c..b86826a4df3 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/otel_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/otel_attributes.h
@@ -46,6 +46,16 @@ static constexpr const char *kOtelComponentName = "otel.component.name";
  */
 static constexpr const char *kOtelComponentType = "otel.component.type";
 
+/**
+  Identifies the class / type of event.
+  <p>
+  This attribute SHOULD be used by non-OTLP exporters when destination does not support @code
+  EventName @endcode or equivalent field. This attribute MAY be used by applications using existing
+  logging libraries so that it can be used to set the @code EventName @endcode field by Collector or
+  SDK components.
+ */
+static constexpr const char *kOtelEventName = "otel.event.name";
+
 /**
   Deprecated. Use the @code otel.scope.name @endcode attribute
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/peer_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/peer_attributes.h
index acc6621d24d..0f061ff9057 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/peer_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/peer_attributes.h
@@ -23,8 +23,17 @@ namespace peer
   The <a href="/docs/resource/README.md#service">@code service.name @endcode</a> of the remote
   service. SHOULD be equal to the actual @code service.name @endcode resource attribute of the
   remote service if any.
+
+  @deprecated
+  {"note": "Replaced by @code service.peer.name @endcode.", "reason": "renamed", "renamed_to":
+  "service.peer.name"} <p> Examples of @code peer.service @endcode that users may specify: <ul>
+    <li>A Redis cache of auth tokens as @code peer.service="AuthTokenCache" @endcode.</li>
+    <li>A gRPC service @code rpc.service="io.opentelemetry.AuthService" @endcode may be hosted in
+  both a gateway, @code peer.service="ExternalApiService" @endcode and a backend, @code
+  peer.service="AuthService" @endcode.</li>
+  </ul>
  */
-static constexpr const char *kPeerService = "peer.service";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kPeerService = "peer.service";
 
 }  // namespace peer
 }  // namespace semconv
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/pprof_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/pprof_attributes.h
new file mode 100644
index 00000000000..23c0370308b
--- /dev/null
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/pprof_attributes.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * DO NOT EDIT, this is an Auto-generated file from:
+ * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+ */
+
+#pragma once
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace semconv
+{
+namespace pprof
+{
+
+/**
+  Provides an indication that multiple symbols map to this location's address, for example due to
+  identical code folding by the linker. In that case the line information represents one of the
+  multiple symbols. This field must be recomputed when the symbolization state of the profile
+  changes.
+ */
+static constexpr const char *kPprofLocationIsFolded = "pprof.location.is_folded";
+
+/**
+  Indicates that there are filenames related to this mapping.
+ */
+static constexpr const char *kPprofMappingHasFilenames = "pprof.mapping.has_filenames";
+
+/**
+  Indicates that there are functions related to this mapping.
+ */
+static constexpr const char *kPprofMappingHasFunctions = "pprof.mapping.has_functions";
+
+/**
+  Indicates that there are inline frames related to this mapping.
+ */
+static constexpr const char *kPprofMappingHasInlineFrames = "pprof.mapping.has_inline_frames";
+
+/**
+  Indicates that there are line numbers related to this mapping.
+ */
+static constexpr const char *kPprofMappingHasLineNumbers = "pprof.mapping.has_line_numbers";
+
+/**
+  Free-form text associated with the profile. This field should not be used to store any
+  machine-readable information, it is only for human-friendly content.
+ */
+static constexpr const char *kPprofProfileComment = "pprof.profile.comment";
+
+/**
+  Documentation link for this profile type.
+  <p>
+  The URL must be absolute and may be missing if the profile was generated by code that did not
+  supply a link
+ */
+static constexpr const char *kPprofProfileDocUrl = "pprof.profile.doc_url";
+
+/**
+  Frames with Function.function_name fully matching the regexp will be dropped from the samples,
+  along with their successors.
+ */
+static constexpr const char *kPprofProfileDropFrames = "pprof.profile.drop_frames";
+
+/**
+  Frames with Function.function_name fully matching the regexp will be kept, even if it matches
+  drop_frames.
+ */
+static constexpr const char *kPprofProfileKeepFrames = "pprof.profile.keep_frames";
+
+}  // namespace pprof
+}  // namespace semconv
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_attributes.h
index b6a8bd1d024..8b2f0b986ab 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_attributes.h
@@ -54,7 +54,7 @@ static constexpr const char *kProcessCommandLine = "process.command_line";
 /**
   Specifies whether the context switches for this data point were voluntary or involuntary.
  */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
+static constexpr const char *kProcessContextSwitchType = "process.context_switch.type";
 
 /**
   Deprecated, use @code cpu.mode @endcode instead.
@@ -158,10 +158,14 @@ static constexpr const char *kProcessLinuxCgroup = "process.linux.cgroup";
 static constexpr const char *kProcessOwner = "process.owner";
 
 /**
-  The type of page fault for this data point. Type @code major @endcode is for major/hard page
-  faults, and @code minor @endcode is for minor/soft page faults.
+  Deprecated, use @code system.paging.fault.type @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code system.paging.fault.type @endcode.", "reason": "renamed",
+  "renamed_to": "system.paging.fault.type"}
  */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessPagingFaultType =
+    "process.paging.fault_type";
 
 /**
   Parent Process identifier (PPID).
@@ -214,6 +218,13 @@ static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
  */
 static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
 
+/**
+  The process state, e.g., <a
+  href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
+  Codes</a>
+ */
+static constexpr const char *kProcessState = "process.state";
+
 /**
   Process title (proctitle)
   <p>
@@ -274,6 +285,19 @@ static constexpr const char *kMinor = "minor";
 
 }  // namespace ProcessPagingFaultTypeValues
 
+namespace ProcessStateValues
+{
+
+static constexpr const char *kRunning = "running";
+
+static constexpr const char *kSleeping = "sleeping";
+
+static constexpr const char *kStopped = "stopped";
+
+static constexpr const char *kDefunct = "defunct";
+
+}  // namespace ProcessStateValues
+
 }  // namespace process
 }  // namespace semconv
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_metrics.h
index 0f1a783f76c..83e16f42310 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_metrics.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/process_metrics.h
@@ -294,17 +294,20 @@ CreateAsyncDoubleMetricProcessNetworkIo(metrics::Meter *meter)
 }
 
 /**
-  Number of file descriptors in use by the process.
-  <p>
-  updowncounter
+  Deprecated, use @code process.unix.file_descriptor.count @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code process.unix.file_descriptor.count @endcode.", "reason": "renamed",
+  "renamed_to": "process.unix.file_descriptor.count"} <p> updowncounter
  */
-static constexpr const char *kMetricProcessOpenFileDescriptorCount =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricProcessOpenFileDescriptorCount =
     "process.open_file_descriptor.count";
-static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
-    "Number of file descriptors in use by the process.";
-static constexpr const char *unitMetricProcessOpenFileDescriptorCount = "{file_descriptor}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
+    "Deprecated, use `process.unix.file_descriptor.count` instead.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricProcessOpenFileDescriptorCount =
+    "{file_descriptor}";
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
 CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
 {
   return meter->CreateInt64UpDownCounter(kMetricProcessOpenFileDescriptorCount,
@@ -312,7 +315,7 @@ CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
                                          unitMetricProcessOpenFileDescriptorCount);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
 CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
 {
   return meter->CreateDoubleUpDownCounter(kMetricProcessOpenFileDescriptorCount,
@@ -320,7 +323,7 @@ CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
                                           unitMetricProcessOpenFileDescriptorCount);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
 {
   return meter->CreateInt64ObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
@@ -328,7 +331,7 @@ CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
                                                    unitMetricProcessOpenFileDescriptorCount);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
 {
   return meter->CreateDoubleObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
@@ -411,6 +414,49 @@ CreateAsyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
       kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
 }
 
+/**
+  Number of unix file descriptors in use by the process.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricProcessUnixFileDescriptorCount =
+    "process.unix.file_descriptor.count";
+static constexpr const char *descrMetricProcessUnixFileDescriptorCount =
+    "Number of unix file descriptors in use by the process.";
+static constexpr const char *unitMetricProcessUnixFileDescriptorCount = "{file_descriptor}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricProcessUnixFileDescriptorCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricProcessUnixFileDescriptorCount,
+                                         descrMetricProcessUnixFileDescriptorCount,
+                                         unitMetricProcessUnixFileDescriptorCount);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricProcessUnixFileDescriptorCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricProcessUnixFileDescriptorCount,
+                                          descrMetricProcessUnixFileDescriptorCount,
+                                          unitMetricProcessUnixFileDescriptorCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricProcessUnixFileDescriptorCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessUnixFileDescriptorCount,
+                                                   descrMetricProcessUnixFileDescriptorCount,
+                                                   unitMetricProcessUnixFileDescriptorCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricProcessUnixFileDescriptorCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessUnixFileDescriptorCount,
+                                                    descrMetricProcessUnixFileDescriptorCount,
+                                                    unitMetricProcessUnixFileDescriptorCount);
+}
+
 /**
   The time the process has been running.
   <p>
@@ -453,6 +499,48 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
                                             unitMetricProcessUptime);
 }
 
+/**
+  Number of handles held by the process.
+  <p>
+  updowncounter
+ */
+static constexpr const char *kMetricProcessWindowsHandleCount = "process.windows.handle.count";
+static constexpr const char *descrMetricProcessWindowsHandleCount =
+    "Number of handles held by the process.";
+static constexpr const char *unitMetricProcessWindowsHandleCount = "{handle}";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricProcessWindowsHandleCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricProcessWindowsHandleCount,
+                                         descrMetricProcessWindowsHandleCount,
+                                         unitMetricProcessWindowsHandleCount);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricProcessWindowsHandleCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricProcessWindowsHandleCount,
+                                          descrMetricProcessWindowsHandleCount,
+                                          unitMetricProcessWindowsHandleCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricProcessWindowsHandleCount(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessWindowsHandleCount,
+                                                   descrMetricProcessWindowsHandleCount,
+                                                   unitMetricProcessWindowsHandleCount);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricProcessWindowsHandleCount(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessWindowsHandleCount,
+                                                    descrMetricProcessWindowsHandleCount,
+                                                    unitMetricProcessWindowsHandleCount);
+}
+
 }  // namespace process
 }  // namespace semconv
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_attributes.h
index 8a85fe46970..7c016bf898b 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_attributes.h
@@ -20,85 +20,105 @@ namespace rpc
 {
 
 /**
-  The <a href="https://connectrpc.com//docs/protocol/#error-codes">error codes</a> of the Connect
-  request. Error codes are always string values.
+  Deprecated, use @code rpc.response.status_code @endcode attribute instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.response.status_code @endcode.", "reason": "renamed",
+  "renamed_to": "rpc.response.status_code"}
  */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcConnectRpcErrorCode =
+    "rpc.connect_rpc.error_code";
 
 /**
-  Connect request metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all request metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.request.metadata.my-custom-key @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode
+  Deprecated, use @code rpc.request.metadata @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.request.metadata @endcode.", "reason": "renamed", "renamed_to":
+  "rpc.request.metadata"}
  */
-static constexpr const char *kRpcConnectRpcRequestMetadata = "rpc.connect_rpc.request.metadata";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcConnectRpcRequestMetadata =
+    "rpc.connect_rpc.request.metadata";
 
 /**
-  Connect response metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all response metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code "attribute_value" @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.response.metadata.my-custom-key @endcode attribute
-  with value @code ["attribute_value"] @endcode
+  Deprecated, use @code rpc.response.metadata @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.response.metadata @endcode.", "reason": "renamed", "renamed_to":
+  "rpc.response.metadata"}
  */
-static constexpr const char *kRpcConnectRpcResponseMetadata = "rpc.connect_rpc.response.metadata";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcConnectRpcResponseMetadata =
+    "rpc.connect_rpc.response.metadata";
 
 /**
-  gRPC request metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all request metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode SHOULD be
-  recorded as
-  @code rpc.grpc.request.metadata.my-custom-key @endcode attribute with value @code ["1.2.3.4",
-  "1.2.3.5"] @endcode
+  Deprecated, use @code rpc.request.metadata @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.request.metadata @endcode.", "reason": "renamed", "renamed_to":
+  "rpc.request.metadata"}
  */
-static constexpr const char *kRpcGrpcRequestMetadata = "rpc.grpc.request.metadata";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcGrpcRequestMetadata =
+    "rpc.grpc.request.metadata";
 
 /**
-  gRPC response metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all response metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["attribute_value"] @endcode SHOULD be
-  recorded as the @code rpc.grpc.response.metadata.my-custom-key @endcode attribute with value @code
-  ["attribute_value"] @endcode
+  Deprecated, use @code rpc.response.metadata @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.response.metadata @endcode.", "reason": "renamed", "renamed_to":
+  "rpc.response.metadata"}
  */
-static constexpr const char *kRpcGrpcResponseMetadata = "rpc.grpc.response.metadata";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcGrpcResponseMetadata =
+    "rpc.grpc.response.metadata";
 
 /**
-  The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status code</a>
-  of the gRPC request.
+  Deprecated, use string representation on the @code rpc.response.status_code @endcode attribute
+  instead.
+
+  @deprecated
+  {"note": "Use string representation of the gRPC status code on the @code rpc.response.status_code
+  @endcode attribute.", "reason": "uncategorized"}
  */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
 
 /**
-  @code error.code @endcode property of response if it is an error response.
+  Deprecated, use string representation on the @code rpc.response.status_code @endcode attribute
+  instead.
+
+  @deprecated
+  {"note": "Use string representation of the error code on the @code rpc.response.status_code
+  @endcode attribute.", "reason": "uncategorized"}
  */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcJsonrpcErrorCode =
+    "rpc.jsonrpc.error_code";
 
 /**
-  @code error.message @endcode property of response if it is an error response.
+  Deprecated, use span status description or @code error.message @endcode attribute on other
+  signals.
+
+  @deprecated
+  {"note": "Use the span status description or @code error.message @endcode attribute on other
+  signals.", "reason": "uncategorized"}
  */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcJsonrpcErrorMessage =
+    "rpc.jsonrpc.error_message";
 
 /**
-  @code id @endcode property of request or response. Since protocol allows id to be int, string,
-  @code null @endcode or missing (for notifications), value is expected to be cast to string for
-  simplicity. Use empty string in case of @code null @endcode value. Omit entirely if this is a
-  notification.
+  Deprecated, use @code jsonrpc.request.id @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code jsonrpc.request.id @endcode.", "reason": "renamed", "renamed_to":
+  "jsonrpc.request.id"}
  */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcJsonrpcRequestId =
+    "rpc.jsonrpc.request_id";
 
 /**
-  Protocol version as in @code jsonrpc @endcode property of request/response. Since JSON-RPC 1.0
-  doesn't specify this, the value can be omitted.
+  Deprecated, use @code jsonrpc.protocol.version @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code jsonrpc.protocol.version @endcode.", "reason": "renamed",
+  "renamed_to": "jsonrpc.protocol.version"}
  */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
 
 /**
   Compressed size of the message in bytes.
@@ -123,29 +143,98 @@ static constexpr const char *kRpcMessageType = "rpc.message.type";
 static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
 
 /**
-  The name of the (logical) method being called, must be equal to the $method part in the span name.
+  The fully-qualified logical name of the method from the RPC interface perspective.
+  <p>
+  The method name MAY have unbounded cardinality in edge or error cases.
+  <p>
+  Some RPC frameworks or libraries provide a fixed set of recognized methods
+  for client stubs and server implementations. Instrumentations for such
+  frameworks MUST set this attribute to the original method name only
+  when the method is recognized by the framework or library.
   <p>
-  This is the logical name of the method from the RPC interface perspective, which can be different
-  from the name of any implementing method/function. The @code code.function.name @endcode attribute
-  may be used to store the latter (e.g., method actually executing the call on the server side, RPC
-  client stub method on the client side).
+  When the method is not recognized, for example, when the server receives
+  a request for a method that is not predefined on the server, or when
+  instrumentation is not able to reliably detect if the method is predefined,
+  the attribute MUST be set to @code _OTHER @endcode. In such cases, tracing
+  instrumentations MUST also set @code rpc.method_original @endcode attribute to
+  the original method value.
+  <p>
+  If the RPC instrumentation could end up converting valid RPC methods to
+  @code _OTHER @endcode, then it SHOULD provide a way to configure the list of recognized
+  RPC methods.
+  <p>
+  The @code rpc.method @endcode can be different from the name of any implementing
+  method/function.
+  The @code code.function.name @endcode attribute may be used to record the fully-qualified
+  method actually executing the call on the server side, or the
+  RPC client stub method on the client side.
  */
 static constexpr const char *kRpcMethod = "rpc.method";
 
 /**
-  The full (logical) name of the service being called, including its package name, if applicable.
+  The original name of the method used by the client.
+ */
+static constexpr const char *kRpcMethodOriginal = "rpc.method_original";
+
+/**
+  RPC request metadata, @code <key> @endcode being the normalized RPC metadata key (lowercase), the
+  value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration of
+  which metadata values are to be captured. Including all request metadata values can be a security
+  risk - explicit configuration helps avoid leaking sensitive information. <p> For example, a
+  property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode SHOULD be
+  recorded as
+  @code rpc.request.metadata.my-custom-key @endcode attribute with value @code ["1.2.3.4",
+  "1.2.3.5"] @endcode
+ */
+static constexpr const char *kRpcRequestMetadata = "rpc.request.metadata";
+
+/**
+  RPC response metadata, @code <key> @endcode being the normalized RPC metadata key (lowercase), the
+  value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration of
+  which metadata values are to be captured. Including all response metadata values can be a security
+  risk - explicit configuration helps avoid leaking sensitive information. <p> For example, a
+  property @code my-custom-key @endcode with value @code ["attribute_value"] @endcode SHOULD be
+  recorded as the @code rpc.response.metadata.my-custom-key @endcode attribute with value @code
+  ["attribute_value"] @endcode
+ */
+static constexpr const char *kRpcResponseMetadata = "rpc.response.metadata";
+
+/**
+  Status code of the RPC returned by the RPC server or generated by the client
   <p>
-  This is the logical name of the service from the RPC interface perspective, which can be different
-  from the name of any implementing class. The @code code.namespace @endcode attribute may be used
-  to store the latter (despite the attribute name, it may include a class name; e.g., class with
-  method actually executing the call on the server side, RPC client stub class on the client side).
+  Usually it represents an error code, but may also represent partial success, warning, or
+  differentiate between various types of successful outcomes. Semantic conventions for individual
+  RPC frameworks SHOULD document what @code rpc.response.status_code @endcode means in the context
+  of that system and which values are considered to represent errors.
  */
-static constexpr const char *kRpcService = "rpc.service";
+static constexpr const char *kRpcResponseStatusCode = "rpc.response.status_code";
 
 /**
-  A string identifying the remoting system. See below for a list of well-known identifiers.
+  Deprecated, use fully-qualified @code rpc.method @endcode instead.
+
+  @deprecated
+  {"note": "Value should be included in @code rpc.method @endcode which is expected to be a
+  fully-qualified name.", "reason": "uncategorized"}
  */
-static constexpr const char *kRpcSystem = "rpc.system";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcService = "rpc.service";
+
+/**
+  Deprecated, use @code rpc.system.name @endcode attribute instead.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.system.name @endcode.", "reason": "renamed", "renamed_to":
+  "rpc.system.name"}
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kRpcSystem = "rpc.system";
+
+/**
+  The Remote Procedure Call (RPC) system.
+  <p>
+  The client and server RPC systems may differ for the same RPC interaction. For example, a client
+  may use Apache Dubbo or Connect RPC to communicate with a server that uses gRPC since both
+  protocols provide compatibility with gRPC.
+ */
+static constexpr const char *kRpcSystemName = "rpc.system.name";
 
 namespace RpcConnectRpcErrorCodeValues
 {
@@ -309,8 +398,42 @@ static constexpr const char *kApacheDubbo = "apache_dubbo";
  */
 static constexpr const char *kConnectRpc = "connect_rpc";
 
+/**
+  <a href="https://datatracker.ietf.org/doc/html/rfc5531">ONC RPC (Sun RPC)</a>
+ */
+static constexpr const char *kOncRpc = "onc_rpc";
+
+/**
+  JSON-RPC
+ */
+static constexpr const char *kJsonrpc = "jsonrpc";
+
 }  // namespace RpcSystemValues
 
+namespace RpcSystemNameValues
+{
+/**
+  <a href="https://grpc.io/">gRPC</a>
+ */
+static constexpr const char *kGrpc = "grpc";
+
+/**
+  <a href="https://dubbo.apache.org/">Apache Dubbo</a>
+ */
+static constexpr const char *kDubbo = "dubbo";
+
+/**
+  <a href="https://connectrpc.com/">Connect RPC</a>
+ */
+static constexpr const char *kConnectrpc = "connectrpc";
+
+/**
+  <a href="https://www.jsonrpc.org/">JSON-RPC</a>
+ */
+static constexpr const char *kJsonrpc = "jsonrpc";
+
+}  // namespace RpcSystemNameValues
+
 }  // namespace rpc
 }  // namespace semconv
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_metrics.h
index a337142ef38..755130a78b7 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_metrics.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/rpc_metrics.h
@@ -21,29 +21,60 @@ namespace rpc
 {
 
 /**
-  Measures the duration of outbound RPC.
+  Measures the duration of outbound remote procedure calls (RPC).
   <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
+  When this metric is reported alongside an RPC client span, the metric value
+  SHOULD be the same as the RPC client span duration.
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcClientDuration = "rpc.client.duration";
-static constexpr const char *descrMetricRpcClientDuration =
-    "Measures the duration of outbound RPC.";
-static constexpr const char *unitMetricRpcClientDuration = "ms";
+static constexpr const char *kMetricRpcClientCallDuration = "rpc.client.call.duration";
+static constexpr const char *descrMetricRpcClientCallDuration =
+    "Measures the duration of outbound remote procedure calls (RPC).";
+static constexpr const char *unitMetricRpcClientCallDuration = "s";
 
 static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricRpcClientCallDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricRpcClientCallDuration,
+                                      descrMetricRpcClientCallDuration,
+                                      unitMetricRpcClientCallDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricRpcClientCallDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricRpcClientCallDuration,
+                                      descrMetricRpcClientCallDuration,
+                                      unitMetricRpcClientCallDuration);
+}
+
+/**
+  Deprecated, use @code rpc.client.call.duration @endcode instead. Note: the unit also changed from
+  @code ms @endcode to @code s @endcode.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.client.call.duration @endcode with unit @code s @endcode.",
+  "reason": "uncategorized"} <p> While streaming RPCs may record this metric as start-of-batch to
+  end-of-batch, it's hard to interpret in practice. <p> <strong>Streaming</strong>: N/A. <p>
+  histogram
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcClientDuration =
+    "rpc.client.duration";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcClientDuration =
+    "Deprecated, use `rpc.client.call.duration` instead. Note: the unit also changed from `ms` to "
+    "`s`.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcClientDuration = "ms";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcClientDuration(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
                                       unitMetricRpcClientDuration);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcClientDuration(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricRpcClientDuration(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
                                       unitMetricRpcClientDuration);
@@ -77,6 +108,9 @@ CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
 
 /**
   Measures the number of messages received per RPC.
+
+  @deprecated
+  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
   <p>
   Should be 1 for all non-streaming RPCs.
   <p>
@@ -84,12 +118,13 @@ CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcClientRequestsPerRpc = "rpc.client.requests_per_rpc";
-static constexpr const char *descrMetricRpcClientRequestsPerRpc =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcClientRequestsPerRpc =
+    "rpc.client.requests_per_rpc";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcClientRequestsPerRpc =
     "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
 
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcClientRequestsPerRpc,
@@ -97,7 +132,7 @@ CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
                                       unitMetricRpcClientRequestsPerRpc);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricRpcClientRequestsPerRpc(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcClientRequestsPerRpc,
@@ -135,6 +170,9 @@ CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
 
 /**
   Measures the number of messages sent per RPC.
+
+  @deprecated
+  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
   <p>
   Should be 1 for all non-streaming RPCs.
   <p>
@@ -142,12 +180,14 @@ CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcClientResponsesPerRpc = "rpc.client.responses_per_rpc";
-static constexpr const char *descrMetricRpcClientResponsesPerRpc =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcClientResponsesPerRpc =
+    "rpc.client.responses_per_rpc";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcClientResponsesPerRpc =
     "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcClientResponsesPerRpc = "{count}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcClientResponsesPerRpc =
+    "{count}";
 
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcClientResponsesPerRpc,
@@ -155,7 +195,7 @@ CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
                                       unitMetricRpcClientResponsesPerRpc);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcClientResponsesPerRpc,
@@ -164,28 +204,60 @@ CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
 }
 
 /**
-  Measures the duration of inbound RPC.
+  Measures the duration of inbound remote procedure calls (RPC).
   <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
+  When this metric is reported alongside an RPC server span, the metric value
+  SHOULD be the same as the RPC server span duration.
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcServerDuration     = "rpc.server.duration";
-static constexpr const char *descrMetricRpcServerDuration = "Measures the duration of inbound RPC.";
-static constexpr const char *unitMetricRpcServerDuration  = "ms";
+static constexpr const char *kMetricRpcServerCallDuration = "rpc.server.call.duration";
+static constexpr const char *descrMetricRpcServerCallDuration =
+    "Measures the duration of inbound remote procedure calls (RPC).";
+static constexpr const char *unitMetricRpcServerCallDuration = "s";
 
 static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+CreateSyncInt64MetricRpcServerCallDuration(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Histogram(kMetricRpcServerCallDuration,
+                                      descrMetricRpcServerCallDuration,
+                                      unitMetricRpcServerCallDuration);
+}
+
+static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricRpcServerCallDuration(metrics::Meter *meter)
+{
+  return meter->CreateDoubleHistogram(kMetricRpcServerCallDuration,
+                                      descrMetricRpcServerCallDuration,
+                                      unitMetricRpcServerCallDuration);
+}
+
+/**
+  Deprecated, use @code rpc.server.call.duration @endcode instead. Note: the unit also changed from
+  @code ms @endcode to @code s @endcode.
+
+  @deprecated
+  {"note": "Replaced by @code rpc.server.call.duration @endcode with unit @code s @endcode.",
+  "reason": "uncategorized"} <p> While streaming RPCs may record this metric as start-of-batch to
+  end-of-batch, it's hard to interpret in practice. <p> <strong>Streaming</strong>: N/A. <p>
+  histogram
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcServerDuration =
+    "rpc.server.duration";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcServerDuration =
+    "Deprecated, use `rpc.server.call.duration` instead. Note: the unit also changed from `ms` to "
+    "`s`.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcServerDuration = "ms";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcServerDuration(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
                                       unitMetricRpcServerDuration);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcServerDuration(
-    metrics::Meter *meter)
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
+CreateSyncDoubleMetricRpcServerDuration(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
                                       unitMetricRpcServerDuration);
@@ -219,6 +291,9 @@ CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
 
 /**
   Measures the number of messages received per RPC.
+
+  @deprecated
+  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
   <p>
   Should be 1 for all non-streaming RPCs.
   <p>
@@ -226,12 +301,13 @@ CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcServerRequestsPerRpc = "rpc.server.requests_per_rpc";
-static constexpr const char *descrMetricRpcServerRequestsPerRpc =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcServerRequestsPerRpc =
+    "rpc.server.requests_per_rpc";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcServerRequestsPerRpc =
     "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
 
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcServerRequestsPerRpc,
@@ -239,7 +315,7 @@ CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
                                       unitMetricRpcServerRequestsPerRpc);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricRpcServerRequestsPerRpc(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcServerRequestsPerRpc,
@@ -277,6 +353,9 @@ CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
 
 /**
   Measures the number of messages sent per RPC.
+
+  @deprecated
+  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
   <p>
   Should be 1 for all non-streaming RPCs.
   <p>
@@ -284,12 +363,14 @@ CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
   <p>
   histogram
  */
-static constexpr const char *kMetricRpcServerResponsesPerRpc = "rpc.server.responses_per_rpc";
-static constexpr const char *descrMetricRpcServerResponsesPerRpc =
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricRpcServerResponsesPerRpc =
+    "rpc.server.responses_per_rpc";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricRpcServerResponsesPerRpc =
     "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcServerResponsesPerRpc = "{count}";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricRpcServerResponsesPerRpc =
+    "{count}";
 
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
 CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
 {
   return meter->CreateUInt64Histogram(kMetricRpcServerResponsesPerRpc,
@@ -297,7 +378,7 @@ CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
                                       unitMetricRpcServerResponsesPerRpc);
 }
 
-static inline nostd::unique_ptr<metrics::Histogram<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
 CreateSyncDoubleMetricRpcServerResponsesPerRpc(metrics::Meter *meter)
 {
   return meter->CreateDoubleHistogram(kMetricRpcServerResponsesPerRpc,
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/service_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/service_attributes.h
index 3cc3f894014..ed794457e3d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/service_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/service_attributes.h
@@ -74,8 +74,21 @@ static constexpr const char *kServiceName = "service.name";
 static constexpr const char *kServiceNamespace = "service.namespace";
 
 /**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
+  Logical name of the service on the other side of the connection. SHOULD be equal to the actual <a
+  href="/docs/resource/README.md#service">@code service.name @endcode</a> resource attribute of the
+  remote service if any.
+ */
+static constexpr const char *kServicePeerName = "service.peer.name";
+
+/**
+  Logical namespace of the service on the other side of the connection. SHOULD be equal to the
+  actual <a href="/docs/resource/README.md#service">@code service.namespace @endcode</a> resource
+  attribute of the remote service if any.
+ */
+static constexpr const char *kServicePeerNamespace = "service.peer.namespace";
+
+/**
+  The version string of the service component. The format is not defined by these conventions.
  */
 static constexpr const char *kServiceVersion = "service.version";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_attributes.h
index 70001903511..9a693ffc2ec 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_attributes.h
@@ -21,8 +21,13 @@ namespace system
 
 /**
   Deprecated, use @code cpu.logical_number @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code cpu.logical_number @endcode.", "reason": "renamed", "renamed_to":
+  "cpu.logical_number"}
  */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuLogicalNumber =
+    "system.cpu.logical_number";
 
 /**
   Deprecated, use @code cpu.mode @endcode instead.
@@ -57,6 +62,11 @@ static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
  */
 static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
 
+/**
+  The Linux Slab memory state
+ */
+static constexpr const char *kSystemMemoryLinuxSlabState = "system.memory.linux.slab.state";
+
 /**
   The memory state
  */
@@ -76,29 +86,41 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemNetworkState = "sys
  */
 static constexpr const char *kSystemPagingDirection = "system.paging.direction";
 
+/**
+  The paging fault type
+ */
+static constexpr const char *kSystemPagingFaultType = "system.paging.fault.type";
+
 /**
   The memory paging state
  */
 static constexpr const char *kSystemPagingState = "system.paging.state";
 
 /**
-  The memory paging type
+  Deprecated, use @code system.paging.fault.type @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code system.paging.fault.type @endcode.", "reason": "renamed",
+  "renamed_to": "system.paging.fault.type"}
  */
-static constexpr const char *kSystemPagingType = "system.paging.type";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemPagingType = "system.paging.type";
 
 /**
-  The process state, e.g., <a
-  href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
-  Codes</a>
+  Deprecated, use @code process.state @endcode instead.
+
+  @deprecated
+  {"note": "Replaced by @code process.state @endcode.", "reason": "renamed", "renamed_to":
+  "process.state"}
  */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
+OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessStatus =
+    "system.process.status";
 
 /**
-  Deprecated, use @code system.process.status @endcode instead.
+  Deprecated, use @code process.state @endcode instead.
 
   @deprecated
-  {"note": "Replaced by @code system.process.status @endcode.", "reason": "renamed", "renamed_to":
-  "system.process.status"}
+  {"note": "Replaced by @code process.state @endcode.", "reason": "renamed", "renamed_to":
+  "process.state"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
     "system.processes.status";
@@ -150,6 +172,15 @@ static constexpr const char *kExt4 = "ext4";
 
 }  // namespace SystemFilesystemTypeValues
 
+namespace SystemMemoryLinuxSlabStateValues
+{
+
+static constexpr const char *kReclaimable = "reclaimable";
+
+static constexpr const char *kUnreclaimable = "unreclaimable";
+
+}  // namespace SystemMemoryLinuxSlabStateValues
+
 namespace SystemMemoryStateValues
 {
 /**
@@ -210,6 +241,15 @@ static constexpr const char *kOut = "out";
 
 }  // namespace SystemPagingDirectionValues
 
+namespace SystemPagingFaultTypeValues
+{
+
+static constexpr const char *kMajor = "major";
+
+static constexpr const char *kMinor = "minor";
+
+}  // namespace SystemPagingFaultTypeValues
+
 namespace SystemPagingStateValues
 {
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_metrics.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_metrics.h
index d0767b51a60..a9f6f38c03d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_metrics.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/system_metrics.h
@@ -228,12 +228,12 @@ CreateAsyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  Disk bytes transferred.
   <p>
   counter
  */
 static constexpr const char *kMetricSystemDiskIo     = "system.disk.io";
-static constexpr const char *descrMetricSystemDiskIo = "TODO.";
+static constexpr const char *descrMetricSystemDiskIo = "Disk bytes transferred.";
 static constexpr const char *unitMetricSystemDiskIo  = "By";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIo(
@@ -348,13 +348,14 @@ CreateAsyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of disk reads/writes merged into single physical disk access operations.
   <p>
   counter
  */
-static constexpr const char *kMetricSystemDiskMerged     = "system.disk.merged";
-static constexpr const char *descrMetricSystemDiskMerged = "TODO.";
-static constexpr const char *unitMetricSystemDiskMerged  = "{operation}";
+static constexpr const char *kMetricSystemDiskMerged = "system.disk.merged";
+static constexpr const char *descrMetricSystemDiskMerged =
+    "The number of disk reads/writes merged into single physical disk access operations.";
+static constexpr const char *unitMetricSystemDiskMerged = "{operation}";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskMerged(
     metrics::Meter *meter)
@@ -434,12 +435,12 @@ CreateAsyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  Disk operations count.
   <p>
   counter
  */
 static constexpr const char *kMetricSystemDiskOperations     = "system.disk.operations";
-static constexpr const char *descrMetricSystemDiskOperations = "TODO.";
+static constexpr const char *descrMetricSystemDiskOperations = "Disk operations count.";
 static constexpr const char *unitMetricSystemDiskOperations  = "{operation}";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
@@ -557,13 +558,14 @@ CreateAsyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  Fraction of filesystem bytes used.
   <p>
   gauge
  */
 static constexpr const char *kMetricSystemFilesystemUtilization = "system.filesystem.utilization";
-static constexpr const char *descrMetricSystemFilesystemUtilization = "TODO.";
-static constexpr const char *unitMetricSystemFilesystemUtilization  = "1";
+static constexpr const char *descrMetricSystemFilesystemUtilization =
+    "Fraction of filesystem bytes used.";
+static constexpr const char *unitMetricSystemFilesystemUtilization = "1";
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
 
@@ -601,98 +603,95 @@ CreateAsyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
 }
 
 /**
-  An estimate of how much memory is available for starting new applications, without causing
-  swapping. <p> This is an alternative to @code system.memory.usage @endcode metric with @code
-  state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
-  as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
-  than just "free" memory. For reference, see the calculations <a
-  href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemoryAvailable = "system.linux.memory.available";
-static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
-    "An estimate of how much memory is available for starting new applications, without causing "
-    "swapping.";
-static constexpr const char *unitMetricSystemLinuxMemoryAvailable = "By";
+  The number of packets transferred.
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+  @deprecated
+  {"note": "Replaced by @code system.memory.linux.available @endcode.", "reason": "renamed",
+  "renamed_to": "system.memory.linux.available"} <p> counter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemLinuxMemoryAvailable =
+    "system.linux.memory.available";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
+    "The number of packets transferred.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemLinuxMemoryAvailable =
+    "{packet}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                         descrMetricSystemLinuxMemoryAvailable,
-                                         unitMetricSystemLinuxMemoryAvailable);
+  return meter->CreateUInt64Counter(kMetricSystemLinuxMemoryAvailable,
+                                    descrMetricSystemLinuxMemoryAvailable,
+                                    unitMetricSystemLinuxMemoryAvailable);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                          descrMetricSystemLinuxMemoryAvailable,
-                                          unitMetricSystemLinuxMemoryAvailable);
+  return meter->CreateDoubleCounter(kMetricSystemLinuxMemoryAvailable,
+                                    descrMetricSystemLinuxMemoryAvailable,
+                                    unitMetricSystemLinuxMemoryAvailable);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                   descrMetricSystemLinuxMemoryAvailable,
-                                                   unitMetricSystemLinuxMemoryAvailable);
+  return meter->CreateInt64ObservableCounter(kMetricSystemLinuxMemoryAvailable,
+                                             descrMetricSystemLinuxMemoryAvailable,
+                                             unitMetricSystemLinuxMemoryAvailable);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                    descrMetricSystemLinuxMemoryAvailable,
-                                                    unitMetricSystemLinuxMemoryAvailable);
+  return meter->CreateDoubleObservableCounter(kMetricSystemLinuxMemoryAvailable,
+                                              descrMetricSystemLinuxMemoryAvailable,
+                                              unitMetricSystemLinuxMemoryAvailable);
 }
 
 /**
-  Reports the memory used by the Linux kernel for managing caches of frequently used objects.
-  <p>
-  The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in @code
-  linux.memory.slab.usage @endcode SHOULD be equal to the total slab memory available on the system.
-  Note that the total slab memory is not constant and may vary over time.
-  See also the <a
-  href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
-  allocator</a> and @code Slab @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemorySlabUsage = "system.linux.memory.slab.usage";
-static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
-    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
-static constexpr const char *unitMetricSystemLinuxMemorySlabUsage = "By";
+  The number of packets transferred.
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+  @deprecated
+  {"note": "Replaced by @code system.memory.linux.slab.usage @endcode.", "reason": "renamed",
+  "renamed_to": "system.memory.linux.slab.usage"} <p> counter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemLinuxMemorySlabUsage =
+    "system.linux.memory.slab.usage";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
+    "The number of packets transferred.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemLinuxMemorySlabUsage =
+    "{packet}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
 {
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                         descrMetricSystemLinuxMemorySlabUsage,
-                                         unitMetricSystemLinuxMemorySlabUsage);
+  return meter->CreateUInt64Counter(kMetricSystemLinuxMemorySlabUsage,
+                                    descrMetricSystemLinuxMemorySlabUsage,
+                                    unitMetricSystemLinuxMemorySlabUsage);
 }
 
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
 CreateSyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
 {
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                          descrMetricSystemLinuxMemorySlabUsage,
-                                          unitMetricSystemLinuxMemorySlabUsage);
+  return meter->CreateDoubleCounter(kMetricSystemLinuxMemorySlabUsage,
+                                    descrMetricSystemLinuxMemorySlabUsage,
+                                    unitMetricSystemLinuxMemorySlabUsage);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
 {
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                   descrMetricSystemLinuxMemorySlabUsage,
-                                                   unitMetricSystemLinuxMemorySlabUsage);
+  return meter->CreateInt64ObservableCounter(kMetricSystemLinuxMemorySlabUsage,
+                                             descrMetricSystemLinuxMemorySlabUsage,
+                                             unitMetricSystemLinuxMemorySlabUsage);
 }
 
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
 CreateAsyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
 {
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                    descrMetricSystemLinuxMemorySlabUsage,
-                                                    unitMetricSystemLinuxMemorySlabUsage);
+  return meter->CreateDoubleObservableCounter(kMetricSystemLinuxMemorySlabUsage,
+                                              descrMetricSystemLinuxMemorySlabUsage,
+                                              unitMetricSystemLinuxMemorySlabUsage);
 }
 
 /**
@@ -733,6 +732,101 @@ CreateAsyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
       kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
 }
 
+/**
+  An estimate of how much memory is available for starting new applications, without causing
+  swapping. <p> This is an alternative to @code system.memory.usage @endcode metric with @code
+  state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
+  as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
+  than just "free" memory. For reference, see the calculations <a
+  href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
+  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricSystemMemoryLinuxAvailable = "system.memory.linux.available";
+static constexpr const char *descrMetricSystemMemoryLinuxAvailable =
+    "An estimate of how much memory is available for starting new applications, without causing "
+    "swapping.";
+static constexpr const char *unitMetricSystemMemoryLinuxAvailable = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricSystemMemoryLinuxAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLinuxAvailable,
+                                         descrMetricSystemMemoryLinuxAvailable,
+                                         unitMetricSystemMemoryLinuxAvailable);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricSystemMemoryLinuxAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLinuxAvailable,
+                                          descrMetricSystemMemoryLinuxAvailable,
+                                          unitMetricSystemMemoryLinuxAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricSystemMemoryLinuxAvailable(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemMemoryLinuxAvailable,
+                                                   descrMetricSystemMemoryLinuxAvailable,
+                                                   unitMetricSystemMemoryLinuxAvailable);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricSystemMemoryLinuxAvailable(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemMemoryLinuxAvailable,
+                                                    descrMetricSystemMemoryLinuxAvailable,
+                                                    unitMetricSystemMemoryLinuxAvailable);
+}
+
+/**
+  Reports the memory used by the Linux kernel for managing caches of frequently used objects.
+  <p>
+  The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in @code
+  memory.linux.slab.usage @endcode SHOULD be equal to the total slab memory available on the system.
+  Note that the total slab memory is not constant and may vary over time.
+  See also the <a
+  href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
+  allocator</a> and @code Slab @endcode in <a
+  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
+ */
+static constexpr const char *kMetricSystemMemoryLinuxSlabUsage = "system.memory.linux.slab.usage";
+static constexpr const char *descrMetricSystemMemoryLinuxSlabUsage =
+    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
+static constexpr const char *unitMetricSystemMemoryLinuxSlabUsage = "By";
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
+CreateSyncInt64MetricSystemMemoryLinuxSlabUsage(metrics::Meter *meter)
+{
+  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLinuxSlabUsage,
+                                         descrMetricSystemMemoryLinuxSlabUsage,
+                                         unitMetricSystemMemoryLinuxSlabUsage);
+}
+
+static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
+CreateSyncDoubleMetricSystemMemoryLinuxSlabUsage(metrics::Meter *meter)
+{
+  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLinuxSlabUsage,
+                                          descrMetricSystemMemoryLinuxSlabUsage,
+                                          unitMetricSystemMemoryLinuxSlabUsage);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricSystemMemoryLinuxSlabUsage(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemMemoryLinuxSlabUsage,
+                                                   descrMetricSystemMemoryLinuxSlabUsage,
+                                                   unitMetricSystemMemoryLinuxSlabUsage);
+}
+
+static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricSystemMemoryLinuxSlabUsage(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemMemoryLinuxSlabUsage,
+                                                    descrMetricSystemMemoryLinuxSlabUsage,
+                                                    unitMetricSystemMemoryLinuxSlabUsage);
+}
+
 /**
   Shared memory used (mostly by tmpfs).
   <p>
@@ -812,13 +906,14 @@ CreateAsyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  Percentage of memory bytes in use.
   <p>
   gauge
  */
-static constexpr const char *kMetricSystemMemoryUtilization     = "system.memory.utilization";
-static constexpr const char *descrMetricSystemMemoryUtilization = "TODO.";
-static constexpr const char *unitMetricSystemMemoryUtilization  = "1";
+static constexpr const char *kMetricSystemMemoryUtilization = "system.memory.utilization";
+static constexpr const char *descrMetricSystemMemoryUtilization =
+    "Percentage of memory bytes in use.";
+static constexpr const char *unitMetricSystemMemoryUtilization = "1";
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
 
@@ -855,13 +950,13 @@ CreateAsyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of connections.
   <p>
   updowncounter
  */
 static constexpr const char *kMetricSystemNetworkConnectionCount =
     "system.network.connection.count";
-static constexpr const char *descrMetricSystemNetworkConnectionCount = "TODO.";
+static constexpr const char *descrMetricSystemNetworkConnectionCount = "The number of connections.";
 static constexpr const char *unitMetricSystemNetworkConnectionCount  = "{connection}";
 
 static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
@@ -942,6 +1037,57 @@ CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
                                                     unitMetricSystemNetworkConnections);
 }
 
+/**
+  Count of packets that are dropped or discarded even though there was no error.
+
+  @deprecated
+  {"note": "Replaced by @code system.network.packet.dropped @endcode.", "reason": "renamed",
+  "renamed_to": "system.network.packet.dropped"} <p> Measured as: <ul> <li>Linux: the @code drop
+  @endcode column in @code /proc/dev/net @endcode (<a
+  href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
+    <li>Windows: <a
+  href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
+  InDiscards @endcode/@code OutDiscards @endcode</a> from <a
+  href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
+  GetIfEntry2 @endcode</a></li>
+  </ul>
+  <p>
+  counter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemNetworkDropped =
+    "system.network.dropped";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemNetworkDropped =
+    "Count of packets that are dropped or discarded even though there was no error.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemNetworkDropped = "{packet}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
+                                    unitMetricSystemNetworkDropped);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
+                                    unitMetricSystemNetworkDropped);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(
+      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
+}
+
 /**
   Count of network errors detected.
   <p>
@@ -991,13 +1137,14 @@ CreateAsyncDoubleMetricSystemNetworkErrors(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of bytes transmitted and received.
   <p>
   counter
  */
-static constexpr const char *kMetricSystemNetworkIo     = "system.network.io";
-static constexpr const char *descrMetricSystemNetworkIo = "TODO.";
-static constexpr const char *unitMetricSystemNetworkIo  = "By";
+static constexpr const char *kMetricSystemNetworkIo = "system.network.io";
+static constexpr const char *descrMetricSystemNetworkIo =
+    "The number of bytes transmitted and received.";
+static constexpr const char *unitMetricSystemNetworkIo = "By";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemNetworkIo(
     metrics::Meter *meter)
@@ -1028,13 +1175,14 @@ CreateAsyncDoubleMetricSystemNetworkIo(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of packets transferred.
   <p>
   counter
  */
-static constexpr const char *kMetricSystemNetworkPacketCount     = "system.network.packet.count";
-static constexpr const char *descrMetricSystemNetworkPacketCount = "TODO.";
-static constexpr const char *unitMetricSystemNetworkPacketCount  = "{packet}";
+static constexpr const char *kMetricSystemNetworkPacketCount = "system.network.packet.count";
+static constexpr const char *descrMetricSystemNetworkPacketCount =
+    "The number of packets transferred.";
+static constexpr const char *unitMetricSystemNetworkPacketCount = "{packet}";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
 CreateSyncInt64MetricSystemNetworkPacketCount(metrics::Meter *meter)
@@ -1122,12 +1270,53 @@ CreateAsyncDoubleMetricSystemNetworkPacketDropped(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of packets transferred.
+
+  @deprecated
+  {"note": "Replaced by @code system.network.packet.count @endcode.", "reason": "renamed",
+  "renamed_to": "system.network.packet.count"} <p> counter
+ */
+OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemNetworkPackets =
+    "system.network.packets";
+OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemNetworkPackets =
+    "The number of packets transferred.";
+OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemNetworkPackets = "{packet}";
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
+CreateSyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
+{
+  return meter->CreateUInt64Counter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
+                                    unitMetricSystemNetworkPackets);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
+CreateSyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
+{
+  return meter->CreateDoubleCounter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
+                                    unitMetricSystemNetworkPackets);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
+{
+  return meter->CreateInt64ObservableCounter(
+      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
+}
+
+OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
+CreateAsyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
+{
+  return meter->CreateDoubleObservableCounter(
+      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
+}
+
+/**
+  The number of page faults.
   <p>
   counter
  */
 static constexpr const char *kMetricSystemPagingFaults     = "system.paging.faults";
-static constexpr const char *descrMetricSystemPagingFaults = "TODO.";
+static constexpr const char *descrMetricSystemPagingFaults = "The number of page faults.";
 static constexpr const char *unitMetricSystemPagingFaults  = "{fault}";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemPagingFaults(
@@ -1159,12 +1348,12 @@ CreateAsyncDoubleMetricSystemPagingFaults(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  The number of paging operations.
   <p>
   counter
  */
 static constexpr const char *kMetricSystemPagingOperations     = "system.paging.operations";
-static constexpr const char *descrMetricSystemPagingOperations = "TODO.";
+static constexpr const char *descrMetricSystemPagingOperations = "The number of paging operations.";
 static constexpr const char *unitMetricSystemPagingOperations  = "{operation}";
 
 static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
@@ -1237,13 +1426,14 @@ CreateAsyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
 }
 
 /**
-  TODO.
+  Swap (unix) or pagefile (windows) utilization.
   <p>
   gauge
  */
-static constexpr const char *kMetricSystemPagingUtilization     = "system.paging.utilization";
-static constexpr const char *descrMetricSystemPagingUtilization = "TODO.";
-static constexpr const char *unitMetricSystemPagingUtilization  = "1";
+static constexpr const char *kMetricSystemPagingUtilization = "system.paging.utilization";
+static constexpr const char *descrMetricSystemPagingUtilization =
+    "Swap (unix) or pagefile (windows) utilization.";
+static constexpr const char *unitMetricSystemPagingUtilization = "1";
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/thread_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/thread_attributes.h
index 2d0c290651c..c6249884b66 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/thread_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/thread_attributes.h
@@ -21,11 +21,32 @@ namespace thread
 
 /**
   Current "managed" thread ID (as opposed to OS thread ID).
+  <p>
+  Examples of where the value can be extracted from:
+  <p>
+  | Language or platform | Source |
+  | --- | --- |
+  | JVM | @code Thread.currentThread().threadId() @endcode |
+  | .NET | @code Thread.CurrentThread.ManagedThreadId @endcode |
+  | Python | @code threading.current_thread().ident @endcode |
+  | Ruby | @code Thread.current.object_id @endcode |
+  | C++ | @code std::this_thread::get_id() @endcode |
+  | Erlang | @code erlang:self() @endcode |
  */
 static constexpr const char *kThreadId = "thread.id";
 
 /**
   Current thread name.
+  <p>
+  Examples of where the value can be extracted from:
+  <p>
+  | Language or platform | Source |
+  | --- | --- |
+  | JVM | @code Thread.currentThread().getName() @endcode |
+  | .NET | @code Thread.CurrentThread.Name @endcode |
+  | Python | @code threading.current_thread().name @endcode |
+  | Ruby | @code Thread.current.name @endcode |
+  | Erlang | @code erlang:process_info(self(), registered_name) @endcode |
  */
 static constexpr const char *kThreadName = "thread.name";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h
index f3c59a691e0..6b54c3061cf 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h
@@ -22,7 +22,7 @@ namespace user_agent
 /**
   Name of the user-agent extracted from original. Usually refers to the browser's name.
   <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from original
+  <a href="https://uaparser.dev/#demo">Example</a> of extracting browser's name from original
   string. In the case of using a user-agent for non-browser products, such as microservices with
   multiple names/versions inside the @code user_agent.original @endcode, the most significant name
   SHOULD be selected. In such a scenario it should align with @code user_agent.version @endcode
@@ -66,7 +66,7 @@ static constexpr const char *kUserAgentSyntheticType = "user_agent.synthetic.typ
 /**
   Version of the user-agent extracted from original. Usually refers to the browser's version
   <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from original
+  <a href="https://uaparser.dev/#demo">Example</a> of extracting browser's version from original
   string. In the case of using a user-agent for non-browser products, such as microservices with
   multiple names/versions inside the @code user_agent.original @endcode, the most significant
   version SHOULD be selected. In such a scenario it should align with @code user_agent.name @endcode
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/vcs_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
index 16227fe4b4d..d30fdd90e94 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
@@ -185,11 +185,10 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefType =
     "vcs.repository.ref.type";
 
 /**
-  The <a
-  href="https://support.google.com/webmasters/answer/10347851?hl=en#:~:text=A%20canonical%20URL%20is%20the,Google%20chooses%20one%20as%20canonical.">canonical
-  URL</a> of the repository providing the complete HTTP(S) address in order to locate and identify
-  the repository through a browser. <p> In Git Version Control Systems, the canonical URL SHOULD NOT
-  include the @code .git @endcode extension.
+  The <a href="https://support.google.com/webmasters/answer/10347851">canonical URL</a> of the
+  repository providing the complete HTTP(S) address in order to locate and identify the repository
+  through a browser. <p> In Git Version Control Systems, the canonical URL SHOULD NOT include the
+  @code .git @endcode extension.
  */
 static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/schema_url.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/schema_url.h
index 6d5fc0e48dd..5acdd1dd7b5 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/schema_url.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/schema_url.h
@@ -19,6 +19,6 @@ namespace semconv
 /**
  * The URL of the OpenTelemetry schema for these keys and values.
  */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.37.0";
+static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.39.0";
 }  // namespace semconv
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/service_attributes.h b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/service_attributes.h
index 1f335ca26ef..d0a5f33c79d 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/service_attributes.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/semconv/service_attributes.h
@@ -31,8 +31,7 @@ namespace service
 static constexpr const char *kServiceName = "service.name";
 
 /**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
+  The version string of the service component. The format is not defined by these conventions.
  */
 static constexpr const char *kServiceVersion = "service.version";
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/span_id.h b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/span_id.h
index 19511040df6..6537f77fc72 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/span_id.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/span_id.h
@@ -17,7 +17,7 @@ class SpanId final
 {
 public:
   // The size in bytes of the SpanId.
-  static constexpr int kSize = 8;
+  static constexpr size_t kSize = 8;
 
   // An invalid SpanId (all zeros).
   SpanId() noexcept : rep_{0} {}
@@ -29,7 +29,7 @@ class SpanId final
   void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
   {
     constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
+    for (size_t i = 0; i < kSize; ++i)
     {
       buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
       buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_flags.h b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_flags.h
index 0ad9dc136b2..f4c7bc6a447 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_flags.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_flags.h
@@ -29,7 +29,7 @@ class TraceFlags final
 
   /**
    * Valid flags in W3C Trace Context version 2.
-   * See https://www.w3.org/TR/trace-context-1/#trace-flags
+   * See https://www.w3.org/TR/trace-context-2/#trace-flags
    */
   static constexpr uint8_t kAllW3CTraceContext2Flags = kIsSampled | kIsRandom;
 
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_id.h b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_id.h
index 3a262c7a6a6..533037123e4 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_id.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/trace/trace_id.h
@@ -20,7 +20,7 @@ class TraceId final
 {
 public:
   // The size in bytes of the TraceId.
-  static constexpr int kSize = 16;
+  static constexpr size_t kSize = 16;
 
   // An invalid TraceId (all zeros).
   TraceId() noexcept : rep_{0} {}
@@ -35,7 +35,7 @@ class TraceId final
   void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
   {
     constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
+    for (size_t i = 0; i < kSize; ++i)
     {
       buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
       buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
diff --git a/deps/opentelemetry-cpp/api/include/opentelemetry/version.h b/deps/opentelemetry-cpp/api/include/opentelemetry/version.h
index e8747af9a18..135cdc23994 100644
--- a/deps/opentelemetry-cpp/api/include/opentelemetry/version.h
+++ b/deps/opentelemetry-cpp/api/include/opentelemetry/version.h
@@ -10,9 +10,9 @@
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
-#define OPENTELEMETRY_VERSION "1.23.0"
+#define OPENTELEMETRY_VERSION "1.25.0"
 #define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 23
+#define OPENTELEMETRY_VERSION_MINOR 25
 #define OPENTELEMETRY_VERSION_PATCH 0
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
diff --git a/deps/opentelemetry-cpp/api/test/baggage/BUILD b/deps/opentelemetry-cpp/api/test/baggage/BUILD
index a3783a63c0c..c25f21e34cd 100644
--- a/deps/opentelemetry-cpp/api/test/baggage/BUILD
+++ b/deps/opentelemetry-cpp/api/test/baggage/BUILD
@@ -1,6 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 cc_test(
diff --git a/deps/opentelemetry-cpp/api/test/baggage/baggage_test.cc b/deps/opentelemetry-cpp/api/test/baggage/baggage_test.cc
index 526c8130225..be7b4ccdf4f 100644
--- a/deps/opentelemetry-cpp/api/test/baggage/baggage_test.cc
+++ b/deps/opentelemetry-cpp/api/test/baggage/baggage_test.cc
@@ -71,6 +71,8 @@ TEST(BaggageTest, ValidateExtractHeader)
       {"1a-2f%40foo=bar%251,a%2A%2Ffoo-_%2Fbar=bar+4",
        {"1a-2f@foo", "a*/foo-_/bar"},
        {"bar%1", "bar 4"}},                                       // decoding is done properly
+      {"field=foo:bar", {"field"}, {"foo:bar"}},                  // colon in value
+      {"mixed=a/b:c?d=e", {"mixed"}, {"a/b:c?d=e"}},              // mixed special characters
       {"k1=v1,invalidmember,k2=v2", {"k1", "k2"}, {"v1", "v2"}},  // invalid member is skipped
       {",", {}, {}},
       {",=,", {}, {}},
diff --git a/deps/opentelemetry-cpp/api/test/baggage/propagation/BUILD b/deps/opentelemetry-cpp/api/test/baggage/propagation/BUILD
index 2b820ed3c89..322953b8ef8 100644
--- a/deps/opentelemetry-cpp/api/test/baggage/propagation/BUILD
+++ b/deps/opentelemetry-cpp/api/test/baggage/propagation/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "baggage_propagator_test",
diff --git a/deps/opentelemetry-cpp/api/test/common/BUILD b/deps/opentelemetry-cpp/api/test/common/BUILD
index 5ea2d5d57dd..3af58b53008 100644
--- a/deps/opentelemetry-cpp/api/test/common/BUILD
+++ b/deps/opentelemetry-cpp/api/test/common/BUILD
@@ -1,6 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 otel_cc_benchmark(
diff --git a/deps/opentelemetry-cpp/api/test/common/kv_properties_test.cc b/deps/opentelemetry-cpp/api/test/common/kv_properties_test.cc
index 8815214e45f..f85e8f38c79 100644
--- a/deps/opentelemetry-cpp/api/test/common/kv_properties_test.cc
+++ b/deps/opentelemetry-cpp/api/test/common/kv_properties_test.cc
@@ -66,7 +66,7 @@ using opentelemetry::common::KeyValueStringTokenizerOptions;
 
 TEST(KVStringTokenizer, SinglePair)
 {
-  bool valid_kv;
+  bool valid_kv{};
   nostd::string_view key, value;
   opentelemetry::nostd::string_view str = "k1=v1";
   KeyValueStringTokenizerOptions opts;
@@ -80,7 +80,7 @@ TEST(KVStringTokenizer, SinglePair)
 
 TEST(KVStringTokenizer, AcceptEmptyEntries)
 {
-  bool valid_kv;
+  bool valid_kv{};
   nostd::string_view key, value;
   opentelemetry::nostd::string_view str = ":k1=v1::k2=v2: ";
   KeyValueStringTokenizerOptions opts;
@@ -104,7 +104,7 @@ TEST(KVStringTokenizer, AcceptEmptyEntries)
 TEST(KVStringTokenizer, ValidPairsWithEmptyEntries)
 {
   opentelemetry::nostd::string_view str = "k1:v1===k2:v2==";
-  bool valid_kv;
+  bool valid_kv{};
   nostd::string_view key, value;
   KeyValueStringTokenizerOptions opts;
   opts.member_separator    = '=';
@@ -128,7 +128,7 @@ TEST(KVStringTokenizer, InvalidPairs)
 {
   opentelemetry::nostd::string_view str = "k1=v1,invalid  ,,  k2=v2   ,invalid";
   KeyValueStringTokenizer tk(str);
-  bool valid_kv;
+  bool valid_kv{};
   nostd::string_view key, value;
   EXPECT_TRUE(tk.next(valid_kv, key, value));
 
diff --git a/deps/opentelemetry-cpp/api/test/context/BUILD b/deps/opentelemetry-cpp/api/test/context/BUILD
index 64b2cb750fb..8f3cc8e2dd5 100644
--- a/deps/opentelemetry-cpp/api/test/context/BUILD
+++ b/deps/opentelemetry-cpp/api/test/context/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "context_test",
diff --git a/deps/opentelemetry-cpp/api/test/context/propagation/BUILD b/deps/opentelemetry-cpp/api/test/context/propagation/BUILD
index d62d67649c8..14b621af53b 100644
--- a/deps/opentelemetry-cpp/api/test/context/propagation/BUILD
+++ b/deps/opentelemetry-cpp/api/test/context/propagation/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "composite_propagator_test",
diff --git a/deps/opentelemetry-cpp/api/test/core/BUILD b/deps/opentelemetry-cpp/api/test/core/BUILD
index 38c65e6d310..ed0895a5c35 100644
--- a/deps/opentelemetry-cpp/api/test/core/BUILD
+++ b/deps/opentelemetry-cpp/api/test/core/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "timestamp_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/api/test/logs/BUILD b/deps/opentelemetry-cpp/api/test/logs/BUILD
index 521620a2099..1fa9c4884c3 100644
--- a/deps/opentelemetry-cpp/api/test/logs/BUILD
+++ b/deps/opentelemetry-cpp/api/test/logs/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "provider_test",
diff --git a/deps/opentelemetry-cpp/api/test/metrics/BUILD b/deps/opentelemetry-cpp/api/test/metrics/BUILD
index 86e20033b74..e601961d128 100644
--- a/deps/opentelemetry-cpp/api/test/metrics/BUILD
+++ b/deps/opentelemetry-cpp/api/test/metrics/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "noop_sync_instrument_test",
diff --git a/deps/opentelemetry-cpp/api/test/nostd/BUILD b/deps/opentelemetry-cpp/api/test/nostd/BUILD
index 4f2b1d31fdd..e8485194b37 100644
--- a/deps/opentelemetry-cpp/api/test/nostd/BUILD
+++ b/deps/opentelemetry-cpp/api/test/nostd/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "function_ref_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/api/test/nostd/shared_ptr_test.cc b/deps/opentelemetry-cpp/api/test/nostd/shared_ptr_test.cc
index fa3d97c4939..938ff1c9b15 100644
--- a/deps/opentelemetry-cpp/api/test/nostd/shared_ptr_test.cc
+++ b/deps/opentelemetry-cpp/api/test/nostd/shared_ptr_test.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/unique_ptr.h"
 
 using opentelemetry::nostd::shared_ptr;
 
@@ -96,9 +97,18 @@ TEST(SharedPtrTest, MoveConstructionFromStdSharedPtr)
   EXPECT_EQ(ptr2.get(), value);
 }
 
+TEST(SharedPtrTest, MoveConstructionFromNoStdUniquePtr)
+{
+  opentelemetry::nostd::unique_ptr<int> value(new int{123});
+  auto p = value.get();
+  shared_ptr<int> ptr{std::move(value)};
+  EXPECT_EQ(value.get(), nullptr);  // NOLINT
+  EXPECT_EQ(ptr.get(), p);
+}
+
 TEST(SharedPtrTest, Destruction)
 {
-  bool was_destructed;
+  bool was_destructed{};
   shared_ptr<A>{new A{was_destructed}};  // NOLINT
   EXPECT_TRUE(was_destructed);
 }
diff --git a/deps/opentelemetry-cpp/api/test/nostd/unique_ptr_test.cc b/deps/opentelemetry-cpp/api/test/nostd/unique_ptr_test.cc
index 3660bc5d22c..8307135355f 100644
--- a/deps/opentelemetry-cpp/api/test/nostd/unique_ptr_test.cc
+++ b/deps/opentelemetry-cpp/api/test/nostd/unique_ptr_test.cc
@@ -81,7 +81,7 @@ TEST(UniquePtrTest, MoveConstructionFromStdUniquePtr)
 
 TEST(UniquePtrTest, Destruction)
 {
-  bool was_destructed;
+  bool was_destructed{};
   unique_ptr<A>{new A{was_destructed}};  // NOLINT
   EXPECT_TRUE(was_destructed);
 }
@@ -127,7 +127,7 @@ TEST(UniquePtrTest, PointerOperators)
 
 TEST(UniquePtrTest, Reset)
 {
-  bool was_destructed1;
+  bool was_destructed1{};
   unique_ptr<A> ptr{new A{was_destructed1}};
   bool was_destructed2 = true;
   ptr.reset(new A{was_destructed2});
diff --git a/deps/opentelemetry-cpp/api/test/plugin/BUILD b/deps/opentelemetry-cpp/api/test/plugin/BUILD
index f20143ff77b..dc57d6f6d75 100644
--- a/deps/opentelemetry-cpp/api/test/plugin/BUILD
+++ b/deps/opentelemetry-cpp/api/test/plugin/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "dynamic_load_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/api/test/singleton/BUILD b/deps/opentelemetry-cpp/api/test/singleton/BUILD
index eae9f6b8c0f..af24c17cdb7 100644
--- a/deps/opentelemetry-cpp/api/test/singleton/BUILD
+++ b/deps/opentelemetry-cpp/api/test/singleton/BUILD
@@ -1,6 +1,10 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 # gcc and clang, assumed to be used on this platform
 DEFAULT_NOWIN_COPTS = [
     "-fvisibility=default",
diff --git a/deps/opentelemetry-cpp/api/test/trace/BUILD b/deps/opentelemetry-cpp/api/test/trace/BUILD
index d233084597a..fd39ec9ea53 100644
--- a/deps/opentelemetry-cpp/api/test/trace/BUILD
+++ b/deps/opentelemetry-cpp/api/test/trace/BUILD
@@ -1,6 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 cc_test(
diff --git a/deps/opentelemetry-cpp/api/test/trace/propagation/BUILD b/deps/opentelemetry-cpp/api/test/trace/propagation/BUILD
index 8e9718e80f7..91535dc1bee 100644
--- a/deps/opentelemetry-cpp/api/test/trace/propagation/BUILD
+++ b/deps/opentelemetry-cpp/api/test/trace/propagation/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "http_text_format_test",
diff --git a/deps/opentelemetry-cpp/api/test/trace/propagation/detail/BUILD b/deps/opentelemetry-cpp/api/test/trace/propagation/detail/BUILD
index 322c8929375..92accdc323a 100644
--- a/deps/opentelemetry-cpp/api/test/trace/propagation/detail/BUILD
+++ b/deps/opentelemetry-cpp/api/test/trace/propagation/detail/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "hex_test",
diff --git a/deps/opentelemetry-cpp/exporters/elasticsearch/BUILD b/deps/opentelemetry-cpp/exporters/elasticsearch/BUILD
index 9990c25860b..71ff5f39d2e 100644
--- a/deps/opentelemetry-cpp/exporters/elasticsearch/BUILD
+++ b/deps/opentelemetry-cpp/exporters/elasticsearch/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/exporters/elasticsearch/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/elasticsearch/CMakeLists.txt
index c2763f66b53..7341ec4cfc0 100644
--- a/deps/opentelemetry-cpp/exporters/elasticsearch/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/elasticsearch/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
 add_library(opentelemetry_exporter_elasticsearch_logs
             src/es_log_record_exporter.cc src/es_log_recordable.cc)
 
@@ -34,6 +36,13 @@ otel_add_component(
   "es_log_recordable.h"
   EXCLUDE)
 
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    exporter_elasticsearch_logs "OpenTelemetry Exporter - Elasticsearch"
+    "Exports log records to Elasticsearch."
+    "opentelemetry_trace opentelemetry_logs")
+endif()
+
 if(BUILD_TESTING)
   add_executable(es_log_record_exporter_test
                  test/es_log_record_exporter_test.cc)
diff --git a/deps/opentelemetry-cpp/exporters/etw/BUILD b/deps/opentelemetry-cpp/exporters/etw/BUILD
index ad8518bc253..fa121d9913e 100644
--- a/deps/opentelemetry-cpp/exporters/etw/BUILD
+++ b/deps/opentelemetry-cpp/exporters/etw/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
index ea98b0da222..dc709e5351c 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
@@ -36,7 +36,7 @@ namespace tld
       the set of events is not known at compile-time. For example,
       TraceLoggingDynamic.h might be used to implement a library providing
       manifest-free ETW to a scripting language like JavaScript or Perl.
-    - This header is not optimized for direct use by developers adding events
+    - This header is not intended for direct use by developers adding events
       to their code. There is no way to make an optimal solution that
       works for all of the intended target users. Instead, this header
       provides various pieces that you can build upon to create a user-friendly
@@ -55,16 +55,16 @@ namespace tld
 
     Basic usage:
     - Create a Provider object.
-    - Check provider.IsEnabled(...) so that you don't do the remaining steps
-      if nobody is listening for your event.
+    - Check provider.IsEnabled(level, keyword) so that you don't do the
+      remaining steps if nobody is listening for your event.
     - Create an Event<std::vector<BYTE>> object.
     - Add fields definitions (metadata) and values (data) using methods on
       Event. (You are responsible for making sure that the metadata you add
       matches the data you add -- the Event object does not validate this.)
     - Some methods on the Event object return EventBuilder objects, which are
-      used to build the fields of nested structures. Note that Event inherits
-      from EventBuilder, so if you write a function that accepts an
-      EventBuilder&, it will also accept an Event&.
+      used to build the fields of nested structures. Event inherits from
+      EventBuilder, so if you write a function that accepts an EventBuilder&,
+      it will also accept an Event&.
     - Once you've added all data and metadata, call event.Write() to send the
       event to ETW.
 
@@ -139,8 +139,8 @@ namespace tld
 
     Low-level event management:
     - Use tld::EventMetadataBuilder to build an event metadata blob.
-      - Use tld::Type values to define field types, or create non-standard
-        types using tld::MakeType, tld::InType, and tld::OutType.
+      - Use tld::Type values to define field types, or use tld::MakeType to
+        combine tld::InType and tld::OutType to make tld::Type values.
     - Use tld::EventDataBuilder to build an event data blob.
     - Create an EVENT_DESCRIPTOR for your event.
       - Optionally use the tld::EventDescriptor wrapper class to simplify
@@ -160,24 +160,25 @@ namespace tld
     - Constructor creates the provider metadata blob and registers the provider.
       Note that this includes configuring ETW callbacks.
     - Destructor unregisters the provider and frees the metadata blob.
-    - IsEnabled APIs provide very efficient checks for whether an event needs
-      to be written.
+    - IsEnabled APIs provide efficient checks for whether an event needs to be
+      written.
     - Write APIs call WriteEvent, automatically providing the correct REGHANDLE
       and provider metadata blobs.
 
     Typical usage:
 
     tld::Provider provider("ProviderName", ...);
-    if (provider.IsEnabled(eventLevel, eventKeywords))
+    if (provider.IsEnabled(eventLevel, eventKeyword))
     {
-        (prepare event);
-        provider.Write(...);
+        Event event(provider, szEventName, eventLevel, eventKeyword);
+        (add fields definitions and values);
+        event.Write();
     }
 
     It is not a problem to call provider.Write without checking
-    provider.IsEnabled(...), but it is more efficient to check
-    provider.IsEnabled(...) so that you can skip the process of preparing the
-    event if the event is not enabled.
+    provider.IsEnabled(...), but it is much more efficient to check
+    provider.IsEnabled(...) so that you can skip the process of preparing and
+    writing the event when the event is not enabled.
     */
     class Provider;
 
@@ -193,14 +194,15 @@ namespace tld
 
     Typical usage:
 
-    if (provider.IsEnabled(eventLevel, eventKeywords))
+    if (provider.IsEnabled(eventLevel, eventKeyword))
     {
-        Event event(provider, szEventName, eventLevel, eventKeywords);
+        Event event(provider, szEventName, eventLevel, eventKeyword);
         (add fields definitions and values);
         event.Write();
     }
 
-    You can reuse an Event object by calling event.Reset(...).
+    You can reuse an Event object by calling event.Reset(...), which might
+    reduce heap allocation overhead.
     */
     template<class ByteVectorTy>
     class Event;
@@ -212,12 +214,12 @@ namespace tld
     The Event class inherits from EventBuilder so that it can expose this
     interface. In addition, each call to eventBuilder.AddStruct(...) returns a
     new EventBuilder that can be used to add fields to a nested structure.
-    You won't directly create instances of this type -- you'll use instances
-    returned by Event.AddStruct or by EventBuilder.AddStruct.
+    You won't directly create instances of this type. Instead, you'll use
+    instances returned by event.AddStruct or eventBuilder.AddStruct.
 
-    You can use EventBuilder& as the type of a parameter to a function, and
-    then pass either an Event or an EventBuilder to that function (allowing
-    for recursive processing of event fields).
+    You can use EventBuilder& as the type of a parameter to a function and
+    then pass either an Event or an EventBuilder to that function, allowing
+    for recursive processing of event fields.
 
     Note that order is important but not checked when using multiple Event or
     EventBuilder objects. Fields are always added to the end of the overall
@@ -228,7 +230,7 @@ namespace tld
     Assume that you have obtained EventBuilder object b from object a, i.e.
     EventBuilder b = a.AddStruct(...). You must complete all operations using
     b before resuming any operations using a. If this rule is not followed,
-    fields may end up nesting in unexpected ways.
+    structures will not nest correctly.
     */
     template<class ByteVectorTy>
     class EventBuilder;
@@ -238,15 +240,15 @@ namespace tld
 
     Types for event fields, corresponding to a combination of TDH_INTYPE and
     TDH_OUTTYPE values. The Type enumeration contains predefined combinations
-    of InType and OutType that are known to work well and are recognized by
+    of InType and OutType that are defined by winmeta.xml and supported by
     decoders such as TDH and xperf.
 
     Advanced use: It is possible to create other Type values by combining
     values from the InType and OutType enumerations using the tld::MakeType
-    function. (Valid Type values consist of one InType combined with one
-    OutType.) However, custom combinations not already present in the Type
+    function (valid Type values consist of one InType combined with one
+    OutType). However, custom combinations not already present in the Type
     enumeration are unlikely to be recognized by xperf or other decoders,
-    and will usually end up being decoded as if they had used OutTypeDefault.
+    and will usually end up being decoded as if they used OutTypeDefault.
 
     When providing payload for a field, the payload data must match the InType.
     Payload is always packed tightly with no alignment or padding.
@@ -254,18 +256,18 @@ namespace tld
     ****
 
     How to pack single values:
-    
-    Primitive values (int, GUID) are packed directly, with no padding or
-    alignment. Just reserve sizeof(value) bytes in the buffer, then memcpy the
-    value into the buffer. Note that there should be no alignment or padding
-    between items -- the payload is always tightly-packed.
+
+    Primitive values (int, GUID) are packed directly. Just reserve
+    sizeof(value) bytes in the buffer, then memcpy the value into the buffer.
+    Note that there should be no alignment or padding between items -- the
+    payload is always tightly-packed.
 
     NUL-terminated strings are also simply memcpy'ed into the buffer. Be sure
     to include the NUL termination when reserving space and copying the value.
-    There is no special encoding reserved for a NULL string. The encoding
-    helpers in this header simply treat a NULL string the same as an empty
-    string, i.e. AddString((char*)NULL) is the same as AppendString("").
-    
+    There is no way to represent NULL. The encoding helpers in this header
+    treat a NULL string the same as an empty string, i.e.
+    AddString((char*)NULL) is the same as AddString("").
+
     Binary, CountedString, and CountedAnsiString scalars are all encoded as a
     UINT16 byte-count followed by the string data. In this case, no NUL
     termination should be included. Remember that the size is a byte count,
@@ -278,21 +280,17 @@ namespace tld
     Assume you have a function Pack(payloadVec, item) that correctly appends an
     item to the end of payloadVec.
 
-    Packing a variable-length array of N items is done by appending N (encoded
-    as UINT16) to payloadVec followed by calling Pack(...) N times.
+    Packing a variable-length array of N items is done by appending the UINT16
+    value of N to payloadVec, followed by calling Pack(...) N times.
 
     Packing a constant-length array of N items is done by calling Pack(...) N
     times. The value of N is encoded in the metadata (it was provided in the
     field's declaration) so it does not need to be provided in the payload.
 
     Note: while this header allows you to create arrays of anything, you
-    should avoid creating arrays of the following, as they might not decode
-    correctly:
-    - TypeNone (or anything based on InTypeNull).
-    - TypeBinary (or anything based on InTypeBinary).
-
-    It is ok to create an array of nested structures where fields in the
-    structure have TypeNone or TypeBinary.
+    should avoid creating arrays of InTypeBinary as they will not decode
+    correctly. (It is ok to create an array of nested structures where fields
+    in the structure have InTypeBinary.)
     */
     enum Type : UINT16;
 
@@ -322,14 +320,11 @@ namespace tld
     may use to override the InType's default formatting behavior. If no
     OutType is specified (i.e. if OutTypeDefault is used) or if the trace
     consumer does not recognize the specified InType+OutType combination, the
-    trace consumer will perform default formatting based solely on InType.
-
-    The comments for each OutType indicate the InTypes for which the OutType
-    might have valid semantics. However, most trace consumer only recognize a
-    small subset of the "valid" InType+OutType combinations, so even if the
-    semantics are valid, the OutType might still be ignored by the trace
-    consumer. The most commonly-supported combinations are the combinations
-    with corresponding precomposed Type... values.
+    trace consumer will typically perform default formatting based solely on
+    InType.
+
+    The valid combinations of InType + OutType are defined in the Windows SDK
+    in winmeta.xml (each inType has a list of valid outType under it).
     */
     enum OutType : UINT8;
 
@@ -345,13 +340,14 @@ namespace tld
 
     Configuration macro for controlling the behavior of SetInformation.
 
-    Not all versions of Windows support the EventSetInformation API. The
-    tld::SetInformation wrapper provides default behavior that works well in
-    most cases, but may not meet the needs of all users. The configuration
-    macros can be used to control how the tld::SetInformation function invokes
-    the EventSetInformation API. (Note that tld::SetInformation is called
-    automatically by the Provider class's constructor to register the
-    provider's traits with ETW.)
+    Not all versions of Windows support the EventSetInformation API.
+    TraceLogging requires EventSetInformation for full functionality, but can
+    operate in a degraded mode without it. The tld::SetInformation wrapper
+    provides default behavior that works well in most cases, but may not meet
+    the needs of all users. The configuration macros can be used to control how
+    the tld::SetInformation function invokes the EventSetInformation API. Note
+    that tld::SetInformation is called automatically by the Provider class's
+    constructor to register the provider's traits with ETW.
 
     When TLD_HAVE_EVENT_SET_INFORMATION is not defined and WINVER < 0x0602:
     SetInformation uses GetModuleHandleExW+GetProcAddress to find the
@@ -365,11 +361,12 @@ namespace tld
 
     If you set TLD_HAVE_EVENT_SET_INFORMATION:
     - If TLD_HAVE_EVENT_SET_INFORMATION == 0, SetInformation always returns an
-      error.
+      error (does not attempt to call EventSetInformation).
     - If TLD_HAVE_EVENT_SET_INFORMATION == 1, SetInformation calls
-      EventSetInformation.
+      EventSetInformation directly.
     - If TLD_HAVE_EVENT_SET_INFORMATION == 2, SetInformation locates
-      EventSetInformation via GetProcAddress.
+      EventSetInformation via GetProcAddress, calls it if found, or returns an
+      error if not found.
     */
 #ifndef TLD_HAVE_EVENT_SET_INFORMATION
   #if WINVER < 0x0602 // If targeting Windows before Windows 8
@@ -457,7 +454,7 @@ namespace tld
 
     Derives from EVENT_DESCRIPTOR. Adds convenient constructor and Reset
     members. Contains an event's Id/Version/Level/Opcode/Task/Keyword
-    settings. Use of this class is optional - you can use this class if you
+    settings. Use of this class is optional: you can use this class if you
     want to use the constructor or Reset methods, or you can use
     EVENT_DESCRIPTOR directly if you don't need the convenience methods.
     */
@@ -536,7 +533,7 @@ namespace tld
             level,
             opcode,
             task,
-            keywords);
+            keyword);
         EVENT_DATA_DESCRIPTOR pDataDescriptors[cFields + 2];
         for (int i = 0; i < cFields; i++)
         {
@@ -584,14 +581,14 @@ namespace tld
     function SetInformation (low-level API):
 
     Wrapper for ETW API EventSetInformation.
-    If TraceLoggingDynamic.cpp was compiled to require Win8 or later (as
+    If TraceLoggingDynamic.h was compiled to require Win8 or later (as
     determined by WINVER), this directly calls EventSetInformation. Otherwise,
     this attempts to dynamically load the EventSetInformation API via
     GetModuleHandleExW.
 
     The behavior of this function (e.g. to override the WINVER check) can be
     adjusted by setting the TLD_HAVE_EVENT_SET_INFORMATION macro as described
-    below.
+    above.
     */
     inline HRESULT SetInformation(
         _In_ REGHANDLE hProvider,
@@ -603,8 +600,9 @@ namespace tld
     function GetGuidForName (low-level API):
 
     Hashes a provider name to generate a GUID. Uses the same GUID generation
-    algorithm as System.Diagnostics.Tracing.EventSource (from .NET) and
-    Windows.Foundation.Diagnostics.LoggingChannel (from Windows Runtime).
+    algorithm as System.Diagnostics.Tracing.EventSource (from .NET),
+    Windows.Foundation.Diagnostics.LoggingChannel (from Windows Runtime),
+    and Windows SDK tools like tracelog and traceview.
     */
     inline GUID GetGuidForName(
         _In_z_ char const* szUtf8Name);
@@ -613,8 +611,9 @@ namespace tld
     function GetGuidForName (low-level API):
 
     Hashes a provider name to generate a GUID. Uses the same GUID generation
-    algorithm as .NET System.Diagnostics.Tracing.EventSource and Windows
-    Runtime Windows.Foundation.Diagnostics.LoggingChannel.
+    algorithm as System.Diagnostics.Tracing.EventSource (from .NET),
+    Windows.Foundation.Diagnostics.LoggingChannel (from Windows Runtime),
+    and Windows SDK tools like tracelog and traceview.
     */
     inline GUID GetGuidForName(
         _In_z_ wchar_t const* szUtf16Name);
@@ -650,7 +649,7 @@ namespace tld
 
 #ifndef _tld_ASSERT
   #if TLD_DEBUG
-    #define _tld_ASSERT(exp, str) ((void)(!(exp) ? (__annotation(L"Debug", L"AssertFail", L"TraceLogging: " L#exp L" : " L##str), DbgRaiseAssertionFailure(), 0) : 0))
+    #define _tld_ASSERT(exp, str) ((void)(!(exp) ? (__annotation(L"Debug", L"AssertFail", L"TraceLogging: " #exp L" : " str), DbgRaiseAssertionFailure(), 0) : 0))
   #else // TLD_DEBUG
     #define _tld_ASSERT(exp, str) ((void)0)
   #endif // TLD_DEBUG
@@ -782,10 +781,10 @@ namespace tld
 #pragma region Sha1ForNonSecretPurposes
 
         /*
-        Implements the SHA1 hashing algorithm. Note that this implementation is
-        for hashing public information. Do not use this code to hash private data,
-        as this implementation does not take any steps to avoid information
-        disclosure (i.e. does not scrub its buffers).
+        Implements the SHA1 hashing algorithm. Note that this implementation
+        is for hashing public information. Do not use this code to hash
+        private data, as this implementation does not take any steps to avoid
+        information disclosure (i.e. does not scrub its buffers).
         */
         class Sha1ForNonSecretPurposes
         {
@@ -914,30 +913,33 @@ namespace tld
 
         /*
         Transcodes one code point from UTF-8 to UTF-16LE.
-    
-        Note that this function requires the input buffer to be nul-terminated.
-        This function may try to read several bytes from the input buffer, and the
-        nul-termination is required to ensure that it doesn't read off the end of
-        the valid buffer when decoding what appears to be a multi-byte code point.
+
+        Note that this function requires the input buffer to be
+        nul-terminated. This function may try to read several bytes from the
+        input buffer, and the nul-termination is required to ensure that it
+        doesn't read off the end of the valid buffer when decoding what
+        appears to be a multi-byte code point.
 
         The UTF-8 validation is very permissive -- anything that is not valid
         UTF-8 is treated as if it were ISO-8859-1 (i.e. the BYTE value is cast
         to wchar_t and assumed to be a valid Unicode code point). This usually
-        works well - it has a reasonable probability of doing what the developer
-        expects even when the input is CP1252/Latin1 instead of UTF-8, and doesn't
-        fail too badly when it doesn't do what the developer expects.
+        works well - it has a reasonable probability of doing what the
+        developer expects even when the input is CP1252/Latin1 instead of
+        UTF-8, and doesn't fail too badly when it doesn't do what the
+        developer expects.
 
         pchUtf16Output:
-        Buffer that receives a single code point, encoded in UTF-16-LE as one or
-        two 16-bit wchar_t values.
-    
+        Buffer that receives a single code point, encoded in UTF-16-LE as one
+        or two 16-bit wchar_t values.
+
         pszUtf8Input:
-        Pointer into a nul-terminated UTF-8 byte sequence. On entry, this points
-        to the next char to be consumed. This function will advance the pointer
-        past the consumed data.
+        Pointer into a nul-terminated UTF-8 byte sequence. On entry, this
+        points to the next char to be consumed. This function will advance the
+        pointer past the consumed data.
 
         returns:
-        The number of 16-bit wchar_t values added to pchUtf16Output (one or two).
+        The number of 16-bit wchar_t values added to pchUtf16Output (one or
+        two).
         */
         static unsigned CopyUtfCodePoint(
             _Out_writes_to_(2, return) wchar_t* pchUtf16Output,
@@ -1011,22 +1013,24 @@ namespace tld
         /*
         Copies one code point of UTF-16LE data.
 
-        Note that this function requires the input buffer to be nul-terminated.
-        This function may try to read several words from the input buffer, and the
-        nul-termination is required to ensure that it doesn't read off the end of
-        the valid buffer when copying what appears to be a surrogate pair.
+        Note that this function requires the input buffer to be
+        nul-terminated.  This function may try to read several words from the
+        input buffer, and the nul-termination is required to ensure that it
+        doesn't read off the end of the valid buffer when copying what appears
+        to be a surrogate pair.
 
         pchUtf16Output:
-        Buffer that receives a single code point, encoded in UTF-16-LE as one or
-        two 16-bit wchar_t values.
+        Buffer that receives a single code point, encoded in UTF-16-LE as one
+        or two 16-bit wchar_t values.
 
         pszUtf16Input:
-        Pointer into a nul-terminated UTF-16-LE wchar_t sequence. On entry, this
-        points to the next wchar_t to be consumed. This function will advance the
-        pointer past the consumed data.
+        Pointer into a nul-terminated UTF-16-LE wchar_t sequence. On entry,
+        this points to the next wchar_t to be consumed. This function will
+        advance the pointer past the consumed data.
 
         returns:
-        The number of 16-bit wchar_t values added to pchUtf16Output (one or two).
+        The number of 16-bit wchar_t values added to pchUtf16Output (one or
+        two).
         */
         static unsigned CopyUtfCodePoint(
             _Out_writes_to_(2, return) wchar_t* pchUtf16Output,
@@ -1084,7 +1088,7 @@ namespace tld
                     bool const bDone = *pszName == 0;
                     if (bDone || cchBuffer - 1 <= iBuffer)
                     {
-    #pragma warning(suppress: 26035) // string is counted, not nul-terminated.
+#pragma warning(suppress: 26035) // string is counted, not nul-terminated.
                         LCMapStringEx(
                             LOCALE_NAME_INVARIANT,
                             LCMAP_UPPERCASE | LCMAP_BYTEREV,
@@ -1124,10 +1128,9 @@ namespace tld
     enum InType : UINT8
     {
         /*
-        A field with no value (0-length payload).
-        Arrays of InTypeNull are illegal.
+        Invalid InType.
         */
-        InTypeNull,
+        InTypeNull = 0,
 
         /*
         A nul-terminated CHAR16 string.
@@ -1136,13 +1139,14 @@ namespace tld
         InTypeUnicodeString,
 
         /*
-        A nul-terminated CHAR8 string.
+        A nul-terminated MBCS string.
         Useful OutTypes: Xml, Json, Utf8.
         */
         InTypeAnsiString,
 
         /*
         INT8.
+        Useful OutTypes: String (interprets the value as a CHAR8).
         */
         InTypeInt8,
 
@@ -1171,7 +1175,7 @@ namespace tld
 
         /*
         UINT32.
-        Useful OutTypes: Pid, Tid, IPv4, Win32Error, NTStatus.
+        Useful OutTypes: Pid, Tid, IPv4, Win32Error, NTStatus, CodePointer.
         */
         InTypeUInt32,
 
@@ -1182,6 +1186,7 @@ namespace tld
 
         /*
         UINT64.
+        Useful OutTypes: CodePointer.
         */
         InTypeUInt64,
 
@@ -1202,9 +1207,9 @@ namespace tld
 
         /*
         UINT16 byte-count followed by binary data.
-        Useful OutTypes: IPv6, SocketAddress.
+        Useful OutTypes: IPv6, SocketAddress, Pkcs7WithTypeInfo.
         Arrays of InTypeBinary are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
+        but most decoding tools will be unable to decode them).
         */
         InTypeBinary,
 
@@ -1215,17 +1220,19 @@ namespace tld
 
         /*
         Not supported. Use InTypePointer. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
+        but most decoding tools will be unable to decode them).
         */
         InTypePointer_PlatformSpecific,
 
         /*
         FILETIME.
+        Useful OutTypes: DateTimeCultureInsensitive, DateTimeUtc.
         */
         InTypeFileTime,
 
         /*
         SYSTEMTIME.
+        Useful OutTypes: DateTimeCultureInsensitive, DateTimeUtc.
         */
         InTypeSystemTime,
 
@@ -1236,28 +1243,32 @@ namespace tld
 
         /*
         INT32.
+        Useful OutTypes: Win32Error, NTStatus, CodePointer.
         */
         InTypeHexInt32,
 
         /*
         INT64.
+        Useful OutTypes: CodePointer.
         */
         InTypeHexInt64,
 
         /*
         UINT16 byte-count followed by UTF-16 data.
+        Useful OutTypes: Xml, Json.
         */
         InTypeCountedString,
 
         /*
         UINT16 byte-count followed by MBCS data.
+        Useful OutTypes: Xml, Json, Utf8.
         */
         InTypeCountedAnsiString,
 
         /*
         This field has no value by itself, but it causes the decoder to treat
         the next N fields as part of this field. The value of N is taken from
-        the field's OutType.
+        the field's OutType. N should not be 0.
 
         Note that it is valid to have an array of structs. The array length
         will apply to the entire group of fields contained in the array.
@@ -1267,6 +1278,17 @@ namespace tld
         */
         InTypeStruct,
 
+        /*
+        UINT16 byte-count followed by binary data.
+        Useful OutTypes: IPv6, SocketAddress, Pkcs7WithTypeInfo.
+
+        This is the same as InTypeBinary except:
+        - Newer type code. Decoding support added in Windows 2018 Fall Update.
+        - Decodes without the synthesized "FieldName.Length" fields.
+        - Array of InTypeCountedBinary is supported.
+        */
+        InTypeCountedBinary,
+
         /*
         INT_PTR.
         InTypeIntPtr is an alias for either InTypeInt32 or InTypeInt64.
@@ -1293,39 +1315,37 @@ namespace tld
 
     enum OutType : UINT8
     {
-        OutTypeDefault = 0x00,
-        OutTypeNoPrint = 0x01,
-        OutTypeString = 0x02,    // affects 8-bit and 16-bit integral types.
-        OutTypeBoolean = 0x03,   // affects 8-bit and 32-bit integral types.
-        OutTypeHex = 0x04,       // affects integral types.
-        OutTypePid = 0x05,       // affects 32-bit integral types.
-        OutTypeTid = 0x06,       // affects 32-bit integral types.
-        OutTypePort = 0x07,      // affects 16-bit integral types.
-        OutTypeIPv4 = 0x08,      // affects 32-bit integral types.
-        OutTypeIPv6 = 0x09,      // affects arrays of 8-bit integral types, e.g. UInt8[].
-        OutTypeSocketAddress = 0x0a, // affects arrays of 8-bit integral types, e.g. UInt8[].
-        OutTypeXml = 0x0b,       // affects strings; affects arrays of 8-bit and 16-bit integral types.
-        OutTypeJson = 0x0c,      // affects strings; affects arrays of 8-bit and 16-bit integral types.
-        OutTypeWin32Error = 0x0d,// affects 32-bit integral types.
-        OutTypeNTStatus = 0x0e,  // affects 32-bit integral types.
-        OutTypeHResult = 0x0f,   // affects 32-bit integral types.
-        OutTypeFileTime = 0x10,  // affects 64-bit integral types.
-        OutTypeSigned = 0x11,    // affects integral types.
-        OutTypeUnsigned = 0x12,  // affects integral types.
-        OutTypeDateTimeCultureInsensitive = 0x21, // affects FileTime, SystemTime.
-        OutTypeUtf8 = 0x23,      // affects AnsiString types.
-        OutTypePkcs7WithTypeInfo = 0x24, // affects binary types.
-        OutTypeCodePointer = 0x25, // affects UInt32, UInt64, HexInt32, HexInt64.
-        OutTypeDateTimeUtc = 0x26, // affects FileTime, SystemTime.
+        OutTypeDefault = 0x00,   // Field formatted based on InType.
+        OutTypeNoPrint = 0x01,   // Ignored by most decoders.
+        OutTypeString = 0x02,    // Use with Int8, UInt8, UInt16.
+        OutTypeBoolean = 0x03,   // Use with UInt8.
+        OutTypeHex = 0x04,       // Use with UInt8, UInt16.
+        OutTypePid = 0x05,       // Use with UInt32.
+        OutTypeTid = 0x06,       // Use with UInt32.
+        OutTypePort = 0x07,      // Use with UInt16.
+        OutTypeIPv4 = 0x08,      // Use with UInt32.
+        OutTypeIPv6 = 0x09,      // Use with Binary, CountedBinary.
+        OutTypeSocketAddress = 0x0a,// Use with Binary, CountedBinary.
+        OutTypeXml = 0x0b,       // Use with String types.
+        OutTypeJson = 0x0c,      // Use with String types.
+        OutTypeWin32Error = 0x0d,// Use with UInt32, HexInt32.
+        OutTypeNTStatus = 0x0e,  // Use with UInt32, HexInt32.
+        OutTypeHResult = 0x0f,   // Use with Int32.
+        OutTypeFileTime = 0x10,
+        OutTypeSigned = 0x11,
+        OutTypeUnsigned = 0x12,
+        OutTypeDateTimeCultureInsensitive = 0x21, // Use with FileTime, SystemTime.
+        OutTypeUtf8 = 0x23,      // Use with AnsiString, CountedAnsiString.
+        OutTypePkcs7WithTypeInfo = 0x24, // Use with Binary, CountedBinary.
+        OutTypeCodePointer = 0x25, // Use with UInt32, UInt64, HexInt32, HexInt64.
+        OutTypeDateTimeUtc = 0x26, // Use with FileTime, SystemTime.
         OutTypeMask = 0x7f // OutType must fit into 7 bits.
     };
 
     enum Type : UINT16
     {
         /*
-        Field with no data (empty). 0-length payload.
-        Can only be used on scalar fields. Illegal for arrays.
-        NOTE: Not well-supported by decoders.
+        Invalid type.
         */
         TypeNone = InTypeNull,
 
@@ -1335,12 +1355,36 @@ namespace tld
         */
         TypeUtf16String = InTypeUnicodeString,
 
+        /*
+        Encoding assumes nul-terminated CHAR16 string.
+        Formatting treats as UTF-16LE XML.
+        */
+        TypeUtf16Xml = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeXml),
+
+        /*
+        Encoding assumes nul-terminated CHAR16 string.
+        Formatting treats as UTF-16LE JSON.
+        */
+        TypeUtf16Json = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeJson),
+
         /*
         Encoding assumes 0-terminated CHAR8 string.
         Formatting treats as MBCS string.
         */
         TypeMbcsString = InTypeAnsiString,
 
+        /*
+        Encoding assumes nul-terminated CHAR8 string.
+        Formatting treats as UTF-8 XML.
+        */
+        TypeMbcsXml = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeXml),
+
+        /*
+        Encoding assumes nul-terminated CHAR8 string.
+        Formatting treats as UTF-8 JSON.
+        */
+        TypeMbcsJson = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeJson),
+
         /*
         Encoding assumes nul-terminated CHAR8 string.
         Formatting treats as UTF-8 string.
@@ -1359,6 +1403,24 @@ namespace tld
         */
         TypeUInt8 = InTypeUInt8,
 
+        /*
+        Encoding assumes 1-byte value.
+        Formatting treats as hexadecimal unsigned integer.
+        */
+        TypeHexInt8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeHex),
+
+        /*
+        Encoding assumes 1-byte value.
+        Formatting treats as ANSI character.
+        */
+        TypeChar8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeString),
+
+        /*
+        Encoding assumes 1-byte value.
+        Formatting treats as Boolean.
+        */
+        TypeBool8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeBoolean),
+
         /*
         Encoding assumes 2-byte value.
         Formatting treats as signed integer.
@@ -1372,114 +1434,130 @@ namespace tld
         TypeUInt16 = InTypeUInt16,
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as signed integer.
+        Encoding assumes 2-byte value.
+        Formatting treats as big-endian IP port(s).
         */
-        TypeInt32 = InTypeInt32,
+        TypePort = _tld_MAKE_TYPE(InTypeUInt16, OutTypePort),
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as unsigned integer.
+        Encoding assumes 2-byte value.
+        Formatting treats as hexadecimal unsigned integer.
         */
-        TypeUInt32 = InTypeUInt32,
+        TypeHexInt16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeHex),
 
         /*
-        Encoding assumes 8-byte value.
+        Encoding assumes 2-byte value.
+        Formatting treats as UTF-16LE character.
+        */
+        TypeChar16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeString),
+
+        /*
+        Encoding assumes 4-byte value.
         Formatting treats as signed integer.
         */
-        TypeInt64 = InTypeInt64,
+        TypeInt32 = InTypeInt32,
 
         /*
-        Encoding assumes 8-byte value.
+        Encoding assumes 4-byte value.
+        Formatting treats as HRESULT(s).
+        */
+        TypeHResult = _tld_MAKE_TYPE(InTypeInt32, OutTypeHResult),
+
+        /*
+        Encoding assumes 4-byte value.
         Formatting treats as unsigned integer.
         */
-        TypeUInt64 = InTypeUInt64,
+        TypeUInt32 = InTypeUInt32,
 
         /*
         Encoding assumes 4-byte value.
-        Formatting treats as Float32.
+        Formatting treats as process identifier.
         */
-        TypeFloat = InTypeFloat,
+        TypePid = _tld_MAKE_TYPE(InTypeUInt32, OutTypePid),
 
         /*
-        Encoding assumes 8-byte value.
-        Formatting treats as Float64.
+        Encoding assumes 4-byte value.
+        Formatting treats as thread identifier.
         */
-        TypeDouble = InTypeDouble,
+        TypeTid = _tld_MAKE_TYPE(InTypeUInt32, OutTypeTid),
 
         /*
         Encoding assumes 4-byte value.
-        Formatting treats as Boolean.
+        Formatting treats as IPv4 address.
         */
-        TypeBool32 = InTypeBool32,
+        TypeIPv4 = _tld_MAKE_TYPE(InTypeUInt32, OutTypeIPv4),
 
         /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as binary blob.
-        Arrays of TypeBinary are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
+        Encoding assumes 4-byte value.
+        Formatting treats as Win32 error(s).
         */
-        TypeBinary = InTypeBinary,
+        TypeWin32Error = _tld_MAKE_TYPE(InTypeUInt32, OutTypeWin32Error),
 
         /*
-        Encoding assumes 16-byte value.
-        Formatting treats as GUID.
+        Encoding assumes 4-byte value.
+        Formatting treats as NTSTATUS(s).
         */
-        TypeGuid = InTypeGuid,
+        TypeNTStatus = _tld_MAKE_TYPE(InTypeUInt32, OutTypeNTStatus),
 
         /*
         Encoding assumes 8-byte value.
-        Formatting treats as FILETIME.
+        Formatting treats as signed integer.
         */
-        TypeFileTime = InTypeFileTime,
+        TypeInt64 = InTypeInt64,
 
         /*
-        Encoding assumes 16-byte value.
-        Formatting treats as SYSTEMTIME.
+        Encoding assumes 8-byte value.
+        Formatting treats as unsigned integer.
         */
-        TypeSystemTime = InTypeSystemTime,
+        TypeUInt64 = InTypeUInt64,
 
         /*
-        Encoding assumes 16-byte value.
-        Formatting treats as UTC SYSTEMTIME.
+        Encoding assumes 4-byte value.
+        Formatting treats as Float32.
         */
-        TypeSystemTimeUtc = _tld_MAKE_TYPE(InTypeSystemTime, OutTypeDateTimeUtc),
+        TypeFloat = InTypeFloat,
 
         /*
-        Encoding assumes SID. Length is determined from number of subauthorities.
-        Formatting treats as a SID.
+        Encoding assumes 8-byte value.
+        Formatting treats as Float64.
         */
-        TypeSid = InTypeSid,
+        TypeDouble = InTypeDouble,
 
         /*
         Encoding assumes 4-byte value.
-        Formatting treats as hexadecimal unsigned integer.
+        Formatting treats as Boolean.
         */
-        TypeHexInt32 = InTypeHexInt32,
+        TypeBool32 = InTypeBool32,
 
         /*
-        Encoding assumes 8-byte value.
-        Formatting treats as hexadecimal unsigned integer.
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as binary blob.
+        Arrays of TypeBinary are not supported. (No error will be reported,
+        but most decoding tools will be unable to decode them.)
         */
-        TypeHexInt64 = InTypeHexInt64,
+        TypeBinary = InTypeBinary,
 
         /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE string.
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as IPv6 address.
+        Arrays of TypeIPv6 are not supported. (No error will be reported,
+        but most decoding tools will be unable to decode them.)
         */
-        TypeCountedUtf16String = InTypeCountedString,
+        TypeIPv6 = _tld_MAKE_TYPE(InTypeBinary, OutTypeIPv6),
 
         /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as MBCS string.
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as SOCKADDR.
+        Arrays of TypeSocketAddress are not supported. (No error will be
+        reported, but most decoding tools will be unable to decode them.)
         */
-        TypeCountedMbcsString = InTypeCountedAnsiString,
+        TypeSocketAddress = _tld_MAKE_TYPE(InTypeBinary, OutTypeSocketAddress),
 
         /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as UTF-8 string.
+        Encoding assumes 16-byte value.
+        Formatting treats as GUID.
         */
-        TypeCountedUtf8String = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeUtf8),
+        TypeGuid = InTypeGuid,
 
         /*
         Encoding assumes pointer-sized value.
@@ -1518,104 +1596,64 @@ namespace tld
         TypeCodePointer = _tld_MAKE_TYPE(InTypePointer, OutTypeCodePointer),
 
         /*
-        Encoding assumes 2-byte value.
-        Formatting treats as UTF-16LE character.
-        */
-        TypeChar16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeString),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as ANSI character.
-        */
-        TypeChar8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeString),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as Boolean.
-        */
-        TypeBool8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeBoolean),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as hexadecimal unsigned integer.
-        */
-        TypeHexInt8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeHex),
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as hexadecimal unsigned integer.
+        Encoding assumes 8-byte value.
+        Formatting treats as FILETIME.
         */
-        TypeHexInt16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeHex),
+        TypeFileTime = InTypeFileTime,
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as process identifier.
+        Encoding assumes 16-byte value.
+        Formatting treats as SYSTEMTIME.
         */
-        TypePid = _tld_MAKE_TYPE(InTypeUInt32, OutTypePid),
+        TypeSystemTime = InTypeSystemTime,
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as thread identifier.
+        Encoding assumes 16-byte value.
+        Formatting treats as UTC SYSTEMTIME.
         */
-        TypeTid = _tld_MAKE_TYPE(InTypeUInt32, OutTypeTid),
+        TypeSystemTimeUtc = _tld_MAKE_TYPE(InTypeSystemTime, OutTypeDateTimeUtc),
 
         /*
-        Encoding assumes 2-byte value.
-        Formatting treats as big-endian IP port(s).
+        Encoding assumes SID. Length is determined from number of subauthorities.
+        Formatting treats as a SID.
         */
-        TypePort = _tld_MAKE_TYPE(InTypeUInt16, OutTypePort),
+        TypeSid = InTypeSid,
 
         /*
         Encoding assumes 4-byte value.
-        Formatting treats as IPv4 address.
+        Formatting treats as hexadecimal unsigned integer.
         */
-        TypeIPv4 = _tld_MAKE_TYPE(InTypeUInt32, OutTypeIPv4),
+        TypeHexInt32 = InTypeHexInt32,
 
         /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as IPv6 address.
-        Arrays of TypeIPv6 are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
+        Encoding assumes 8-byte value.
+        Formatting treats as hexadecimal unsigned integer.
         */
-        TypeIPv6 = _tld_MAKE_TYPE(InTypeBinary, OutTypeIPv6),
+        TypeHexInt64 = InTypeHexInt64,
 
         /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as SOCKADDR.
-        Arrays of TypeSocketAddress are not supported. (No error will be
-        reported, but decoding tools will probably not be able to decode them).
+        Encoding assumes 2-byte bytecount followed by CHAR16 data.
+        Formatting treats as UTF-16LE string.
         */
-        TypeSocketAddress = _tld_MAKE_TYPE(InTypeBinary, OutTypeSocketAddress),
+        TypeCountedUtf16String = InTypeCountedString,
 
         /*
-        Encoding assumes nul-terminated CHAR16 string.
+        Encoding assumes 2-byte bytecount followed by CHAR16 data.
         Formatting treats as UTF-16LE XML.
         */
-        TypeUtf16Xml = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeXml),
-
-        /*
-        Encoding assumes nul-terminated CHAR8 string.
-        Formatting treats as UTF-8 XML.
-        */
-        TypeMbcsXml = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeXml),
+        TypeCountedUtf16Xml = _tld_MAKE_TYPE(InTypeCountedString, OutTypeXml),
 
         /*
-        Encoding assumes nul-terminated CHAR16 string.
+        Encoding assumes 2-byte bytecount followed by CHAR16 data.
         Formatting treats as UTF-16LE JSON.
         */
-        TypeUtf16Json = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeJson),
-
-        /*
-        Encoding assumes nul-terminated CHAR8 string.
-        Formatting treats as UTF-8 JSON.
-        */
-        TypeMbcsJson = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeJson),
+        TypeCountedUtf16Json = _tld_MAKE_TYPE(InTypeCountedString, OutTypeJson),
 
         /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE XML.
+        Encoding assumes 2-byte bytecount followed by CHAR8 data.
+        Formatting treats as MBCS string.
         */
-        TypeCountedUtf16Xml = _tld_MAKE_TYPE(InTypeCountedString, OutTypeXml),
+        TypeCountedMbcsString = InTypeCountedAnsiString,
 
         /*
         Encoding assumes 2-byte bytecount followed by CHAR8 data.
@@ -1624,34 +1662,37 @@ namespace tld
         TypeCountedMbcsXml = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeXml),
 
         /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE JSON.
+        Encoding assumes 2-byte bytecount followed by CHAR8 data.
+        Formatting treats as UTF-8 JSON.
         */
-        TypeCountedUtf16Json = _tld_MAKE_TYPE(InTypeCountedString, OutTypeJson),
+        TypeCountedMbcsJson = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeJson),
 
         /*
         Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as UTF-8 JSON.
+        Formatting treats as UTF-8 string.
         */
-        TypeCountedMbcsJson = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeJson),
+        TypeCountedUtf8String = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeUtf8),
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as Win32 error(s).
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as binary blob.
+        Newer type code. Decoding support added in Windows 2018 Fall Update.
         */
-        TypeWin32Error = _tld_MAKE_TYPE(InTypeUInt32, OutTypeWin32Error),
+        TypeCountedBinary = InTypeCountedBinary,
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as NTSTATUS(s).
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as IPv6 address.
+        Newer type code. Decoding support added in Windows 2018 Fall Update.
         */
-        TypeNTStatus = _tld_MAKE_TYPE(InTypeUInt32, OutTypeNTStatus),
+        TypeCountedIPv6 = _tld_MAKE_TYPE(InTypeCountedBinary, OutTypeIPv6),
 
         /*
-        Encoding assumes 4-byte value.
-        Formatting treats as HRESULT(s).
+        Encoding assumes 2-byte length followed by binary data.
+        Formatting treats as SOCKADDR.
+        Newer type code. Decoding support added in Windows 2018 Fall Update.
         */
-        TypeHResult = _tld_MAKE_TYPE(InTypeInt32, OutTypeHResult)
+        TypeCountedSocketAddress = _tld_MAKE_TYPE(InTypeCountedBinary, OutTypeSocketAddress),
     };
 
     enum ProviderTraitType : UINT8
@@ -1683,7 +1724,7 @@ namespace tld
     {
         explicit EventDescriptor(
             UCHAR level = 5, // 5 = WINEVENT_LEVEL_VERBOSE
-            ULONGLONG keyword = 0, // 0 = no keywords
+            ULONGLONG keyword = 0, // 0 = no keyword
             UCHAR opcode = 0, // 0 = WINEVENT_OPCODE_INFO
             USHORT task = 0) // 0 = WINEVENT_TASK_NONE
         {
@@ -1692,7 +1733,7 @@ namespace tld
 
         void Reset(
             UCHAR level = 5, // 5 = WINEVENT_LEVEL_VERBOSE
-            ULONGLONG keyword = 0, // 0 = no keywords
+            ULONGLONG keyword = 0, // 0 = no keyword
             UCHAR opcode = 0, // 0 = WINEVENT_OPCODE_INFO
             USHORT task = 0) // 0 = WINEVENT_TASK_NONE
         {
@@ -2412,8 +2453,8 @@ namespace tld
         }
 
         /*
-        Appends an InTypeBinary field to the payload.
-        Compatible with: TypeBinary, TypeIPv6, TypeSocketAddress.
+        Appends an InTypeBinary or InTypeCountedBinary field to the payload.
+        Compatible with: Type[Counted]Binary, Type[Counted]IPv6, Type[Counted]SocketAddress.
         */
         void AddBinary(_In_reads_bytes_(cbData) void const* pbData, UINT16 cbData)
         {
@@ -2731,9 +2772,9 @@ namespace tld
             return level < m_levelPlus1;
         }
 
-        bool IsEnabled(UCHAR level, ULONGLONG keywords) const
+        bool IsEnabled(UCHAR level, ULONGLONG keyword) const
         {
-            return level < m_levelPlus1 && IsEnabledForKeywords(keywords);
+            return level < m_levelPlus1 && IsEnabledForKeywords(keyword);
         }
 
         HRESULT SetInformation(
@@ -3078,8 +3119,8 @@ namespace tld
         }
 
         /*
-        Appends an InTypeBinary field to the payload.
-        Compatible with: TypeBinary, TypeIPv6, TypeSocketAddress.
+        Appends an InTypeBinary or InTypeCountedBinary field to the payload.
+        Compatible with: Type[Counted]Binary, Type[Counted]IPv6, Type[Counted]SocketAddress.
         */
         void AddBinary(_In_reads_bytes_(cbData) void const* pbData, UINT16 cbData)
         {
@@ -3162,14 +3203,14 @@ namespace tld
         Event(
             _In_z_ char const* szUtf8Name,
             UCHAR level = 5,
-            ULONGLONG keywords = 0,
+            ULONGLONG keyword = 0,
             UINT32 tags = 0,
             UCHAR opcode = 0,
             USHORT task = 0,
             GUID const* pActivityId = 0,
             GUID const* pRelatedActivityId = 0)
             : EventBuilder<ByteBufferTy>(m_metaBuffer, m_dataBuffer, m_state)
-            , m_descriptor(level, keywords, opcode, task)
+            , m_descriptor(level, keyword, opcode, task)
             , m_pActivityId(pActivityId)
             , m_pRelatedActivityId(pRelatedActivityId)
             , m_state(EventStateOpen)
@@ -3180,14 +3221,14 @@ namespace tld
         Event(
             _In_z_ wchar_t const* szUtf16Name,
             UCHAR level = 5,
-            ULONGLONG keywords = 0,
+            ULONGLONG keyword = 0,
             UINT32 tags = 0,
             UCHAR opcode = 0,
             USHORT task = 0,
             GUID const* pActivityId = 0,
             GUID const* pRelatedActivityId = 0)
             : EventBuilder<ByteBufferTy>(m_metaBuffer, m_dataBuffer, m_state)
-            , m_descriptor(level, keywords, opcode, task)
+            , m_descriptor(level, keyword, opcode, task)
             , m_pActivityId(pActivityId)
             , m_pRelatedActivityId(pRelatedActivityId)
             , m_state(EventStateOpen)
@@ -3202,7 +3243,7 @@ namespace tld
         void Reset(
             _In_z_ CharTy const* szUtfName,
             UCHAR level = 5,
-            ULONGLONG keywords = 0,
+            ULONGLONG keyword = 0,
             UINT32 tags = 0,
             UCHAR opcode = 0,
             USHORT task = 0,
@@ -3211,7 +3252,7 @@ namespace tld
         {
             m_metaBuffer.clear();
             m_dataBuffer.clear();
-            m_descriptor.Reset(level, keywords, opcode, task);
+            m_descriptor.Reset(level, keyword, opcode, task);
             m_pActivityId = pActivityId;
             m_pRelatedActivityId = pRelatedActivityId;
             m_state = EventStateOpen;
@@ -3355,7 +3396,7 @@ namespace tld
         }
 
         /*
-        Note: the default channel is 11 (WINEVENT_CHANNEL_TRACELOGGING). 
+        Note: the default channel is 11 (WINEVENT_CHANNEL_TRACELOGGING).
         Other channels are only supported if the provider is running on
         Windows 10 or later. If a provider is running on an earlier version
         of Windows and it uses a channel other than 11, TDH will not be able
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
index d0aff9324a2..14076a8b3ef 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
@@ -31,6 +31,11 @@
 #include "opentelemetry/trace/span_id.h"
 #include "opentelemetry/trace/trace_id.h"
 
+#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_metadata.h"
+
 #include "opentelemetry/exporters/etw/etw_config.h"
 #include "opentelemetry/exporters/etw/etw_fields.h"
 #include "opentelemetry/exporters/etw/etw_properties.h"
@@ -121,7 +126,7 @@ class LogRecord : public opentelemetry::logs::LogRecord
 
   std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes_map_;
   opentelemetry::common::AttributeValue body_ = opentelemetry::nostd::string_view();
-  opentelemetry::common::SystemTimestamp timestamp_;
+  opentelemetry::common::SystemTimestamp timestamp_;  // unset (epoch) by default
   opentelemetry::common::SystemTimestamp observed_timestamp_ = std::chrono::system_clock::now();
 
   opentelemetry::trace::TraceId trace_id_;
@@ -194,7 +199,44 @@ class Logger : public opentelemetry::logs::Logger
 
   nostd::unique_ptr<opentelemetry::logs::LogRecord> CreateLogRecord() noexcept
   {
-    return nostd::unique_ptr<opentelemetry::logs::LogRecord>(new LogRecord());
+    nostd::unique_ptr<LogRecord> log_record(new LogRecord());
+
+    // Populate trace context from the current active span (if any)
+    if (opentelemetry::context::RuntimeContext::GetCurrent().HasKey(opentelemetry::trace::kSpanKey))
+    {
+      opentelemetry::context::ContextValue context_value =
+          opentelemetry::context::RuntimeContext::GetCurrent().GetValue(
+              opentelemetry::trace::kSpanKey);
+      if (opentelemetry::nostd::holds_alternative<
+              opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(context_value))
+      {
+        opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> &span =
+            opentelemetry::nostd::get<opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(
+                context_value);
+        if (span)
+        {
+          log_record->SetTraceId(span->GetContext().trace_id());
+          log_record->SetSpanId(span->GetContext().span_id());
+          log_record->SetTraceFlags(span->GetContext().trace_flags());
+        }
+      }
+      else if (opentelemetry::nostd::holds_alternative<
+                   opentelemetry::nostd::shared_ptr<opentelemetry::trace::SpanContext>>(
+                   context_value))
+      {
+        opentelemetry::nostd::shared_ptr<opentelemetry::trace::SpanContext> &span_context =
+            opentelemetry::nostd::get<
+                opentelemetry::nostd::shared_ptr<opentelemetry::trace::SpanContext>>(context_value);
+        if (span_context)
+        {
+          log_record->SetTraceId(span_context->trace_id());
+          log_record->SetSpanId(span_context->span_id());
+          log_record->SetTraceFlags(span_context->trace_flags());
+        }
+      }
+    }
+
+    return nostd::unique_ptr<opentelemetry::logs::LogRecord>(log_record.release());
   }
 
   using opentelemetry::logs::Logger::EmitLogRecord;
@@ -305,6 +347,11 @@ class Logger : public opentelemetry::logs::Logger
     }
     evt[ETW_FIELD_PAYLOAD_NAME]              = std::string(name.data(), name.size());
     std::chrono::system_clock::time_point ts = timestamp;
+    // Per OTel Log Data Model: if timestamp is unset (epoch), fall back to observed time (now)
+    if (ts.time_since_epoch().count() == 0)
+    {
+      ts = std::chrono::system_clock::now();
+    }
     int64_t tsNs =
         std::chrono::duration_cast<std::chrono::nanoseconds>(ts.time_since_epoch()).count();
     evt[ETW_FIELD_TIMESTAMP] = utils::formatUtcTimestampNsAsISO8601(tsNs);
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
index 3a14780d8c7..acc888c8b2d 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #ifdef _WIN32
-#  include <Windows.h>
+#  include <windows.h>
 #endif
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
index 7dc2bad0ffc..dada117877d 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
@@ -42,7 +42,7 @@
 #include <vector>
 
 #ifdef HAVE_KRABS_TESTS
-// krabs.hpp requires this definition of min macro from Windows.h
+// krabs.hpp requires this definition of min macro from windows.h
 #  ifndef min
 #    define min(a, b) (((a) < (b)) ? (a) : (b))
 #  endif
@@ -210,6 +210,11 @@ class ETWProvider
         auto &data           = it->second;
         unsigned long result = STATUS_OK;
 
+        if (data.refCount == 0)
+        {
+          return STATUS_ERROR;
+        }
+
         data.refCount--;
         if (data.refCount == 0)
         {
@@ -232,6 +237,7 @@ class ETWProvider
         }
         return result;
       }
+      ++it;
     }
     return STATUS_ERROR;
   }
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
index aa23e6f81b8..d0b050fcc7a 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
@@ -6,7 +6,7 @@
 #include "opentelemetry/version.h"
 
 #ifdef _WIN32
-#  include "Windows.h"
+#  include "windows.h"
 #endif
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
index c6c7f0ed67e..2b975e239c6 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
@@ -159,11 +159,16 @@ void UpdateStatus(T &t, Properties &props)
 /**
  * @brief Tracer class that allows to send spans to ETW Provider.
  */
-
 class Tracer : public opentelemetry::trace::Tracer,
                public std::enable_shared_from_this<opentelemetry::trace::Tracer>
 {
+public:
+  /**
+   * @brief Indicates whether the tracer is closed.
+   */
+  bool IsClosed() const noexcept { return isClosed_.load(); }
 
+private:
   /**
    * @brief Parent provider of this Tracer
    */
@@ -397,16 +402,6 @@ class Tracer : public opentelemetry::trace::Tracer,
 
   friend class Span;
 
-  /**
-   * @brief Init a reference to etw::ProviderHandle
-   * @return Provider Handle
-   */
-  ETWProvider::Handle &initProvHandle()
-  {
-    isClosed_ = false;
-    return etwProvider().open(provId, encoding);
-  }
-
 public:
   /**
    * @brief Tracer constructor
@@ -421,11 +416,11 @@ class Tracer : public opentelemetry::trace::Tracer,
         tracerProvider_(parent),
         provId(providerId.data(), providerId.size()),
         encoding(encoding),
-        provHandle(initProvHandle())
+        provHandle(etwProvider().open(provId, encoding))
   {
+    isClosed_.store(false);
     traceId_ = GetIdGenerator(tracerProvider_).GenerateTraceId();
   }
-
   /**
    * @brief Start Span
    * @param name Span name
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/utils.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/utils.h
index f3665efc806..a59338147ea 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/utils.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/utils.h
@@ -17,12 +17,12 @@
 #include "opentelemetry/version.h"
 
 #ifdef _WIN32
-#  include <Windows.h>
 #  include <evntprov.h>
 #  include <wincrypt.h>
+#  include <windows.h>
 #  pragma comment(lib, "Advapi32.lib")
 #  pragma comment(lib, "Rpcrt4.lib")
-#  include <Objbase.h>
+#  include <objbase.h>
 #  pragma comment(lib, "Ole32.Lib")
 #else
 #  include <codecvt>
diff --git a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/uuid.h b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
index dfe749d8314..243432f82fd 100644
--- a/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
+++ b/deps/opentelemetry-cpp/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #ifdef _WIN32
-#  include "Windows.h"
+#  include "windows.h"
 #endif
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/etw/test/etw_logger_test.cc b/deps/opentelemetry-cpp/exporters/etw/test/etw_logger_test.cc
index f901d784b3e..47f8860275d 100644
--- a/deps/opentelemetry-cpp/exporters/etw/test/etw_logger_test.cc
+++ b/deps/opentelemetry-cpp/exporters/etw/test/etw_logger_test.cc
@@ -11,6 +11,7 @@
 #  define OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW
 
 #  include "opentelemetry/exporters/etw/etw_logger_exporter.h"
+#  include "opentelemetry/exporters/etw/etw_tracer_exporter.h"
 #  include "opentelemetry/sdk/trace/simple_processor.h"
 
 using namespace OPENTELEMETRY_NAMESPACE;
@@ -195,4 +196,112 @@ TEST(ETWLogger, LoggerCheckWithTimestampAttributes)
       logger->Debug("This is a debug log body", opentelemetry::common::MakeAttributes(attribs)));
 }
 
+/**
+ * @brief Test that LogRecord created within an active span context
+ *        inherits TraceId, SpanId, and TraceFlags from the current span.
+ *
+ * This test verifies the fix for issue #3830 where traceId and spanId
+ * were incorrectly reported as all zeros.
+ */
+TEST(ETWLogger, LoggerInheritsTraceContextFromActiveSpan)
+{
+  std::string providerName = kGlobalProviderName;
+
+  // Create tracer and logger providers
+  exporter::etw::TracerProvider tp;
+  exporter::etw::LoggerProvider lp;
+
+  auto tracer = tp.GetTracer(providerName);
+  auto logger = lp.GetLogger(providerName, "test");
+
+  // Create a span and set it as the active span
+  auto span  = tracer->StartSpan("TestSpan");
+  auto scope = tracer->WithActiveSpan(span);
+
+  // Get the span's trace context for verification
+  auto span_context = span->GetContext();
+
+  // Create a log record while the span is active
+  auto log_record = logger->CreateLogRecord();
+  ASSERT_NE(log_record, nullptr);
+
+  // Cast to ETW LogRecord to access trace context
+  auto *etw_record = static_cast<exporter::etw::LogRecord *>(log_record.get());
+
+  // Verify TraceId matches the active span's TraceId
+  EXPECT_EQ(etw_record->GetTraceId(), span_context.trace_id());
+
+  // Verify SpanId matches the active span's SpanId
+  EXPECT_EQ(etw_record->GetSpanId(), span_context.span_id());
+
+  // Verify TraceFlags match
+  EXPECT_EQ(etw_record->GetTraceFlags(), span_context.trace_flags());
+
+  // Emit the log (should not throw)
+  EXPECT_NO_THROW(logger->EmitLogRecord(std::move(log_record)));
+
+  span->End();
+}
+
+/**
+ * @brief Test that LogRecord created without an active span context
+ *        has default (invalid/zero) TraceId and SpanId.
+ */
+TEST(ETWLogger, LoggerWithoutActiveSpanHasDefaultTraceContext)
+{
+  std::string providerName = kGlobalProviderName;
+  exporter::etw::LoggerProvider lp;
+
+  auto logger = lp.GetLogger(providerName, "test");
+
+  // Create a log record without any active span
+  auto log_record = logger->CreateLogRecord();
+  ASSERT_NE(log_record, nullptr);
+
+  auto *etw_record = static_cast<exporter::etw::LogRecord *>(log_record.get());
+
+  // TraceId and SpanId should be invalid (all zeros) when no span is active
+  EXPECT_FALSE(etw_record->GetTraceId().IsValid());
+  EXPECT_FALSE(etw_record->GetSpanId().IsValid());
+
+  EXPECT_NO_THROW(logger->EmitLogRecord(std::move(log_record)));
+}
+
+/**
+ * @brief Test that LogRecord timestamp defaults to a valid time (not epoch).
+ *
+ * This test verifies the fix for issue #3830 where timestamp was
+ * incorrectly reported as 1970-01-01 (epoch).
+ */
+TEST(ETWLogger, LoggerTimestampIsNotEpoch)
+{
+  std::string providerName = kGlobalProviderName;
+  exporter::etw::LoggerProvider lp;
+
+  auto logger = lp.GetLogger(providerName, "test");
+
+  // Capture time before creating log record
+  auto before = std::chrono::system_clock::now();
+
+  auto log_record = logger->CreateLogRecord();
+  ASSERT_NE(log_record, nullptr);
+
+  // Capture time after creating log record
+  auto after = std::chrono::system_clock::now();
+
+  auto *etw_record = static_cast<exporter::etw::LogRecord *>(log_record.get());
+
+  // Get the observed timestamp (which should be initialized to now())
+  std::chrono::system_clock::time_point observed_ts = etw_record->GetObservedTimestamp();
+
+  // Verify observed timestamp is not epoch (1970-01-01)
+  EXPECT_GT(observed_ts.time_since_epoch().count(), 0);
+
+  // Verify observed timestamp is within the expected range
+  EXPECT_GE(observed_ts, before);
+  EXPECT_LE(observed_ts, after);
+
+  EXPECT_NO_THROW(logger->EmitLogRecord(std::move(log_record)));
+}
+
 #endif  // _WIN32
diff --git a/deps/opentelemetry-cpp/exporters/etw/test/etw_provider_test.cc b/deps/opentelemetry-cpp/exporters/etw/test/etw_provider_test.cc
index d5ebbcad438..d9a55e06d69 100644
--- a/deps/opentelemetry-cpp/exporters/etw/test/etw_provider_test.cc
+++ b/deps/opentelemetry-cpp/exporters/etw/test/etw_provider_test.cc
@@ -61,4 +61,36 @@ TEST(ETWProvider, CheckCloseSuccess)
   ASSERT_FALSE(etw.is_registered(providerName));
 }
 
+TEST(ETWProvider, CheckCloseInfiniteLoop)
+{
+  std::string providerName1 = "Provider1";
+  std::string providerName2 = "Provider2";
+
+  static ETWProvider etw;
+  auto handle1 = etw.open(providerName1.c_str());
+  auto handle2 = etw.open(providerName2.c_str());
+
+  // This should not hang
+  auto result2 = etw.close(handle2);
+  ASSERT_EQ(result2, etw.STATUS_OK);
+  ASSERT_FALSE(etw.is_registered(providerName2));
+
+  auto result1 = etw.close(handle1);
+  ASSERT_EQ(result1, etw.STATUS_OK);
+  ASSERT_FALSE(etw.is_registered(providerName1));
+}
+
+TEST(ETWProvider, CheckCloseRefCountUnderflow)
+{
+  std::string providerName = "OpenTelemetry-ETW-Provider-Underflow";
+  static ETWProvider etw;
+  auto handle = etw.open(providerName.c_str());
+  auto result = etw.close(handle);
+  ASSERT_EQ(result, etw.STATUS_OK);
+
+  // Subsequent close should fail
+  result = etw.close(handle);
+  ASSERT_EQ(result, etw.STATUS_ERROR);
+}
+
 #endif
diff --git a/deps/opentelemetry-cpp/exporters/etw/test/etw_tracer_test.cc b/deps/opentelemetry-cpp/exporters/etw/test/etw_tracer_test.cc
index 5833b6a7334..7d32a2ffba1 100644
--- a/deps/opentelemetry-cpp/exporters/etw/test/etw_tracer_test.cc
+++ b/deps/opentelemetry-cpp/exporters/etw/test/etw_tracer_test.cc
@@ -566,6 +566,15 @@ TEST(ETWTracer, EndWithCustomTime)
 
 }
 
+TEST(ETWTracer, ConstructorInitializesToOpenState)
+{
+  opentelemetry::exporter::etw::TracerProvider provider;
+  std::string providerId = "TestProvider";
+  opentelemetry::exporter::etw::Tracer tracer(provider, providerId);
+  // Tracer should be open after construction
+  EXPECT_FALSE(tracer.IsClosed());
+}
+
 /* clang-format on */
 
 #endif
diff --git a/deps/opentelemetry-cpp/exporters/memory/BUILD b/deps/opentelemetry-cpp/exporters/memory/BUILD
index 033c85d3698..e7a94ee7f3c 100644
--- a/deps/opentelemetry-cpp/exporters/memory/BUILD
+++ b/deps/opentelemetry-cpp/exporters/memory/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/exporters/memory/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/memory/CMakeLists.txt
index d216bd134c5..b205df39364 100644
--- a/deps/opentelemetry-cpp/exporters/memory/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/memory/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
 add_library(opentelemetry_exporter_in_memory
             src/in_memory_span_exporter_factory.cc)
 
@@ -46,6 +48,17 @@ otel_add_component(
   PATTERN
   "*.h")
 
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    exporter_in_memory "OpenTelemetry Exporter - In-Memory Span"
+    "In-memory span exporter for testing and debugging." "opentelemetry_trace")
+
+  opentelemetry_add_pkgconfig(
+    exporter_in_memory_metric "OpenTelemetry Exporter - In-Memory Metric"
+    "In-memory metric exporter for testing and debugging."
+    "opentelemetry_metrics")
+endif()
+
 if(BUILD_TESTING)
   add_executable(in_memory_span_data_test test/in_memory_span_data_test.cc)
   add_executable(in_memory_span_exporter_test
diff --git a/deps/opentelemetry-cpp/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h b/deps/opentelemetry-cpp/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
index dd4fc11d05d..21192170d43 100644
--- a/deps/opentelemetry-cpp/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
+++ b/deps/opentelemetry-cpp/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
@@ -75,10 +75,7 @@ class InMemorySpanExporter final : public opentelemetry::sdk::trace::SpanExporte
     return sdk::common::ExportResult::kSuccess;
   }
 
-  virtual bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    return true;
-  }
+  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
 
   /**
    * Attempt to shut down the in-memory span exporter.
diff --git a/deps/opentelemetry-cpp/exporters/ostream/BUILD b/deps/opentelemetry-cpp/exporters/ostream/BUILD
index 177bf6a968d..d31f6f0c6d5 100644
--- a/deps/opentelemetry-cpp/exporters/ostream/BUILD
+++ b/deps/opentelemetry-cpp/exporters/ostream/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -21,6 +24,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "ostream_log_record_exporter_builder",
+    srcs = [
+        "src/console_log_record_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/ostream/console_log_record_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = ["ostream"],
+    deps = [
+        ":ostream_log_record_exporter",
+    ],
+)
+
 cc_test(
     name = "ostream_log_test",
     srcs = ["test/ostream_log_test.cc"],
@@ -55,6 +73,24 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "ostream_metric_exporter_builder",
+    srcs = [
+        "src/console_push_metric_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/ostream/console_push_metric_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "metrics",
+        "ostream",
+    ],
+    deps = [
+        ":ostream_metric_exporter",
+    ],
+)
+
 cc_test(
     name = "ostream_metric_test",
     srcs = ["test/ostream_metric_test.cc"],
@@ -86,6 +122,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "ostream_span_exporter_builder",
+    srcs = [
+        "src/console_span_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/ostream/console_span_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = ["ostream"],
+    deps = [
+        ":ostream_span_exporter",
+    ],
+)
+
 cc_library(
     name = "ostream_capture",
     hdrs = [
diff --git a/deps/opentelemetry-cpp/exporters/ostream/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/ostream/CMakeLists.txt
index 52369ea1399..6ca8b7d6546 100644
--- a/deps/opentelemetry-cpp/exporters/ostream/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/ostream/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
+#
+# opentelemetry_exporter_ostream_span
+#
+
 add_library(opentelemetry_exporter_ostream_span src/span_exporter.cc
                                                 src/span_exporter_factory.cc)
 
@@ -27,6 +33,32 @@ if(BUILD_TESTING)
     TEST_LIST ostream_span_test)
 endif() # BUILD_TESTING
 
+#
+# opentelemetry_exporter_ostream_span_builder
+#
+
+add_library(opentelemetry_exporter_ostream_span_builder
+            src/console_span_builder.cc)
+
+set_target_properties(opentelemetry_exporter_ostream_span_builder
+                      PROPERTIES EXPORT_NAME ostream_span_exporter_builder)
+set_target_version(opentelemetry_exporter_ostream_span_builder)
+
+target_include_directories(
+  opentelemetry_exporter_ostream_span_builder
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+
+target_link_libraries(opentelemetry_exporter_ostream_span_builder
+                      PUBLIC opentelemetry_exporter_ostream_span)
+
+list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
+     opentelemetry_exporter_ostream_span_builder)
+
+#
+# opentelemetry_exporter_ostream_metrics
+#
+
 add_library(opentelemetry_exporter_ostream_metrics
             src/metric_exporter.cc src/metric_exporter_factory.cc)
 set_target_properties(opentelemetry_exporter_ostream_metrics
@@ -53,6 +85,30 @@ if(BUILD_TESTING)
     TEST_LIST ostream_metric_test)
 endif()
 
+#
+# opentelemetry_exporter_ostream_metrics_builder
+#
+
+add_library(opentelemetry_exporter_ostream_metrics_builder
+            src/console_push_metric_builder.cc)
+set_target_properties(opentelemetry_exporter_ostream_metrics_builder
+                      PROPERTIES EXPORT_NAME ostream_metrics_exporter_builder)
+set_target_version(opentelemetry_exporter_ostream_metrics_builder)
+
+target_include_directories(
+  opentelemetry_exporter_ostream_metrics_builder
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+target_link_libraries(opentelemetry_exporter_ostream_metrics_builder
+                      PUBLIC opentelemetry_exporter_ostream_metrics)
+
+list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
+     opentelemetry_exporter_ostream_metrics_builder)
+
+#
+# opentelemetry_exporter_ostream_logs
+#
+
 add_library(opentelemetry_exporter_ostream_logs
             src/log_record_exporter.cc src/log_record_exporter_factory.cc)
 set_target_properties(opentelemetry_exporter_ostream_logs
@@ -66,6 +122,36 @@ target_link_libraries(opentelemetry_exporter_ostream_logs
                       PUBLIC opentelemetry_logs)
 list(APPEND OPENTELEMETRY_OSTREAM_TARGETS opentelemetry_exporter_ostream_logs)
 
+if(BUILD_TESTING)
+  add_executable(ostream_log_test test/ostream_log_test.cc)
+  target_link_libraries(ostream_log_test ${GTEST_BOTH_LIBRARIES}
+                        opentelemetry_exporter_ostream_logs)
+  gtest_add_tests(
+    TARGET ostream_log_test
+    TEST_PREFIX exporter.
+    TEST_LIST ostream_log_test)
+endif()
+
+#
+# opentelemetry_exporter_ostream_logs_builder
+#
+
+add_library(opentelemetry_exporter_ostream_logs_builder
+            src/console_log_record_builder.cc)
+set_target_properties(
+  opentelemetry_exporter_ostream_logs_builder
+  PROPERTIES EXPORT_NAME ostream_log_record_exporter_builder)
+set_target_version(opentelemetry_exporter_ostream_logs_builder)
+
+target_include_directories(
+  opentelemetry_exporter_ostream_logs_builder
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+target_link_libraries(opentelemetry_exporter_ostream_logs_builder
+                      PUBLIC opentelemetry_exporter_ostream_logs)
+list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
+     opentelemetry_exporter_ostream_logs_builder)
+
 otel_add_component(
   COMPONENT
   exporters_ostream
@@ -77,14 +163,61 @@ otel_add_component(
   "include/opentelemetry/exporters"
   FILES_MATCHING
   PATTERN
-  "*.h")
+  "*.h"
+  PATTERN
+  "console_log_record_builder.h"
+  EXCLUDE
+  PATTERN
+  "console_push_metric_builder.h"
+  EXCLUDE
+  PATTERN
+  "console_span_builder.h"
+  EXCLUDE)
 
-if(BUILD_TESTING)
-  add_executable(ostream_log_test test/ostream_log_test.cc)
-  target_link_libraries(ostream_log_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_ostream_logs)
-  gtest_add_tests(
-    TARGET ostream_log_test
-    TEST_PREFIX exporter.
-    TEST_LIST ostream_log_test)
+otel_add_component(
+  COMPONENT
+  exporters_ostream_builder
+  TARGETS
+  ${OPENTELEMETRY_OSTREAM_BUILDER_TARGETS}
+  FILES_DIRECTORY
+  "include/opentelemetry/exporters/ostream"
+  FILES_DESTINATION
+  "include/opentelemetry/exporters"
+  FILES_MATCHING
+  PATTERN
+  "console_log_record_builder.h"
+  PATTERN
+  "console_push_metric_builder.h"
+  PATTERN
+  "console_span_builder.h")
+
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_span "OpenTelemetry Exporter - OStream Span"
+    "Exports trace spans to output stream." "opentelemetry_trace")
+
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_span_builder
+    "OpenTelemetry Exporter - OStream Span Builder"
+    "Builder for OStream span exporter." "opentelemetry_exporter_ostream_span")
+
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_metrics "OpenTelemetry Exporter - OStream Metrics"
+    "Exports metrics to output stream." "opentelemetry_metrics")
+
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_metrics_builder
+    "OpenTelemetry Exporter - OStream Metrics Builder"
+    "Builder for OStream metrics exporter."
+    "opentelemetry_exporter_ostream_metrics")
+
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_logs "OpenTelemetry Exporter - OStream Logs"
+    "Exports log records to output stream." "opentelemetry_logs")
+
+  opentelemetry_add_pkgconfig(
+    exporter_ostream_logs_builder
+    "OpenTelemetry Exporter - OStream Logs Builder"
+    "Builder for OStream log record exporter."
+    "opentelemetry_exporter_ostream_logs")
 endif()
diff --git a/deps/opentelemetry-cpp/exporters/ostream/src/console_push_metric_builder.cc b/deps/opentelemetry-cpp/exporters/ostream/src/console_push_metric_builder.cc
index ca875617551..0573f20ccba 100644
--- a/deps/opentelemetry-cpp/exporters/ostream/src/console_push_metric_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/ostream/src/console_push_metric_builder.cc
@@ -1,14 +1,18 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <iostream>
 #include <memory>
 #include <utility>
 
 #include "opentelemetry/exporters/ostream/console_push_metric_builder.h"
 #include "opentelemetry/exporters/ostream/metric_exporter_factory.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/configuration/console_push_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
+#include "opentelemetry/sdk/configuration/temporality_preference.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/version.h"
 
@@ -25,10 +29,31 @@ void ConsolePushMetricBuilder::Register(opentelemetry::sdk::configuration::Regis
 }
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> ConsolePushMetricBuilder::Build(
-    const opentelemetry::sdk::configuration::ConsolePushMetricExporterConfiguration * /* model */)
-    const
+    const opentelemetry::sdk::configuration::ConsolePushMetricExporterConfiguration *model) const
 {
-  return OStreamMetricExporterFactory::Create();
+  sdk::metrics::AggregationTemporality aggregation_temporality{
+      sdk::metrics::AggregationTemporality::kUnspecified};
+
+  switch (model->temporality_preference)
+  {
+    case opentelemetry::sdk::configuration::TemporalityPreference::delta:
+      aggregation_temporality = sdk::metrics::AggregationTemporality::kDelta;
+      break;
+    case opentelemetry::sdk::configuration::TemporalityPreference::low_memory:
+      /*
+       * FIXME: OStreamMetricExporter does not support "low_memory"
+       * temporality
+       */
+      OTEL_INTERNAL_LOG_WARN("[Console Exporter] TemporalityPreference::low_memory not supported");
+      aggregation_temporality = sdk::metrics::AggregationTemporality::kCumulative;
+      break;
+    case opentelemetry::sdk::configuration::TemporalityPreference::cumulative:
+    default:
+      aggregation_temporality = sdk::metrics::AggregationTemporality::kCumulative;
+      break;
+  };
+
+  return OStreamMetricExporterFactory::Create(std::cout, aggregation_temporality);
 }
 
 }  // namespace metrics
diff --git a/deps/opentelemetry-cpp/exporters/otlp/BUILD b/deps/opentelemetry-cpp/exporters/otlp/BUILD
index 2b841954a62..74aa8183103 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/BUILD
+++ b/deps/opentelemetry-cpp/exporters/otlp/BUILD
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 package(default_visibility = ["//visibility:public"])
@@ -39,6 +41,22 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_builder_utils",
+    srcs = [
+        "src/otlp_builder_utils.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_builder_utils.h",
+    ],
+    strip_include_prefix = "include",
+    tags = ["otlp"],
+    deps = [
+        ":otlp_http_client",
+        ":otlp_recordable",
+    ],
+)
+
 cc_library(
     name = "otlp_grpc_client",
     srcs = [
@@ -120,6 +138,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_grpc_span_exporter_builder",
+    srcs = [
+        "src/otlp_grpc_span_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_grpc_span_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_grpc",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_grpc_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_http_client",
     srcs = [
@@ -189,6 +226,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_http_span_exporter_builder",
+    srcs = [
+        "src/otlp_http_span_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_http_span_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_http",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_http_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_file_client",
     srcs = [
@@ -246,6 +302,24 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_file_span_exporter_builder",
+    srcs = [
+        "src/otlp_file_span_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_file_span_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_file",
+    ],
+    deps = [
+        ":otlp_file_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_grpc_metric_exporter",
     srcs = [
@@ -278,6 +352,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_grpc_metric_exporter_builder",
+    srcs = [
+        "src/otlp_grpc_push_metric_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_grpc_push_metric_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_grpc_metric",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_grpc_metric_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_http_metric_exporter",
     srcs = [
@@ -307,6 +400,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_http_metric_exporter_builder",
+    srcs = [
+        "src/otlp_http_push_metric_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_http_push_metric_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_http_metric",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_http_metric_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_file_metric_exporter",
     srcs = [
@@ -336,6 +448,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_file_metric_exporter_builder",
+    srcs = [
+        "src/otlp_file_push_metric_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_file_push_metric_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_file_metric",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_file_metric_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_http_log_record_exporter",
     srcs = [
@@ -365,6 +496,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_http_log_record_exporter_builder",
+    srcs = [
+        "src/otlp_http_log_record_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_http_log_record_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_http_log",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_http_log_record_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_file_log_record_exporter",
     srcs = [
@@ -394,6 +544,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_file_log_record_exporter_builder",
+    srcs = [
+        "src/otlp_file_log_record_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_file_log_record_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_file_log",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_file_log_record_exporter",
+    ],
+)
+
 cc_library(
     name = "otlp_grpc_log_record_exporter",
     srcs = [
@@ -425,6 +594,25 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "otlp_grpc_log_record_exporter_builder",
+    srcs = [
+        "src/otlp_grpc_log_record_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_grpc_log_record_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "otlp",
+        "otlp_grpc_log",
+    ],
+    deps = [
+        ":otlp_builder_utils",
+        ":otlp_grpc_log_record_exporter",
+    ],
+)
+
 cc_test(
     name = "otlp_recordable_test",
     srcs = ["test/otlp_recordable_test.cc"],
diff --git a/deps/opentelemetry-cpp/exporters/otlp/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/otlp/CMakeLists.txt
index 9ad6d7922d7..1d460d6d4c0 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/otlp/CMakeLists.txt
@@ -1,12 +1,18 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
 if(protobuf_lib_type STREQUAL "STATIC_LIBRARY")
   set(OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE STATIC)
 else()
   set(OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE)
 endif()
 
+#
+# opentelemetry_otlp_recordable
+#
+
 add_library(
   opentelemetry_otlp_recordable
   ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE}
@@ -31,6 +37,39 @@ target_link_libraries(opentelemetry_otlp_recordable PUBLIC opentelemetry_logs)
 target_link_libraries(opentelemetry_otlp_recordable
                       PUBLIC opentelemetry_metrics)
 
+#
+# opentelemetry_exporter_otlp_builder_utils
+#
+
+add_library(opentelemetry_exporter_otlp_builder_utils
+            ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_builder_utils.cc)
+
+set_target_properties(opentelemetry_exporter_otlp_builder_utils
+                      PROPERTIES EXPORT_NAME otlp_builder_utils)
+set_target_version(opentelemetry_exporter_otlp_builder_utils)
+
+target_include_directories(
+  opentelemetry_exporter_otlp_builder_utils
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+
+target_link_libraries(opentelemetry_exporter_otlp_builder_utils
+                      PUBLIC opentelemetry_otlp_recordable)
+
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    otlp_recordable
+    "OpenTelemetry OTLP - Recordable"
+    "OTLP recordable implementation for spans, metrics, and logs."
+    "opentelemetry_trace opentelemetry_metrics opentelemetry_logs opentelemetry_resources"
+  )
+
+  opentelemetry_add_pkgconfig(
+    exporter_otlp_builder_utils "OpenTelemetry OTLP - Builder Utils"
+    "Common utilities for OTLP exporter builders."
+    "opentelemetry_otlp_recordable")
+endif()
+
 if(WITH_OTLP_GRPC)
   if(NOT DEFINED grpc_lib_type)
     message(
@@ -42,6 +81,11 @@ if(WITH_OTLP_GRPC)
   else()
     set(OPENTELEMETRY_OTLP_GRPC_CLIENT_LIB_TYPE)
   endif()
+
+  #
+  # opentelemetry_exporter_otlp_grpc_client
+  #
+
   add_library(
     opentelemetry_exporter_otlp_grpc_client
     ${OPENTELEMETRY_OTLP_GRPC_CLIENT_LIB_TYPE} src/otlp_grpc_client.cc
@@ -78,6 +122,10 @@ if(WITH_OTLP_GRPC)
   list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
        opentelemetry_exporter_otlp_grpc_client opentelemetry_proto_grpc)
 
+  #
+  # opentelemetry_exporter_otlp_grpc
+  #
+
   add_library(
     opentelemetry_exporter_otlp_grpc
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_exporter.cc
@@ -94,6 +142,30 @@ if(WITH_OTLP_GRPC)
 
   list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS opentelemetry_exporter_otlp_grpc)
 
+  #
+  # opentelemetry_exporter_otlp_grpc_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_grpc_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_span_builder.cc)
+
+  set_target_properties(opentelemetry_exporter_otlp_grpc_builder
+                        PROPERTIES EXPORT_NAME otlp_grpc_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_grpc_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_grpc_builder)
+
+  #
+  # opentelemetry_exporter_otlp_grpc_log
+  #
+
   add_library(
     opentelemetry_exporter_otlp_grpc_log
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_log_record_exporter.cc
@@ -112,6 +184,31 @@ if(WITH_OTLP_GRPC)
   list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
        opentelemetry_exporter_otlp_grpc_log)
 
+  #
+  # opentelemetry_exporter_otlp_grpc_log_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_grpc_log_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_log_record_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_grpc_log_builder
+    PROPERTIES EXPORT_NAME otlp_grpc_log_record_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_grpc_log_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_log_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc_log
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_grpc_log_builder)
+
+  #
+  # opentelemetry_exporter_otlp_grpc_metrics
+  #
+
   add_library(
     opentelemetry_exporter_otlp_grpc_metrics
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_metric_exporter.cc
@@ -129,9 +226,78 @@ if(WITH_OTLP_GRPC)
 
   list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
        opentelemetry_exporter_otlp_grpc_metrics)
+
+  #
+  # opentelemetry_exporter_otlp_grpc_metric_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_grpc_metric_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_push_metric_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_grpc_metric_builder
+    PROPERTIES EXPORT_NAME otlp_grpc_metric_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_grpc_metric_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_metric_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc_metrics
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_grpc_metric_builder)
+
+  if(OPENTELEMETRY_INSTALL)
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_client "OpenTelemetry OTLP - gRPC Client"
+      "gRPC client for OTLP protocol." "opentelemetry_api opentelemetry_common")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc "OpenTelemetry OTLP - gRPC Span Exporter"
+      "Exports trace spans via OTLP gRPC."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_grpc_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_builder
+      "OpenTelemetry OTLP - gRPC Span Builder"
+      "Builder for OTLP gRPC span exporter."
+      "opentelemetry_exporter_otlp_grpc opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_log "OpenTelemetry OTLP - gRPC Log Exporter"
+      "Exports log records via OTLP gRPC."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_grpc_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_log_builder
+      "OpenTelemetry OTLP - gRPC Log Builder"
+      "Builder for OTLP gRPC log record exporter."
+      "opentelemetry_exporter_otlp_grpc_log opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_metrics "OpenTelemetry OTLP - gRPC Metric Exporter"
+      "Exports metrics via OTLP gRPC."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_grpc_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_grpc_metric_builder
+      "OpenTelemetry OTLP - gRPC Metric Builder"
+      "Builder for OTLP gRPC metric exporter."
+      "opentelemetry_exporter_otlp_grpc_metrics opentelemetry_exporter_otlp_builder_utils"
+    )
+  endif()
+
 endif()
 
 if(WITH_OTLP_HTTP)
+
+  #
+  # opentelemetry_exporter_otlp_http_client
+  #
+
   add_library(
     opentelemetry_exporter_otlp_http_client
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http.cc
@@ -142,10 +308,12 @@ if(WITH_OTLP_HTTP)
 
   target_link_libraries(
     opentelemetry_exporter_otlp_http_client
-    PUBLIC opentelemetry_sdk opentelemetry_ext
-    # Links flags of opentelemetry_http_client_curl should be public when
-    # building internal components
-    PRIVATE opentelemetry_proto
+    PUBLIC opentelemetry_sdk
+           opentelemetry_ext
+           # Links flags of opentelemetry_http_client_curl should be public when
+           # building internal components
+           "$<BUILD_INTERFACE:opentelemetry_proto>"
+    PRIVATE "$<INSTALL_INTERFACE:opentelemetry_proto>"
             "$<BUILD_INTERFACE:opentelemetry_http_client_curl>"
             "$<BUILD_INTERFACE:nlohmann_json::nlohmann_json>"
             "$<INSTALL_INTERFACE:opentelemetry_http_client_curl>")
@@ -158,6 +326,10 @@ if(WITH_OTLP_HTTP)
   list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
        opentelemetry_exporter_otlp_http_client)
 
+  #
+  # opentelemetry_exporter_otlp_http
+  #
+
   add_library(
     opentelemetry_exporter_otlp_http
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_exporter.cc
@@ -174,6 +346,30 @@ if(WITH_OTLP_HTTP)
 
   list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS opentelemetry_exporter_otlp_http)
 
+  #
+  # opentelemetry_exporter_otlp_http_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_http_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_span_builder.cc)
+
+  set_target_properties(opentelemetry_exporter_otlp_http_builder
+                        PROPERTIES EXPORT_NAME otlp_http_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_http_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_http_builder
+    PUBLIC opentelemetry_exporter_otlp_http
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_http_builder)
+
+  #
+  # opentelemetry_exporter_otlp_http_log
+  #
+
   add_library(
     opentelemetry_exporter_otlp_http_log
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_log_record_exporter.cc
@@ -192,6 +388,31 @@ if(WITH_OTLP_HTTP)
   list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
        opentelemetry_exporter_otlp_http_log)
 
+  #
+  # opentelemetry_exporter_otlp_http_log_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_http_log_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_log_record_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_http_log_builder
+    PROPERTIES EXPORT_NAME otlp_http_log_record_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_http_log_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_http_log_builder
+    PUBLIC opentelemetry_exporter_otlp_http_log
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_http_log_builder)
+
+  #
+  # opentelemetry_exporter_otlp_http_metric
+  #
+
   add_library(
     opentelemetry_exporter_otlp_http_metric
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_metric_exporter.cc
@@ -209,9 +430,78 @@ if(WITH_OTLP_HTTP)
 
   list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
        opentelemetry_exporter_otlp_http_metric)
+
+  #
+  # opentelemetry_exporter_otlp_http_metric_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_http_metric_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_http_push_metric_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_http_metric_builder
+    PROPERTIES EXPORT_NAME otlp_http_metric_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_http_metric_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_http_metric_builder
+    PUBLIC opentelemetry_exporter_otlp_http_metric
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_http_metric_builder)
+
+  if(OPENTELEMETRY_INSTALL)
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_client "OpenTelemetry OTLP - HTTP Client"
+      "HTTP client for OTLP protocol." "opentelemetry_api")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http "OpenTelemetry OTLP - HTTP Span Exporter"
+      "Exports trace spans via OTLP HTTP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_http_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_builder
+      "OpenTelemetry OTLP - HTTP Span Builder"
+      "Builder for OTLP HTTP span exporter."
+      "opentelemetry_exporter_otlp_http opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_log "OpenTelemetry OTLP - HTTP Log Exporter"
+      "Exports log records via OTLP HTTP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_http_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_log_builder
+      "OpenTelemetry OTLP - HTTP Log Builder"
+      "Builder for OTLP HTTP log record exporter."
+      "opentelemetry_exporter_otlp_http_log opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_metric "OpenTelemetry OTLP - HTTP Metric Exporter"
+      "Exports metrics via OTLP HTTP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_http_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_http_metric_builder
+      "OpenTelemetry OTLP - HTTP Metric Builder"
+      "Builder for OTLP HTTP metric exporter."
+      "opentelemetry_exporter_otlp_http_metric opentelemetry_exporter_otlp_builder_utils"
+    )
+  endif()
+
 endif()
 
 if(WITH_OTLP_FILE)
+
+  #
+  # opentelemetry_exporter_otlp_file_client
+  #
+
   add_library(opentelemetry_exporter_otlp_file_client
               ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_client.cc)
   set_target_properties(opentelemetry_exporter_otlp_file_client
@@ -221,7 +511,9 @@ if(WITH_OTLP_FILE)
   target_link_libraries(
     opentelemetry_exporter_otlp_file_client
     PUBLIC opentelemetry_sdk opentelemetry_common
-    PRIVATE opentelemetry_proto $<BUILD_INTERFACE:nlohmann_json::nlohmann_json>)
+           "$<BUILD_INTERFACE:opentelemetry_proto>"
+    PRIVATE "$<INSTALL_INTERFACE:opentelemetry_proto>"
+            "$<BUILD_INTERFACE:nlohmann_json::nlohmann_json>")
 
   target_include_directories(
     opentelemetry_exporter_otlp_file_client
@@ -231,6 +523,10 @@ if(WITH_OTLP_FILE)
   list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
        opentelemetry_exporter_otlp_file_client)
 
+  #
+  # opentelemetry_exporter_otlp_file
+  #
+
   add_library(
     opentelemetry_exporter_otlp_file
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_exporter.cc
@@ -247,6 +543,30 @@ if(WITH_OTLP_FILE)
 
   list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS opentelemetry_exporter_otlp_file)
 
+  #
+  # opentelemetry_exporter_otlp_file_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_file_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_span_builder.cc)
+
+  set_target_properties(opentelemetry_exporter_otlp_file_builder
+                        PROPERTIES EXPORT_NAME otlp_file_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_file_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_builder
+    PUBLIC opentelemetry_exporter_otlp_file
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_file_builder)
+
+  #
+  # opentelemetry_exporter_otlp_file_log
+  #
+
   add_library(
     opentelemetry_exporter_otlp_file_log
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_log_record_exporter.cc
@@ -265,6 +585,31 @@ if(WITH_OTLP_FILE)
   list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
        opentelemetry_exporter_otlp_file_log)
 
+  #
+  # opentelemetry_exporter_otlp_file_log_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_file_log_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_log_record_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_file_log_builder
+    PROPERTIES EXPORT_NAME otlp_file_log_record_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_file_log_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_log_builder
+    PUBLIC opentelemetry_exporter_otlp_file_log
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_file_log_builder)
+
+  #
+  # opentelemetry_exporter_otlp_file_metric
+  #
+
   add_library(
     opentelemetry_exporter_otlp_file_metric
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_metric_exporter.cc
@@ -282,6 +627,70 @@ if(WITH_OTLP_FILE)
 
   list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
        opentelemetry_exporter_otlp_file_metric)
+
+  #
+  # opentelemetry_exporter_otlp_file_metric_builder
+  #
+
+  add_library(
+    opentelemetry_exporter_otlp_file_metric_builder
+    ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_file_push_metric_builder.cc)
+
+  set_target_properties(
+    opentelemetry_exporter_otlp_file_metric_builder
+    PROPERTIES EXPORT_NAME otlp_file_metric_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_file_metric_builder)
+
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_metric_builder
+    PUBLIC opentelemetry_exporter_otlp_file_metric
+           opentelemetry_exporter_otlp_builder_utils)
+
+  list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
+       opentelemetry_exporter_otlp_file_metric_builder)
+
+  if(OPENTELEMETRY_INSTALL)
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_client "OpenTelemetry OTLP - File Client"
+      "File client for OTLP protocol." "opentelemetry_api opentelemetry_common")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file "OpenTelemetry OTLP - File Span Exporter"
+      "Exports trace spans to file via OTLP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_file_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_builder
+      "OpenTelemetry OTLP - File Span Builder"
+      "Builder for OTLP file span exporter."
+      "opentelemetry_exporter_otlp_file opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_log "OpenTelemetry OTLP - File Log Exporter"
+      "Exports log records to file via OTLP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_file_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_log_builder
+      "OpenTelemetry OTLP - File Log Builder"
+      "Builder for OTLP file log record exporter."
+      "opentelemetry_exporter_otlp_file_log opentelemetry_exporter_otlp_builder_utils"
+    )
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_metric "OpenTelemetry OTLP - File Metric Exporter"
+      "Exports metrics to file via OTLP."
+      "opentelemetry_otlp_recordable opentelemetry_exporter_otlp_file_client")
+
+    opentelemetry_add_pkgconfig(
+      exporter_otlp_file_metric_builder
+      "OpenTelemetry OTLP - File Metric Builder"
+      "Builder for OTLP file metric exporter."
+      "opentelemetry_exporter_otlp_file_metric opentelemetry_exporter_otlp_builder_utils"
+    )
+  endif()
+
 endif()
 
 target_link_libraries(
@@ -302,6 +711,9 @@ otel_add_component(
   PATTERN
   "*.h"
   PATTERN
+  "otlp_builder_utils*.h"
+  EXCLUDE
+  PATTERN
   "otlp_http*.h"
   EXCLUDE
   PATTERN
@@ -311,6 +723,19 @@ otel_add_component(
   "otlp_file*.h"
   EXCLUDE)
 
+otel_add_component(
+  COMPONENT
+  exporter_otlp_builder_utils
+  TARGETS
+  opentelemetry_exporter_otlp_builder_utils
+  FILES_DIRECTORY
+  "include/opentelemetry/exporters/otlp"
+  FILES_DESTINATION
+  "include/opentelemetry/exporters"
+  FILES_MATCHING
+  PATTERN
+  "otlp_builder_utils.h")
+
 if(WITH_OTLP_GRPC)
   otel_add_component(
     COMPONENT
@@ -323,7 +748,34 @@ if(WITH_OTLP_GRPC)
     "include/opentelemetry/exporters"
     FILES_MATCHING
     PATTERN
-    "otlp_grpc*.h")
+    "otlp_grpc*.h"
+    PATTERN
+    "otlp_grpc_span_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_grpc_log_record_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_grpc_push_metric_builder.h"
+    EXCLUDE)
+
+  otel_add_component(
+    COMPONENT
+    exporters_otlp_grpc_builder
+    TARGETS
+    ${OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS}
+    FILES_DIRECTORY
+    "include/opentelemetry/exporters/otlp"
+    FILES_DESTINATION
+    "include/opentelemetry/exporters"
+    FILES_MATCHING
+    PATTERN
+    "otlp_grpc_span_builder.h"
+    PATTERN
+    "otlp_grpc_log_record_builder.h"
+    PATTERN
+    "otlp_grpc_push_metric_builder.h")
+
 endif()
 
 if(WITH_OTLP_HTTP)
@@ -338,7 +790,34 @@ if(WITH_OTLP_HTTP)
     "include/opentelemetry/exporters"
     FILES_MATCHING
     PATTERN
-    "otlp_http*.h")
+    "otlp_http*.h"
+    PATTERN
+    "otlp_http_span_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_http_log_record_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_http_push_metric_builder.h"
+    EXCLUDE)
+
+  otel_add_component(
+    COMPONENT
+    exporters_otlp_http_builder
+    TARGETS
+    ${OPENTELEMETRY_OTLP_HTTP_BUILDER_TARGETS}
+    FILES_DIRECTORY
+    "include/opentelemetry/exporters/otlp"
+    FILES_DESTINATION
+    "include/opentelemetry/exporters"
+    FILES_MATCHING
+    PATTERN
+    "otlp_http_span_builder.h"
+    PATTERN
+    "otlp_http_log_record_builder.h"
+    PATTERN
+    "otlp_http_push_metric_builder.h")
+
 endif()
 
 if(WITH_OTLP_FILE)
@@ -353,7 +832,34 @@ if(WITH_OTLP_FILE)
     "include/opentelemetry/exporters"
     FILES_MATCHING
     PATTERN
-    "otlp_file*.h")
+    "otlp_file*.h"
+    PATTERN
+    "otlp_file_span_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_file_log_record_builder.h"
+    EXCLUDE
+    PATTERN
+    "otlp_file_push_metric_builder.h"
+    EXCLUDE)
+
+  otel_add_component(
+    COMPONENT
+    exporters_otlp_file_builder
+    TARGETS
+    ${OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS}
+    FILES_DIRECTORY
+    "include/opentelemetry/exporters/otlp"
+    FILES_DESTINATION
+    "include/opentelemetry/exporters"
+    FILES_MATCHING
+    PATTERN
+    "otlp_file_span_builder.h"
+    PATTERN
+    "otlp_file_log_record_builder.h"
+    PATTERN
+    "otlp_file_push_metric_builder.h")
+
 endif()
 
 if(BUILD_TESTING)
@@ -639,3 +1145,14 @@ if(BUILD_TESTING)
       TEST_LIST otlp_file_metric_exporter_factory_test)
   endif()
 endif() # BUILD_TESTING
+
+if(WITH_BENCHMARK AND WITH_OTLP_HTTP)
+  add_executable(otlp_http_metric_exporter_benchmark
+                 benchmark/otlp_http_metric_exporter_benchmark.cc)
+
+  target_link_libraries(
+    otlp_http_metric_exporter_benchmark
+    PRIVATE opentelemetry_exporter_otlp_http_metric opentelemetry_metrics
+            opentelemetry_resources benchmark::benchmark
+            ${CMAKE_THREAD_LIBS_INIT})
+endif()
diff --git a/deps/opentelemetry-cpp/exporters/otlp/benchmark/otlp_http_metric_exporter_benchmark.cc b/deps/opentelemetry-cpp/exporters/otlp/benchmark/otlp_http_metric_exporter_benchmark.cc
new file mode 100644
index 00000000000..b18496c532e
--- /dev/null
+++ b/deps/opentelemetry-cpp/exporters/otlp/benchmark/otlp_http_metric_exporter_benchmark.cc
@@ -0,0 +1,128 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <benchmark/benchmark.h>
+
+#include <chrono>
+#include <cstddef>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
+
+#include "opentelemetry/nostd/string_view.h"
+
+#include "opentelemetry/sdk/common/attribute_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
+#include "opentelemetry/sdk/metrics/data/point_data.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/sdk/resource/resource.h"
+
+using InstrumentationScope = opentelemetry::sdk::instrumentationscope::InstrumentationScope;
+using namespace opentelemetry::sdk::metrics;
+using namespace opentelemetry::exporter::otlp;
+
+// Create ResourceMetrics with a single metric containing 'n' data points
+static ResourceMetrics MakeMetrics(std::size_t n_points)
+{
+  ResourceMetrics rm;
+  static const opentelemetry::sdk::resource::Resource resource =
+      opentelemetry::sdk::resource::Resource::Create({{"service.name", "metric-benchmark"}});
+  rm.resource_ = &resource;
+
+  static auto scope = InstrumentationScope::Create("benchmark", "1.0.0");
+  ScopeMetrics scope_metrics;
+  scope_metrics.scope_ = scope.get();
+
+  MetricData metric;
+  metric.instrument_descriptor.name_ = "cpu.utilization";
+  metric.instrument_descriptor.unit_ = "1";
+  metric.instrument_descriptor.type_ = InstrumentType::kCounter;
+  metric.aggregation_temporality     = AggregationTemporality::kCumulative;
+
+  for (std::size_t i = 0; i < n_points; ++i)
+  {
+    SumPointData sum;
+    sum.value_        = static_cast<double>(i);
+    sum.is_monotonic_ = true;
+
+    PointDataAttributes p;
+    p.attributes = {{"core", static_cast<int>(i)}};
+    p.point_data = sum;
+
+    metric.point_data_attr_.push_back(p);
+  }
+
+  scope_metrics.metric_data_.push_back(metric);
+  rm.scope_metric_data_.push_back(scope_metrics);
+  return rm;
+}
+
+// Benchmark Export() using Binary encoding
+static void BM_OtlpHttpMetricExporter_Export_Binary(benchmark::State &state)
+{
+  OtlpHttpMetricExporterOptions opts;
+  opts.url                       = "http://localhost:4318/v1/metrics";
+  opts.content_type              = HttpRequestContentType::kBinary;
+  opts.timeout                   = std::chrono::milliseconds(1);
+  opts.retry_policy_max_attempts = 0;
+
+  OtlpHttpMetricExporter exporter(opts);
+  auto metrics = MakeMetrics(state.range(0));
+
+  for (auto _ : state)
+  {
+    benchmark::DoNotOptimize(exporter.Export(metrics));
+  }
+
+  state.SetItemsProcessed(state.iterations() * state.range(0));
+}
+
+// Benchmark Export() using JSON encoding
+static void BM_OtlpHttpMetricExporter_Export_Json(benchmark::State &state)
+{
+  OtlpHttpMetricExporterOptions opts;
+  opts.url                       = "http://localhost:4318/v1/metrics";
+  opts.content_type              = HttpRequestContentType::kJson;
+  opts.timeout                   = std::chrono::milliseconds(1);
+  opts.retry_policy_max_attempts = 0;
+
+  OtlpHttpMetricExporter exporter(opts);
+  auto metrics = MakeMetrics(state.range(0));
+
+  for (auto _ : state)
+  {
+    benchmark::DoNotOptimize(exporter.Export(metrics));
+  }
+
+  state.SetItemsProcessed(state.iterations() * state.range(0));
+}
+
+BENCHMARK(BM_OtlpHttpMetricExporter_Export_Binary)
+    ->RangeMultiplier(10)
+    ->Range(1, 10000)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK(BM_OtlpHttpMetricExporter_Export_Json)
+    ->RangeMultiplier(10)
+    ->Range(1, 10000)
+    ->Unit(benchmark::kMicrosecond);
+
+int main(int argc, char **argv)
+{
+  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(
+      opentelemetry::sdk::common::internal_log::LogLevel::None);
+
+  benchmark::Initialize(&argc, argv);
+  benchmark::RunSpecifiedBenchmarks();
+  benchmark::Shutdown();
+  return 0;
+}
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h
index 029e73b78e8..36638fd11a2 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h
@@ -8,6 +8,7 @@
 #include "opentelemetry/exporters/otlp/otlp_environment.h"  // For OtlpHeaders
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
@@ -31,6 +32,9 @@ class OtlpBuilderUtils
 
   static PreferredAggregationTemporality ConvertTemporalityPreference(
       opentelemetry::sdk::configuration::TemporalityPreference model);
+
+  static bool GrpcUseSsl(const std::string &endpoint,
+                         const opentelemetry::sdk::configuration::GrpcTlsConfiguration *tls);
 };
 
 }  // namespace otlp
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h
index 4fceaa91518..cb841a749e3 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <cstdint>
+#include <limits>
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
 #include "opentelemetry/version.h"
 
@@ -32,6 +34,13 @@ struct OPENTELEMETRY_EXPORT OtlpGrpcExporterOptions : public OtlpGrpcClientOptio
   OtlpGrpcExporterOptions &operator=(const OtlpGrpcExporterOptions &) = default;
   OtlpGrpcExporterOptions &operator=(OtlpGrpcExporterOptions &&)      = default;
   ~OtlpGrpcExporterOptions() override;
+
+  /** Collection Limits. No limit by default. */
+  std::uint32_t max_attributes           = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_events               = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_links                = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_attributes_per_link  = std::numeric_limits<std::uint32_t>::max();
 };
 
 }  // namespace otlp
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
index 93e15ed887b..08177e34e73 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
@@ -5,6 +5,7 @@
 
 #include <chrono>
 #include <cstdint>
+#include <limits>
 #include <string>
 
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
@@ -125,6 +126,13 @@ struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
 
   /** The backoff will be multiplied by this value after each retry attempt. */
   float retry_policy_backoff_multiplier{};
+
+  /** Collection Limits. No limit by default. */
+  std::uint32_t max_attributes           = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_events               = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_links                = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max();
+  std::uint32_t max_attributes_per_link  = std::numeric_limits<std::uint32_t>::max();
 };
 
 }  // namespace otlp
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
index a9836645a9e..ba9b11e37d0 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
@@ -62,9 +62,6 @@ class OtlpMetricUtils
   static void ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
                                  proto::metrics::v1::Gauge *const gauge) noexcept;
 
-  static void ConvertSummaryMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
-                                   proto::metrics::v1::Summary *const summary) noexcept;
-
   static void PopulateInstrumentInfoMetrics(
       const opentelemetry::sdk::metrics::MetricData &metric_data,
       proto::metrics::v1::Metric *metric) noexcept;
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
index 103357d11f7..421de7647a7 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
@@ -4,6 +4,8 @@
 #pragma once
 
 #include <chrono>
+#include <cstdint>  // For std::uint32_t
+#include <limits>   // For std::numeric_limits
 #include <string>
 
 // clang-format off
@@ -35,6 +37,19 @@ namespace otlp
 class OtlpRecordable final : public opentelemetry::sdk::trace::Recordable
 {
 public:
+  explicit OtlpRecordable(
+      std::uint32_t max_attributes           = std::numeric_limits<std::uint32_t>::max(),
+      std::uint32_t max_events               = std::numeric_limits<std::uint32_t>::max(),
+      std::uint32_t max_links                = std::numeric_limits<std::uint32_t>::max(),
+      std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max(),
+      std::uint32_t max_attributes_per_link  = std::numeric_limits<std::uint32_t>::max())
+      : max_attributes_(max_attributes),
+        max_events_(max_events),
+        max_links_(max_links),
+        max_attributes_per_event_(max_attributes_per_event),
+        max_attributes_per_link_(max_attributes_per_link)
+  {}
+
   proto::trace::v1::Span &span() noexcept { return span_; }
   const proto::trace::v1::Span &span() const noexcept { return span_; }
 
@@ -85,6 +100,11 @@ class OtlpRecordable final : public opentelemetry::sdk::trace::Recordable
   const opentelemetry::sdk::resource::Resource *resource_ = nullptr;
   const opentelemetry::sdk::instrumentationscope::InstrumentationScope *instrumentation_scope_ =
       nullptr;
+  std::uint32_t max_attributes_;
+  std::uint32_t max_events_;
+  std::uint32_t max_links_;
+  std::uint32_t max_attributes_per_event_;
+  std::uint32_t max_attributes_per_link_;
 };
 }  // namespace otlp
 }  // namespace exporter
diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
index dc674ce9ebb..ce2d4ce041d 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
@@ -21,6 +21,7 @@
 #  pragma warning(disable : 4251)
 #  pragma warning(disable : 4267)
 #  pragma warning(disable : 4668)
+#  pragma warning(disable : 4702)
 #  pragma warning(disable : 4946)
 #  pragma warning(disable : 6001)
 #  pragma warning(disable : 6244)
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_builder_utils.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_builder_utils.cc
index cac5efcbad5..96cb09cf03b 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_builder_utils.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_builder_utils.cc
@@ -12,6 +12,7 @@
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
@@ -79,16 +80,19 @@ OtlpHeaders OtlpBuilderUtils::ConvertHeadersConfigurationModel(
     }
   }
 
-  // Second, scan headers, which has high priority.
-  for (const auto &kv : model->kv_map)
+  if (model != nullptr)
   {
-    const auto &search = headers.find(kv.first);
-    if (search != headers.end())
+    // Second, scan headers, which has high priority.
+    for (const auto &kv : model->kv_map)
     {
-      headers.erase(search);
-    }
+      const auto &search = headers.find(kv.first);
+      if (search != headers.end())
+      {
+        headers.erase(search);
+      }
 
-    headers.emplace(std::make_pair(kv.first, kv.second));
+      headers.emplace(std::make_pair(kv.first, kv.second));
+    }
   }
 
   return headers;
@@ -115,6 +119,28 @@ PreferredAggregationTemporality OtlpBuilderUtils::ConvertTemporalityPreference(
   return result;
 }
 
+bool OtlpBuilderUtils::GrpcUseSsl(
+    const std::string &endpoint,
+    const opentelemetry::sdk::configuration::GrpcTlsConfiguration *tls)
+{
+  if (endpoint.substr(0, 6) == "https:")
+  {
+    return true;
+  }
+
+  if (endpoint.substr(0, 5) == "http:")
+  {
+    return false;
+  }
+
+  if (tls != nullptr)
+  {
+    return !tls->insecure;
+  }
+
+  return true;
+}
+
 }  // namespace otlp
 }  // namespace exporter
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_environment.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_environment.cc
index a7bc95b3214..e8aae458980 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_environment.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_environment.cc
@@ -32,7 +32,7 @@ namespace otlp
 
 static bool GetBoolDualEnvVar(const char *signal_name, const char *generic_name, bool &value)
 {
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetBoolEnvironmentVariable(signal_name, value);
   if (exists)
@@ -49,7 +49,7 @@ static bool GetDurationDualEnvVar(const char *signal_name,
                                   const char *generic_name,
                                   std::chrono::system_clock::duration &value)
 {
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetDurationEnvironmentVariable(signal_name, value);
   if (exists)
@@ -66,7 +66,7 @@ static bool GetStringDualEnvVar(const char *signal_name,
                                 const char *generic_name,
                                 std::string &value)
 {
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(signal_name, value);
   if (exists)
@@ -83,7 +83,7 @@ static bool GetUintDualEnvVar(const char *signal_name,
                               const char *generic_name,
                               std::uint32_t &value)
 {
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetUintEnvironmentVariable(signal_name, value);
   if (exists)
@@ -98,7 +98,7 @@ static bool GetUintDualEnvVar(const char *signal_name,
 
 static bool GetFloatDualEnvVar(const char *signal_name, const char *generic_name, float &value)
 {
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetFloatEnvironmentVariable(signal_name, value);
   if (exists)
@@ -118,7 +118,7 @@ std::string GetOtlpDefaultGrpcTracesEndpoint()
   constexpr char kDefault[]    = "http://localhost:4317";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
 
@@ -137,7 +137,7 @@ std::string GetOtlpDefaultGrpcMetricsEndpoint()
   constexpr char kDefault[]    = "http://localhost:4317";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
 
@@ -156,7 +156,7 @@ std::string GetOtlpDefaultGrpcLogsEndpoint()
   constexpr char kDefault[]    = "http://localhost:4317";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
 
@@ -175,7 +175,7 @@ std::string GetOtlpDefaultHttpTracesEndpoint()
   constexpr char kDefault[]    = "http://localhost:4318/v1/traces";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -200,7 +200,7 @@ std::string GetOtlpDefaultHttpMetricsEndpoint()
   constexpr char kDefault[]    = "http://localhost:4318/v1/metrics";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -225,7 +225,7 @@ std::string GetOtlpDefaultHttpLogsEndpoint()
   constexpr char kDefault[]    = "http://localhost:4318/v1/logs";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -250,7 +250,7 @@ std::string GetOtlpDefaultHttpTracesProtocol()
   constexpr char kDefault[]    = "http/protobuf";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -274,7 +274,7 @@ std::string GetOtlpDefaultHttpMetricsProtocol()
   constexpr char kDefault[]    = "http/protobuf";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -298,7 +298,7 @@ std::string GetOtlpDefaultHttpLogsProtocol()
   constexpr char kDefault[]    = "http/protobuf";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
   if (exists)
@@ -336,9 +336,9 @@ bool GetOtlpDefaultGrpcTracesIsInsecure()
   constexpr char kOldSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_SSL_ENABLE";
   constexpr char kOldGenericEnv[] = "OTEL_EXPORTER_OTLP_SSL_ENABLE";
 
-  bool insecure;
-  bool ssl_enabled;
-  bool exists;
+  bool insecure{};
+  bool ssl_enabled{};
+  bool exists{};
 
   exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
   if (exists)
@@ -394,9 +394,9 @@ bool GetOtlpDefaultGrpcMetricsIsInsecure()
   constexpr char kOldSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_SSL_ENABLE";
   constexpr char kOldGenericEnv[] = "OTEL_EXPORTER_OTLP_SSL_ENABLE";
 
-  bool insecure;
-  bool ssl_enabled;
-  bool exists;
+  bool insecure{};
+  bool ssl_enabled{};
+  bool exists{};
 
   exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
   if (exists)
@@ -450,8 +450,8 @@ bool GetOtlpDefaultGrpcLogsIsInsecure()
   constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_INSECURE";
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_INSECURE";
 
-  bool insecure;
-  bool exists;
+  bool insecure{};
+  bool exists{};
 
   exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
   if (exists)
@@ -468,7 +468,7 @@ std::string GetOtlpDefaultTracesSslCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -485,7 +485,7 @@ std::string GetOtlpDefaultMetricsSslCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -502,7 +502,7 @@ std::string GetOtlpDefaultLogsSslCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -519,7 +519,7 @@ std::string GetOtlpDefaultTracesSslCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -536,7 +536,7 @@ std::string GetOtlpDefaultMetricsSslCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -553,7 +553,7 @@ std::string GetOtlpDefaultLogsSslCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -570,7 +570,7 @@ std::string GetOtlpDefaultTracesSslClientKeyPath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -587,7 +587,7 @@ std::string GetOtlpDefaultMetricsSslClientKeyPath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -604,7 +604,7 @@ std::string GetOtlpDefaultLogsSslClientKeyPath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -621,7 +621,7 @@ std::string GetOtlpDefaultTracesSslClientKeyString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -638,7 +638,7 @@ std::string GetOtlpDefaultMetricsSslClientKeyString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -655,7 +655,7 @@ std::string GetOtlpDefaultLogsSslClientKeyString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -672,7 +672,7 @@ std::string GetOtlpDefaultTracesSslClientCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -689,7 +689,7 @@ std::string GetOtlpDefaultMetricsSslClientCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -706,7 +706,7 @@ std::string GetOtlpDefaultLogsSslClientCertificatePath()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -723,7 +723,7 @@ std::string GetOtlpDefaultTracesSslClientCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -740,7 +740,7 @@ std::string GetOtlpDefaultMetricsSslClientCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -757,7 +757,7 @@ std::string GetOtlpDefaultLogsSslClientCertificateString()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -780,7 +780,7 @@ std::string GetOtlpDefaultTracesSslTlsMinVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -797,7 +797,7 @@ std::string GetOtlpDefaultMetricsSslTlsMinVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -814,7 +814,7 @@ std::string GetOtlpDefaultLogsSslTlsMinVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -831,7 +831,7 @@ std::string GetOtlpDefaultTracesSslTlsMaxVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -848,7 +848,7 @@ std::string GetOtlpDefaultMetricsSslTlsMaxVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -865,7 +865,7 @@ std::string GetOtlpDefaultLogsSslTlsMaxVersion()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -882,7 +882,7 @@ std::string GetOtlpDefaultTracesSslTlsCipher()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -899,7 +899,7 @@ std::string GetOtlpDefaultMetricsSslTlsCipher()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -916,7 +916,7 @@ std::string GetOtlpDefaultLogsSslTlsCipher()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -933,7 +933,7 @@ std::string GetOtlpDefaultTracesSslTlsCipherSuite()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -950,7 +950,7 @@ std::string GetOtlpDefaultMetricsSslTlsCipherSuite()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -967,7 +967,7 @@ std::string GetOtlpDefaultLogsSslTlsCipherSuite()
   constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -984,7 +984,7 @@ std::chrono::system_clock::duration GetOtlpDefaultTracesTimeout()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
 
   std::chrono::system_clock::duration value;
-  bool exists;
+  bool exists{};
 
   exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -1002,7 +1002,7 @@ std::chrono::system_clock::duration GetOtlpDefaultMetricsTimeout()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
 
   std::chrono::system_clock::duration value;
-  bool exists;
+  bool exists{};
 
   exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -1020,7 +1020,7 @@ std::chrono::system_clock::duration GetOtlpDefaultLogsTimeout()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
 
   std::chrono::system_clock::duration value;
-  bool exists;
+  bool exists{};
 
   exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -1035,7 +1035,7 @@ std::chrono::system_clock::duration GetOtlpDefaultLogsTimeout()
 static void DumpOtlpHeaders(OtlpHeaders &output, const char *env_var_name)
 {
   std::string raw_value;
-  bool exists;
+  bool exists{};
 
   exists = sdk_common::GetStringEnvironmentVariable(env_var_name, raw_value);
 
@@ -1111,7 +1111,7 @@ std::string GetOtlpDefaultTracesCompression()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -1128,7 +1128,7 @@ std::string GetOtlpDefaultMetricsCompression()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
@@ -1145,7 +1145,7 @@ std::string GetOtlpDefaultLogsCompression()
   constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
 
   std::string value;
-  bool exists;
+  bool exists{};
 
   exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
   if (exists)
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_file_client.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_file_client.cc
index 021035eb55b..c1c00cd01d5 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_file_client.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_file_client.cc
@@ -43,9 +43,9 @@
 #    define NOMINMAX
 #  endif
 
-#  include <Windows.h>
 #  include <direct.h>
 #  include <io.h>
+#  include <windows.h>
 
 #  ifdef UNICODE
 #    include <atlconv.h>
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_client.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_client.cc
index a51740404f9..02ec8d6a4ea 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_client.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_client.cc
@@ -22,6 +22,9 @@
 
 // clang-format off
 #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#ifdef ENABLE_ASYNC_EXPORT
+#  include "google/protobuf/arena.h"
+#endif /* ENABLE_ASYNC_EXPORT */
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
 #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
@@ -29,7 +32,6 @@
 // clang-format on
 
 #ifdef ENABLE_ASYNC_EXPORT
-#  include <google/protobuf/arena.h>
 #  include <algorithm>
 #  include <condition_variable>
 #  include <cstdio>
@@ -764,7 +766,7 @@ bool OtlpGrpcClient::Shutdown(OtlpGrpcClientReferenceGuard &guard,
   }
 
   bool last_reference_removed = RemoveReference(guard);
-  bool force_flush_result;
+  bool force_flush_result{};
   if (last_reference_removed && false == is_shutdown_.exchange(true, std::memory_order_acq_rel))
   {
     OTEL_INTERNAL_LOG_DEBUG("[OTLP GRPC Client] DEBUG: OtlpGrpcClient start to shutdown");
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_exporter.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_exporter.cc
index 07606585829..fa665ed4e41 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_exporter.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_exporter.cc
@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <google/protobuf/arena.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/status.h>
 #include <atomic>
@@ -27,6 +26,7 @@
 
 // clang-format off
 #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
 #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
@@ -97,7 +97,9 @@ OtlpGrpcExporter::~OtlpGrpcExporter()
 
 std::unique_ptr<sdk::trace::Recordable> OtlpGrpcExporter::MakeRecordable() noexcept
 {
-  return std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
+  return std::unique_ptr<sdk::trace::Recordable>(
+      new OtlpRecordable(options_.max_attributes, options_.max_events, options_.max_links,
+                         options_.max_attributes_per_event, options_.max_attributes_per_link));
 }
 
 sdk::common::ExportResult OtlpGrpcExporter::Export(
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_builder.cc
index e65b5848387..9c7dfdc98de 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_builder.cc
@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_builder.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpGrpcLogRecordBu
 {
   OtlpGrpcLogRecordExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->ca_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_exporter.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_exporter.cc
index 9725a3697d6..712db424efb 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_exporter.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_log_record_exporter.cc
@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <google/protobuf/arena.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/status.h>
 #include <atomic>
@@ -26,6 +25,7 @@
 
 // clang-format off
 #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_metric_exporter.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_metric_exporter.cc
index 6387e86f4ac..f73eb1abebf 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_metric_exporter.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_metric_exporter.cc
@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <google/protobuf/arena.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/status.h>
 #include <atomic>
@@ -26,6 +25,7 @@
 
 // clang-format off
 #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
 #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_push_metric_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_push_metric_builder.cc
index 6f0acd3e783..5b20a154634 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_push_metric_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_push_metric_builder.cc
@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_push_metric_builder.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpGrpcPushMet
 {
   OtlpGrpcMetricExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->ca_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_span_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_span_builder.cc
index 42aeeb56f50..0d92be40025 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_span_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_grpc_span_builder.cc
@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_span_builder.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcSpanBuilder::Bu
 {
   OtlpGrpcExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->ca_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_exporter.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_exporter.cc
index 6eaf1eed226..499d5771850 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_exporter.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_exporter.cc
@@ -140,8 +140,9 @@ OtlpHttpExporter::OtlpHttpExporter(std::unique_ptr<OtlpHttpClient> http_client)
 
 std::unique_ptr<opentelemetry::sdk::trace::Recordable> OtlpHttpExporter::MakeRecordable() noexcept
 {
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(
-      new exporter::otlp::OtlpRecordable());
+  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(new exporter::otlp::OtlpRecordable(
+      options_.max_attributes, options_.max_events, options_.max_links,
+      options_.max_attributes_per_event, options_.max_attributes_per_link));
 }
 
 opentelemetry::sdk::common::ExportResult OtlpHttpExporter::Export(
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_log_record_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_log_record_builder.cc
index ad72b918689..5d0914db6b3 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_log_record_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_log_record_builder.cc
@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_builder.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_log_record_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu
 {
   OtlpHttpLogRecordExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -44,10 +47,15 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu
   options.http_headers =
       OtlpBuilderUtils::ConvertHeadersConfigurationModel(model->headers.get(), model->headers_list);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->ca_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpLogRecordExporterFactory::Create(options);
 }
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_push_metric_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_push_metric_builder.cc
index afc59adabe6..1ac30cb4474 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_push_metric_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_push_metric_builder.cc
@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_push_metric_builder.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet
 {
   OtlpHttpMetricExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -46,10 +49,15 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet
   options.aggregation_temporality =
       OtlpBuilderUtils::ConvertTemporalityPreference(model->temporality_preference);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->ca_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpMetricExporterFactory::Create(options);
 }
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_span_builder.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_span_builder.cc
index 98b79c6a58d..e0a94c2f8f0 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_span_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_http_span_builder.cc
@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_span_builder.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu
 {
   OtlpHttpExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -44,10 +47,15 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu
   options.http_headers =
       OtlpBuilderUtils::ConvertHeadersConfigurationModel(model->headers.get(), model->headers_list);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->ca_file;
+    options.ssl_client_key_path  = tls->key_file;
+    options.ssl_client_cert_path = tls->cert_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpExporterFactory::Create(options);
 }
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
index fca11a68733..0409037b0ad 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
@@ -76,11 +76,6 @@ metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType(
   {
     return metric_sdk::AggregationType::kLastValue;
   }
-  else if (nostd::holds_alternative<sdk::metrics::SummaryPointData>(
-               point_data_with_attributes.point_data))
-  {
-    return metric_sdk::AggregationType::kSummary;
-  }
   return metric_sdk::AggregationType::kDrop;
 }
 
@@ -284,56 +279,6 @@ void OtlpMetricUtils::ConvertGaugeMetric(const opentelemetry::sdk::metrics::Metr
   }
 }
 
-void OtlpMetricUtils::ConvertSummaryMetric(const metric_sdk::MetricData &metric_data,
-                                           proto::metrics::v1::Summary *const summary) noexcept
-{
-  auto start_ts = metric_data.start_ts.time_since_epoch().count();
-  auto ts       = metric_data.end_ts.time_since_epoch().count();
-  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
-  {
-    proto::metrics::v1::SummaryDataPoint *proto_summary_point_data = summary->add_data_points();
-    proto_summary_point_data->set_start_time_unix_nano(start_ts);
-    proto_summary_point_data->set_time_unix_nano(ts);
-    auto summary_data = nostd::get<sdk::metrics::SummaryPointData>(point_data_with_attributes.point_data);
-
-    // sum
-    if ((nostd::holds_alternative<int64_t>(summary_data.sum_)))
-    {
-      // Use static_cast to avoid C4244 in MSVC
-      proto_summary_point_data->set_sum(
-          static_cast<double>(nostd::get<int64_t>(summary_data.sum_)));
-    }
-    else
-    {
-      proto_summary_point_data->set_sum(nostd::get<double>(summary_data.sum_));
-    }
-    // count
-    proto_summary_point_data->set_count(summary_data.count_);
-    // quantile values
-    for (auto &kv : summary_data.quantile_values_)
-    {
-      proto::metrics::v1::SummaryDataPoint::ValueAtQuantile *quantile =
-          proto_summary_point_data->add_quantile_values();
-      quantile->set_quantile(kv.first);
-      if ((nostd::holds_alternative<int64_t>(kv.second)))
-      {
-        // Use static_cast to avoid C4244 in MSVC
-        quantile->set_value(static_cast<double>(nostd::get<int64_t>(kv.second)));
-      }
-      else
-      {
-        quantile->set_value(nostd::get<double>(kv.second));
-      }
-    }
-    // set attributes
-    for (auto &kv_attr : point_data_with_attributes.attributes)
-    {
-      OtlpPopulateAttributeUtils::PopulateAttribute(proto_summary_point_data->add_attributes(),
-                                                    kv_attr.first, kv_attr.second, false);
-    }
-  }
-}
-
 void OtlpMetricUtils::PopulateInstrumentInfoMetrics(
     const opentelemetry::sdk::metrics::MetricData &metric_data,
     proto::metrics::v1::Metric *metric) noexcept
@@ -360,10 +305,6 @@ void OtlpMetricUtils::PopulateInstrumentInfoMetrics(
       ConvertGaugeMetric(metric_data, metric->mutable_gauge());
       break;
     }
-    case metric_sdk::AggregationType::kSummary: {
-      ConvertSummaryMetric(metric_data, metric->mutable_summary());
-      break;
-    }
     default:
       break;
   }
@@ -440,8 +381,6 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::DeltaTemporalitySelector(
     case sdk::metrics::InstrumentType::kUpDownCounter:
     case sdk::metrics::InstrumentType::kObservableUpDownCounter:
       return sdk::metrics::AggregationTemporality::kCumulative;
-    case sdk::metrics::InstrumentType::kSummary:
-      return sdk::metrics::AggregationTemporality::kUnspecified;
   }
   return sdk::metrics::AggregationTemporality::kUnspecified;
 }
@@ -466,8 +405,6 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::LowMemoryTemporalitySelect
     case sdk::metrics::InstrumentType::kUpDownCounter:
     case sdk::metrics::InstrumentType::kObservableUpDownCounter:
       return sdk::metrics::AggregationTemporality::kCumulative;
-    case sdk::metrics::InstrumentType::kSummary:
-      return sdk::metrics::AggregationTemporality::kUnspecified;
   }
   return sdk::metrics::AggregationTemporality::kUnspecified;
 }
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_recordable.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_recordable.cc
index 35644487874..c5745856a4b 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_recordable.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_recordable.cc
@@ -120,6 +120,12 @@ void OtlpRecordable::SetResource(const sdk::resource::Resource &resource) noexce
 void OtlpRecordable::SetAttribute(nostd::string_view key,
                                   const common::AttributeValue &value) noexcept
 {
+  if (static_cast<uint32_t>(span_.attributes_size()) >= max_attributes_)
+  {
+    span_.set_dropped_attributes_count(span_.dropped_attributes_count() + 1);
+    return;
+  }
+
   auto *attribute = span_.add_attributes();
   OtlpPopulateAttributeUtils::PopulateAttribute(attribute, key, value, false);
 }
@@ -128,11 +134,22 @@ void OtlpRecordable::AddEvent(nostd::string_view name,
                               common::SystemTimestamp timestamp,
                               const common::KeyValueIterable &attributes) noexcept
 {
+  if (static_cast<uint32_t>(span_.events_size()) >= max_events_)
+  {
+    span_.set_dropped_events_count(span_.dropped_events_count() + 1);
+    return;
+  }
+
   auto *event = span_.add_events();
   event->set_name(name.data(), name.size());
   event->set_time_unix_nano(timestamp.time_since_epoch().count());
 
   attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
+    if (static_cast<uint32_t>(event->attributes_size()) >= max_attributes_per_event_)
+    {
+      event->set_dropped_attributes_count(event->dropped_attributes_count() + 1);
+      return true;
+    }
     OtlpPopulateAttributeUtils::PopulateAttribute(event->add_attributes(), key, value, false);
     return true;
   });
@@ -141,6 +158,11 @@ void OtlpRecordable::AddEvent(nostd::string_view name,
 void OtlpRecordable::AddLink(const trace::SpanContext &span_context,
                              const common::KeyValueIterable &attributes) noexcept
 {
+  if (static_cast<uint32_t>(span_.links_size()) >= max_links_)
+  {
+    span_.set_dropped_links_count(span_.dropped_links_count() + 1);
+    return;
+  }
   auto *link = span_.add_links();
   link->set_trace_id(reinterpret_cast<const char *>(span_context.trace_id().Id().data()),
                      trace::TraceId::kSize);
@@ -148,6 +170,11 @@ void OtlpRecordable::AddLink(const trace::SpanContext &span_context,
                     trace::SpanId::kSize);
   link->set_trace_state(span_context.trace_state()->ToHeader());
   attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
+    if (static_cast<uint32_t>(link->attributes_size()) >= max_attributes_per_link_)
+    {
+      link->set_dropped_attributes_count(link->dropped_attributes_count() + 1);
+      return true;
+    }
     OtlpPopulateAttributeUtils::PopulateAttribute(link->add_attributes(), key, value, false);
     return true;
   });
diff --git a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_exporter_test.cc b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_exporter_test.cc
index c9a3b6901a9..85a27022a39 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_exporter_test.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_exporter_test.cc
@@ -170,17 +170,34 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_trace_id_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, &received_trace_id_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_span     = *check_json["resourceSpans"].begin();
-              auto scope_span        = *resource_span["scopeSpans"].begin();
+              if (check_json["resourceSpans"].size() == 0)
+              {
+                return;
+              }
+              auto resource_span = *check_json["resourceSpans"].begin();
+              if (resource_span["scopeSpans"].size() == 0)
+              {
+                return;
+              }
+              auto scope_span = *resource_span["scopeSpans"].begin();
+              if (scope_span["spans"].size() == 0)
+              {
+                return;
+              }
               auto span              = *scope_span["spans"].begin();
               auto received_trace_id = span["traceId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
+              if (received_trace_id != report_trace_id)
+              {
+                return;
+              }
+              ++received_trace_id_counter;
 
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
               ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
@@ -205,6 +222,9 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     parent_span->End();
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_trace_id_counter, 1);
   }
 
 #  ifdef ENABLE_ASYNC_EXPORT
@@ -262,17 +282,34 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_trace_id_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, &received_trace_id_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_span     = *check_json["resourceSpans"].begin();
-              auto scope_span        = *resource_span["scopeSpans"].begin();
+              if (check_json["resourceSpans"].size() == 0)
+              {
+                return;
+              }
+              auto resource_span = *check_json["resourceSpans"].begin();
+              if (resource_span["scopeSpans"].size() == 0)
+              {
+                return;
+              }
+              auto scope_span = *resource_span["scopeSpans"].begin();
+              if (scope_span["spans"].size() == 0)
+              {
+                return;
+              }
               auto span              = *scope_span["spans"].begin();
               auto received_trace_id = span["traceId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
+              if (received_trace_id != report_trace_id)
+              {
+                return;
+              }
+              ++received_trace_id_counter;
 
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
               ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
@@ -301,6 +338,9 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     parent_span->End();
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_trace_id_counter, 1);
   }
 #  endif
 
@@ -357,17 +397,28 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_trace_id_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, &received_trace_id_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
               request_body.ParseFromArray(
                   &mock_session->GetRequest()->body_[0],
                   static_cast<int>(mock_session->GetRequest()->body_.size()));
+              if (request_body.resource_spans_size() == 0 ||
+                  request_body.resource_spans(0).scope_spans_size() == 0 ||
+                  request_body.resource_spans(0).scope_spans(0).spans_size() == 0)
+              {
+                return;
+              }
               auto received_trace_id =
                   request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-              EXPECT_EQ(received_trace_id, report_trace_id);
+              if (received_trace_id != report_trace_id)
+              {
+                return;
+              }
+              ++received_trace_id_counter;
 
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
               ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
@@ -384,6 +435,9 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     parent_span->End();
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_trace_id_counter, 1);
   }
 
 #  ifdef ENABLE_ASYNC_EXPORT
@@ -440,17 +494,28 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_trace_id_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, &received_trace_id_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
               request_body.ParseFromArray(
                   &mock_session->GetRequest()->body_[0],
                   static_cast<int>(mock_session->GetRequest()->body_.size()));
+              if (request_body.resource_spans_size() == 0 ||
+                  request_body.resource_spans(0).scope_spans_size() == 0 ||
+                  request_body.resource_spans(0).scope_spans(0).spans_size() == 0)
+              {
+                return;
+              }
               auto received_trace_id =
                   request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-              EXPECT_EQ(received_trace_id, report_trace_id);
+              if (received_trace_id != report_trace_id)
+              {
+                return;
+              }
+              ++received_trace_id_counter;
 
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
               ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
@@ -472,6 +537,8 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     parent_span->End();
 
     provider->ForceFlush();
+    // Exporting can be retried
+    EXPECT_GE(received_trace_id_counter, 1);
   }
 #  endif
 };
diff --git a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_log_record_exporter_test.cc b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
index fd84953f8e4..f887b2372ee 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
@@ -158,20 +158,35 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, report_span_id, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_logs     = *check_json["resourceLogs"].begin();
-              auto scope_logs        = *resource_logs["scopeLogs"].begin();
+              if (check_json["resourceLogs"].size() == 0)
+              {
+                return;
+              }
+              auto resource_logs = *check_json["resourceLogs"].begin();
+              if (resource_logs["scopeLogs"].size() == 0)
+              {
+                return;
+              }
+              auto scope_logs = *resource_logs["scopeLogs"].begin();
+              if (scope_logs["logRecords"].size() == 0)
+              {
+                return;
+              }
               auto scope             = scope_logs["scope"];
               auto log               = *scope_logs["logRecords"].begin();
               auto received_trace_id = log["traceId"].get<std::string>();
               auto received_span_id  = log["spanId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-              EXPECT_EQ(received_span_id, report_span_id);
+              if (received_trace_id == report_trace_id && received_span_id == report_span_id)
+              {
+                ++received_record_counter;
+              }
               EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
               EXPECT_LE(15, log["attributes"].size());
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
@@ -224,6 +239,9 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
         std::chrono::system_clock::now());
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
 #  ifdef ENABLE_ASYNC_EXPORT
@@ -276,14 +294,27 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, report_span_id, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_logs     = *check_json["resourceLogs"].begin();
-              auto scope_logs        = *resource_logs["scopeLogs"].begin();
+              if (check_json["resourceLogs"].size() == 0)
+              {
+                return;
+              }
+              auto resource_logs = *check_json["resourceLogs"].begin();
+              if (resource_logs["scopeLogs"].size() == 0)
+              {
+                return;
+              }
+              auto scope_logs = *resource_logs["scopeLogs"].begin();
+              if (scope_logs["logRecords"].size() == 0)
+              {
+                return;
+              }
               auto schema_url        = scope_logs["schemaUrl"].get<std::string>();
               auto scope             = scope_logs["scope"];
               auto scope_name        = scope["name"];
@@ -291,11 +322,13 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
               auto log               = *scope_logs["logRecords"].begin();
               auto received_trace_id = log["traceId"].get<std::string>();
               auto received_span_id  = log["spanId"].get<std::string>();
+              if (received_trace_id == report_trace_id && received_span_id == report_span_id)
+              {
+                ++received_record_counter;
+              }
               EXPECT_EQ(schema_url, "https://opentelemetry.io/schemas/1.2.0");
               EXPECT_EQ(scope_name, "opentelelemtry_library");
               EXPECT_EQ(scope_version, "1.2.0");
-              EXPECT_EQ(received_trace_id, report_trace_id);
-              EXPECT_EQ(received_span_id, report_span_id);
               EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
               EXPECT_LE(15, log["attributes"].size());
               auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
@@ -353,6 +386,9 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
         std::chrono::system_clock::now());
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 #  endif
 
@@ -399,21 +435,31 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, report_span_id, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
               request_body.ParseFromArray(
                   &mock_session->GetRequest()->body_[0],
                   static_cast<int>(mock_session->GetRequest()->body_.size()));
+              if (request_body.resource_logs_size() == 0 ||
+                  request_body.resource_logs(0).scope_logs_size() == 0 ||
+                  request_body.resource_logs(0).scope_logs(0).log_records_size() == 0)
+              {
+                return;
+              }
               auto scope_log = request_body.resource_logs(0).scope_logs(0);
               EXPECT_EQ(scope_log.schema_url(), "https://opentelemetry.io/schemas/1.2.0");
               EXPECT_EQ(scope_log.scope().name(), "opentelelemtry_library");
               EXPECT_EQ(scope_log.scope().version(), "1.2.0");
               const auto &received_log = scope_log.log_records(0);
-              EXPECT_EQ(received_log.trace_id(), report_trace_id);
-              EXPECT_EQ(received_log.span_id(), report_span_id);
+              if (received_log.trace_id() == report_trace_id &&
+                  received_log.span_id() == report_span_id)
+              {
+                ++received_record_counter;
+              }
               EXPECT_EQ("Log message", received_log.body().string_value());
               EXPECT_LE(15, received_log.attributes_size());
               bool check_service_name = false;
@@ -467,6 +513,9 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
         std::chrono::system_clock::now());
 
     provider->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
 #  ifdef ENABLE_ASYNC_EXPORT
@@ -514,18 +563,28 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id, schema_url](
+        .WillRepeatedly(
+            [&mock_session, report_trace_id, report_span_id, schema_url, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
               request_body.ParseFromArray(
                   &mock_session->GetRequest()->body_[0],
                   static_cast<int>(mock_session->GetRequest()->body_.size()));
+              if (request_body.resource_logs_size() == 0 ||
+                  request_body.resource_logs(0).scope_logs_size() == 0 ||
+                  request_body.resource_logs(0).scope_logs(0).log_records_size() == 0)
+              {
+                return;
+              }
               auto &scope_log   = request_body.resource_logs(0).scope_logs(0);
               auto received_log = scope_log.log_records(0);
-              EXPECT_EQ(received_log.trace_id(), report_trace_id);
-              EXPECT_EQ(received_log.span_id(), report_span_id);
+              if (received_log.trace_id() == report_trace_id &&
+                  received_log.span_id() == report_span_id)
+              {
+                ++received_record_counter;
+              }
               EXPECT_EQ("Log message", received_log.body().string_value());
               EXPECT_LE(15, received_log.attributes_size());
               bool check_service_name = false;
@@ -586,6 +645,8 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
         std::chrono::system_clock::now());
 
     provider->ForceFlush();
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 #  endif
 };
diff --git a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_metric_exporter_test.cc
index d1ca0572ae5..f27c186e2ed 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_metric_exporter_test.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_http_metric_exporter_test.cc
@@ -175,16 +175,31 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
+        .WillRepeatedly(
+            [&mock_session, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
 
+              if (check_json["resourceMetrics"].size() == 0)
+              {
+                return;
+              }
               auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
+              if (resource_metrics["scopeMetrics"].size() == 0)
+              {
+                return;
+              }
+              auto scope_metrics = *resource_metrics["scopeMetrics"].begin();
+              if (scope_metrics["metrics"].size() == 0)
+              {
+                return;
+              }
+              ++received_record_counter;
+
+              auto scope = scope_metrics["scope"];
               EXPECT_EQ("library_name", scope["name"].get<std::string>());
               EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
 
@@ -212,6 +227,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
   void ExportBinaryIntegrationTestExportSumPointData(
@@ -258,13 +276,21 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
+        .WillRepeatedly([&mock_session, &received_record_counter](
+                            const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                                &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
+          if (request_body.resource_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)
+          {
+            return;
+          }
+          ++received_record_counter;
           auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
           auto &scope         = scope_metrics.scope();
           EXPECT_EQ("library_name", scope.name());
@@ -308,6 +334,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
   void ExportJsonIntegrationTestExportLastValuePointData(
@@ -358,16 +387,31 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
+        .WillRepeatedly(
+            [&mock_session, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
 
+              if (check_json["resourceMetrics"].size() == 0)
+              {
+                return;
+              }
               auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
+              if (resource_metrics["scopeMetrics"].size() == 0)
+              {
+                return;
+              }
+              auto scope_metrics = *resource_metrics["scopeMetrics"].begin();
+              if (scope_metrics["metrics"].size() == 0)
+              {
+                return;
+              }
+              ++received_record_counter;
+
+              auto scope = scope_metrics["scope"];
               EXPECT_EQ("library_name", scope["name"].get<std::string>());
               EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
 
@@ -395,6 +439,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
   void ExportBinaryIntegrationTestExportLastValuePointData(
@@ -450,13 +497,22 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
+        .WillRepeatedly([&mock_session, &received_record_counter](
+                            const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                                &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
+          if (request_body.resource_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)
+          {
+            return;
+          }
+          ++received_record_counter;
+
           auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
           auto &scope         = scope_metrics.scope();
           EXPECT_EQ("library_name", scope.name());
@@ -500,6 +556,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
   void ExportJsonIntegrationTestExportHistogramPointData(
@@ -555,16 +614,31 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
+        .WillRepeatedly(
+            [&mock_session, &received_record_counter](
                 const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
               auto check_json =
                   nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
 
+              if (check_json["resourceMetrics"].size() == 0)
+              {
+                return;
+              }
               auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
+              if (resource_metrics["scopeMetrics"].size() == 0)
+              {
+                return;
+              }
+              auto scope_metrics = *resource_metrics["scopeMetrics"].begin();
+              if (scope_metrics["metrics"].size() == 0)
+              {
+                return;
+              }
+              ++received_record_counter;
+
+              auto scope = scope_metrics["scope"];
               EXPECT_EQ("library_name", scope["name"].get<std::string>());
               EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
 
@@ -627,6 +701,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 
   void ExportBinaryIntegrationTestExportHistogramPointData(
@@ -686,13 +763,22 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
+    auto received_record_counter = 0;
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
+        .WillRepeatedly([&mock_session, &received_record_counter](
+                            const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                                &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
+          if (request_body.resource_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics_size() == 0 ||
+              request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)
+          {
+            return;
+          }
+          ++received_record_counter;
+
           auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
           auto &scope         = scope_metrics.scope();
           EXPECT_EQ("library_name", scope.name());
@@ -769,6 +855,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 
     exporter->ForceFlush();
+
+    // Exporting can be retried
+    EXPECT_GE(received_record_counter, 1);
   }
 };
 
diff --git a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_recordable_test.cc b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_recordable_test.cc
index 70016de15a0..9eca9fcc280 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/test/otlp_recordable_test.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/test/otlp_recordable_test.cc
@@ -598,6 +598,83 @@ TYPED_TEST(IntAttributeTest, SetIntArrayAttribute)
     EXPECT_EQ(rec.span().attributes(0).value().array_value().values(i).int_value(), int_span[i]);
   }
 }
+
+TEST(OtlpRecordableTest, TestCollectionLimits)
+{
+  // Initialize recordable with strict limits:
+  // Max Attributes: 2, Max Events: 2, Max Links: 2
+  // Max Attributes Per Event: 1, Max Attributes Per Link: 1
+  OtlpRecordable recordable(2, 2, 2, 1, 1);
+
+  // Test Attribute Limits
+  recordable.SetAttribute("attr1", 1);
+  recordable.SetAttribute("attr2", 2);
+  recordable.SetAttribute("attr3", 3);  // Should be dropped
+
+  EXPECT_EQ(recordable.span().attributes_size(), 2);
+  EXPECT_EQ(recordable.span().dropped_attributes_count(), 1);
+
+  // Test Event Limits
+  std::map<std::string, int> empty_map;
+  common::KeyValueIterableView<std::map<std::string, int>> empty_attrs(empty_map);
+
+  recordable.AddEvent("event1", std::chrono::system_clock::now(), empty_attrs);
+  recordable.AddEvent("event2", std::chrono::system_clock::now(), empty_attrs);
+  recordable.AddEvent("event3", std::chrono::system_clock::now(),
+                      empty_attrs);  // Should be dropped
+
+  EXPECT_EQ(recordable.span().events_size(), 2);
+  EXPECT_EQ(recordable.span().dropped_events_count(), 1);
+
+  // Test Per-Event Attribute Limits
+  std::map<std::string, int> attr_map = {{"e_attr1", 1}, {"e_attr2", 2}};
+  common::KeyValueIterableView<std::map<std::string, int>> event_attrs(attr_map);
+
+  OtlpRecordable event_recordable(10, 10, 10, 1, 1);
+  event_recordable.AddEvent("event_with_attrs", std::chrono::system_clock::now(), event_attrs);
+
+  auto &event_list = event_recordable.span().events();
+  ASSERT_EQ(event_list.size(), 1);
+  // The event itself should have 1 attribute, and 1 dropped
+  EXPECT_EQ(event_list[0].attributes_size(), 1);
+  EXPECT_EQ(event_list[0].dropped_attributes_count(), 1);
+}
+
+TEST(OtlpRecordableTest, TestLinkLimits)
+{
+  // Limits: Max Links: 2, Max Attributes Per Link: 1
+  OtlpRecordable recordable(10, 10, 2, 10, 1);
+
+  // Dummy SpanContext for the links
+  trace::SpanContext context = trace::SpanContext::GetInvalid();
+
+  // Test Link Limits
+  // Create an empty attribute map for the links
+  std::map<std::string, int> empty_map;
+  common::KeyValueIterableView<std::map<std::string, int>> empty_attrs(empty_map);
+
+  recordable.AddLink(context, empty_attrs);
+  recordable.AddLink(context, empty_attrs);
+  recordable.AddLink(context, empty_attrs);  // Should be dropped (Max 2)
+
+  EXPECT_EQ(recordable.span().links_size(), 2);
+  EXPECT_EQ(recordable.span().dropped_links_count(), 1);
+
+  // Test Per-Link Attribute Limits
+  // Create a map with 2 attributes. Limit is 1
+  std::map<std::string, int> attr_map = {{"l_attr1", 1}, {"l_attr2", 2}};
+  common::KeyValueIterableView<std::map<std::string, int>> link_attrs(attr_map);
+
+  // Create a new recordable for this sub-test
+  OtlpRecordable link_recordable(10, 10, 10, 10, 1);
+  link_recordable.AddLink(context, link_attrs);
+
+  auto &link_list = link_recordable.span().links();
+  ASSERT_EQ(link_list.size(), 1);
+  // The link itself should have 1 attribute kept, 1 dropped
+  EXPECT_EQ(link_list[0].attributes_size(), 1);
+  EXPECT_EQ(link_list[0].dropped_attributes_count(), 1);
+}
 }  // namespace otlp
 }  // namespace exporter
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/prometheus/BUILD b/deps/opentelemetry-cpp/exporters/prometheus/BUILD
index fc981921d90..71d8b00031f 100644
--- a/deps/opentelemetry-cpp/exporters/prometheus/BUILD
+++ b/deps/opentelemetry-cpp/exporters/prometheus/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -27,6 +30,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "prometheus_exporter_builder",
+    srcs = [
+        "src/prometheus_pull_builder.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/prometheus/prometheus_pull_builder.h",
+    ],
+    strip_include_prefix = "include",
+    tags = ["prometheus"],
+    deps = [
+        ":prometheus_exporter",
+    ],
+)
+
 cc_library(
     name = "prometheus_exporter_utils",
     srcs = [
diff --git a/deps/opentelemetry-cpp/exporters/prometheus/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/prometheus/CMakeLists.txt
index d6eb288b9b2..a5a13c76ee3 100644
--- a/deps/opentelemetry-cpp/exporters/prometheus/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/prometheus/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
+#
+# opentelemetry_exporter_prometheus
+#
+
 add_library(
   opentelemetry_exporter_prometheus
   src/exporter.cc src/exporter_options.cc src/exporter_factory.cc
@@ -20,6 +26,25 @@ target_link_libraries(
   PUBLIC opentelemetry_metrics prometheus-cpp::core
   PRIVATE prometheus-cpp::pull)
 
+#
+# opentelemetry_exporter_prometheus_builder
+#
+
+add_library(opentelemetry_exporter_prometheus_builder
+            src/prometheus_pull_builder.cc)
+
+set_target_properties(opentelemetry_exporter_prometheus_builder
+                      PROPERTIES EXPORT_NAME prometheus_exporter_builder)
+set_target_version(opentelemetry_exporter_prometheus_builder)
+
+target_include_directories(
+  opentelemetry_exporter_prometheus_builder
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+         "$<INSTALL_INTERFACE:include>")
+
+target_link_libraries(opentelemetry_exporter_prometheus_builder
+                      PUBLIC opentelemetry_exporter_prometheus)
+
 otel_add_component(
   COMPONENT
   exporters_prometheus
@@ -31,7 +56,33 @@ otel_add_component(
   "include/opentelemetry/exporters"
   FILES_MATCHING
   PATTERN
-  "*.h")
+  "*.h"
+  PATTERN
+  "prometheus_pull_builder.h"
+  EXCLUDE)
+
+otel_add_component(
+  COMPONENT
+  exporters_prometheus_builder
+  TARGETS
+  opentelemetry_exporter_prometheus_builder
+  FILES_DIRECTORY
+  "include/opentelemetry/exporters/prometheus"
+  FILES_DESTINATION
+  "include/opentelemetry/exporters"
+  FILES_MATCHING
+  PATTERN
+  "prometheus_pull_builder.h")
+
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    exporter_prometheus "OpenTelemetry Exporter - Prometheus"
+    "Exports metrics in Prometheus format." "opentelemetry_metrics")
+
+  opentelemetry_add_pkgconfig(
+    exporter_prometheus_builder "OpenTelemetry Exporter - Prometheus Builder"
+    "Builder for Prometheus exporter." "opentelemetry_exporter_prometheus")
+endif()
 
 if(BUILD_TESTING)
   add_subdirectory(test)
diff --git a/deps/opentelemetry-cpp/exporters/prometheus/src/exporter_options.cc b/deps/opentelemetry-cpp/exporters/prometheus/src/exporter_options.cc
index 122baf5198f..0798f47cf99 100644
--- a/deps/opentelemetry-cpp/exporters/prometheus/src/exporter_options.cc
+++ b/deps/opentelemetry-cpp/exporters/prometheus/src/exporter_options.cc
@@ -29,7 +29,7 @@ inline bool GetPrometheusWithoutOtelScope()
 {
   constexpr char kPrometheusWithoutOtelScope[] = "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_OTEL_SCOPE";
 
-  bool setting;
+  bool setting{};
   auto exists =
       opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutOtelScope, setting);
 
@@ -41,7 +41,7 @@ inline bool GetPrometheusPopulateTargetInfo()
   constexpr char kPrometheusPopulateTargetInfo[] =
       "OTEL_CPP_PROMETHEUS_EXPORTER_POPULATE_TARGET_INFO";
 
-  bool setting;
+  bool setting{};
   auto exists = opentelemetry::sdk::common::GetBoolEnvironmentVariable(
       kPrometheusPopulateTargetInfo, setting);
 
@@ -51,7 +51,7 @@ inline bool GetPrometheusPopulateTargetInfo()
 inline bool GetPrometheusWithoutUnits()
 {
   constexpr char kPrometheusWithoutUnits[] = "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_UNITS";
-  bool setting;
+  bool setting{};
   const auto exists =
       opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutUnits, setting);
 
@@ -62,7 +62,7 @@ inline bool GetPrometheusWithoutTypeSuffix()
 {
   constexpr char kPrometheusWithoutTypeSuffix[] =
       "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_TYPE_SUFFIX";
-  bool setting;
+  bool setting{};
   const auto exists =
       opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutTypeSuffix, setting);
 
diff --git a/deps/opentelemetry-cpp/exporters/prometheus/src/prometheus_pull_builder.cc b/deps/opentelemetry-cpp/exporters/prometheus/src/prometheus_pull_builder.cc
index 18cf814051e..d81b324ee9d 100644
--- a/deps/opentelemetry-cpp/exporters/prometheus/src/prometheus_pull_builder.cc
+++ b/deps/opentelemetry-cpp/exporters/prometheus/src/prometheus_pull_builder.cc
@@ -8,9 +8,11 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/exporters/prometheus/prometheus_pull_builder.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
+#include "opentelemetry/sdk/configuration/translation_strategy.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
 #include "opentelemetry/version.h"
 
@@ -36,10 +38,38 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> PrometheusPullBuilder
   url.append(std::to_string(model->port));
 
   options.url                  = url;
-  options.populate_target_info = true;
+  options.populate_target_info = !model->without_target_info;
   options.without_otel_scope   = model->without_scope_info;
-  options.without_units        = model->without_units;
-  options.without_type_suffix  = model->without_type_suffix;
+
+  switch (model->translation_strategy)
+  {
+    case sdk::configuration::TranslationStrategy::UnderscoreEscapingWithSuffixes:
+      options.without_units       = false;
+      options.without_type_suffix = false;
+      break;
+    case sdk::configuration::TranslationStrategy::UnderscoreEscapingWithoutSuffixes:
+      options.without_units       = true;
+      options.without_type_suffix = true;
+      break;
+    case sdk::configuration::TranslationStrategy::NoUTF8EscapingWithSuffixes:
+      // FIXME: no flag to disable UnderscoreEscaping
+      OTEL_INTERNAL_LOG_WARN("[Prometheus Exporter] NoUTF8EscapingWithSuffixes not supported");
+      options.without_units       = false;
+      options.without_type_suffix = false;
+      break;
+    case sdk::configuration::TranslationStrategy::NoTranslation:
+      // FIXME: no flag to disable UnderscoreEscaping
+      OTEL_INTERNAL_LOG_WARN("[Prometheus Exporter] NoTranslation not supported");
+      options.without_units       = true;
+      options.without_type_suffix = true;
+      break;
+  }
+
+  if (model->with_resource_constant_labels != nullptr)
+  {
+    // FIXME: with_resource_constant_labels
+    OTEL_INTERNAL_LOG_WARN("[Prometheus Exporter] with_resource_constant_labels not supported");
+  }
 
   return PrometheusExporterFactory::Create(options);
 }
diff --git a/deps/opentelemetry-cpp/exporters/zipkin/BUILD b/deps/opentelemetry-cpp/exporters/zipkin/BUILD
index 16774e80df7..bfa91014d35 100644
--- a/deps/opentelemetry-cpp/exporters/zipkin/BUILD
+++ b/deps/opentelemetry-cpp/exporters/zipkin/BUILD
@@ -1,6 +1,9 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/exporters/zipkin/CMakeLists.txt b/deps/opentelemetry-cpp/exporters/zipkin/CMakeLists.txt
index 9fc92ba7a52..9955d8c4cb2 100644
--- a/deps/opentelemetry-cpp/exporters/zipkin/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/exporters/zipkin/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
+#
+# opentelemetry_exporter_zipkin_trace
+#
+
 add_library(
   opentelemetry_exporter_zipkin_trace
   src/zipkin_exporter.cc src/zipkin_exporter_factory.cc src/recordable.cc)
@@ -36,6 +42,12 @@ otel_add_component(
   "recordable.h"
   EXCLUDE)
 
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    exporter_zipkin_trace "OpenTelemetry Exporter - Zipkin"
+    "Exports trace spans in Zipkin format." "opentelemetry_trace")
+endif()
+
 if(BUILD_TESTING)
   add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
 
diff --git a/deps/opentelemetry-cpp/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h b/deps/opentelemetry-cpp/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h
deleted file mode 100644
index c5d28d09cea..00000000000
--- a/deps/opentelemetry-cpp/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_builder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/configuration/registry.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-class OPENTELEMETRY_EXPORT ZipkinBuilder
-    : public opentelemetry::sdk::configuration::ZipkinSpanExporterBuilder
-{
-public:
-  static void Register(opentelemetry::sdk::configuration::Registry *registry);
-
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(
-      const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model)
-      const override;
-};
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/zipkin/src/zipkin_builder.cc b/deps/opentelemetry-cpp/exporters/zipkin/src/zipkin_builder.cc
deleted file mode 100644
index a7bdc770d4c..00000000000
--- a/deps/opentelemetry-cpp/exporters/zipkin/src/zipkin_builder.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/zipkin/zipkin_builder.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/sdk/configuration/registry.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-void ZipkinBuilder::Register(opentelemetry::sdk::configuration::Registry *registry)
-{
-  auto builder = std::make_unique<ZipkinBuilder>();
-  registry->SetZipkinSpanBuilder(std::move(builder));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ZipkinBuilder::Build(
-    const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const
-{
-  ZipkinExporterOptions options(nullptr);
-
-  options.endpoint = model->endpoint;
-
-  return ZipkinExporterFactory::Create(options);
-}
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/exporters/zipkin/test/zipkin_exporter_test.cc b/deps/opentelemetry-cpp/exporters/zipkin/test/zipkin_exporter_test.cc
index 8e58f83d2e9..acb0db54021 100644
--- a/deps/opentelemetry-cpp/exporters/zipkin/test/zipkin_exporter_test.cc
+++ b/deps/opentelemetry-cpp/exporters/zipkin/test/zipkin_exporter_test.cc
@@ -157,8 +157,10 @@ TEST_F(ZipkinExporterTestPeer, ExportJsonIntegrationTest)
   auto expected_url = nostd::string_view{"http://localhost:9411/api/v2/spans"};
 
   EXPECT_CALL(*mock_http_client, Post(expected_url, _, IsValidMessage(report_trace_id), _, _))
-
-      .Times(Exactly(1))
+      .Times(Between(1, 2))
+      .WillOnce(Return(ByMove(ext::http::client::Result{
+          std::unique_ptr<ext::http::client::Response>{new ext::http::client::curl::Response()},
+          ext::http::client::SessionState::Response})))
       .WillOnce(Return(ByMove(ext::http::client::Result{
           std::unique_ptr<ext::http::client::Response>{new ext::http::client::curl::Response()},
           ext::http::client::SessionState::Response})));
diff --git a/deps/opentelemetry-cpp/ext/BUILD b/deps/opentelemetry-cpp/ext/BUILD
index b19ae921e56..52ed22afb52 100644
--- a/deps/opentelemetry-cpp/ext/BUILD
+++ b/deps/opentelemetry-cpp/ext/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/ext/CMakeLists.txt b/deps/opentelemetry-cpp/ext/CMakeLists.txt
index 5110878565a..d50cf3a7598 100644
--- a/deps/opentelemetry-cpp/ext/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/ext/CMakeLists.txt
@@ -18,7 +18,7 @@ otel_add_component(
   FILES_DIRECTORY
   "include/opentelemetry/ext"
   FILES_DESTINATION
-  "include/opentelemetry/"
+  "include/opentelemetry"
   FILES_MATCHING
   PATTERN
   "*.h")
diff --git a/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/http_server.h b/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/http_server.h
index 0b302827527..16a5b9879d7 100644
--- a/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/http_server.h
+++ b/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/http_server.h
@@ -238,7 +238,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
   void stop() { m_reactor.stop(); }
 
 protected:
-  virtual void onSocketAcceptable(SocketTools::Socket socket) override
+  void onSocketAcceptable(SocketTools::Socket socket) override
   {
     LOG_TRACE("HttpServer: accepting socket fd=0x%llx", socket.m_sock);
     assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) !=
@@ -258,7 +258,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
     }
   }
 
-  virtual void onSocketReadable(SocketTools::Socket socket) override
+  void onSocketReadable(SocketTools::Socket socket) override
   {
     LOG_TRACE("HttpServer: reading socket fd=0x%llx", socket.m_sock);
     // No thread-safety here!
@@ -286,7 +286,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
     handleConnection(conn);
   }
 
-  virtual void onSocketWritable(SocketTools::Socket socket) override
+  void onSocketWritable(SocketTools::Socket socket) override
   {
     LOG_TRACE("HttpServer: writing socket fd=0x%llx", socket.m_sock);
 
@@ -308,7 +308,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
     }
   }
 
-  virtual void onSocketClosed(SocketTools::Socket socket) override
+  void onSocketClosed(SocketTools::Socket socket) override
   {
     LOG_TRACE("HttpServer: closing socket fd=0x%llx", socket.m_sock);
     assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) ==
diff --git a/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/socket_tools.h b/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/socket_tools.h
index 317d08e847b..e2cbcaff716 100644
--- a/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/socket_tools.h
+++ b/deps/opentelemetry-cpp/ext/include/opentelemetry/ext/http/server/socket_tools.h
@@ -16,7 +16,7 @@
 
 #ifdef _WIN32
 
-// #  include <Windows.h>
+// #  include <windows.h>
 
 #  include <winsock2.h>
 
@@ -700,7 +700,7 @@ struct Reactor : protected common::Thread
   /// <summary>
   /// Thread Loop for async events processing
   /// </summary>
-  virtual void onThread() override
+  void onThread() override
   {
     LOG_INFO("Reactor: Thread started");
     while (!shouldTerminate())
diff --git a/deps/opentelemetry-cpp/ext/src/http/client/curl/BUILD b/deps/opentelemetry-cpp/ext/src/http/client/curl/BUILD
index 51613ecf063..b5e222bdb5e 100644
--- a/deps/opentelemetry-cpp/ext/src/http/client/curl/BUILD
+++ b/deps/opentelemetry-cpp/ext/src/http/client/curl/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -20,6 +22,7 @@ cc_library(
         ],
         "//conditions:default": [],
     }),
+    linkstatic = True,
     deps = [
         "//api",
         "//ext:headers",
diff --git a/deps/opentelemetry-cpp/ext/src/http/client/curl/http_client_curl.cc b/deps/opentelemetry-cpp/ext/src/http/client/curl/http_client_curl.cc
index 77105398d37..7c5ddd19e83 100644
--- a/deps/opentelemetry-cpp/ext/src/http/client/curl/http_client_curl.cc
+++ b/deps/opentelemetry-cpp/ext/src/http/client/curl/http_client_curl.cc
@@ -782,8 +782,8 @@ bool HttpClient::doAbortSessions()
 
 bool HttpClient::doRemoveSessions()
 {
-  bool has_data = false;
-  bool should_continue;
+  bool has_data{false};
+  bool should_continue{false};
   do
   {
     std::unordered_map<uint64_t, HttpCurlEasyResource> pending_to_remove_session_handles;
diff --git a/deps/opentelemetry-cpp/ext/src/http/client/curl/http_operation_curl.cc b/deps/opentelemetry-cpp/ext/src/http/client/curl/http_operation_curl.cc
index 3fd27c96342..56a9519012e 100644
--- a/deps/opentelemetry-cpp/ext/src/http/client/curl/http_operation_curl.cc
+++ b/deps/opentelemetry-cpp/ext/src/http/client/curl/http_operation_curl.cc
@@ -575,7 +575,7 @@ static long parse_max_ssl_version(const std::string &version)
 
 const char *HttpOperation::GetCurlErrorMessage(CURLcode code)
 {
-  const char *message;
+  const char *message{nullptr};
 
   if (curl_error_message_[0] != '\0')
   {
@@ -593,8 +593,6 @@ const char *HttpOperation::GetCurlErrorMessage(CURLcode code)
 
 CURLcode HttpOperation::SetCurlPtrOption(CURLoption option, void *value)
 {
-  CURLcode rc;
-
   /*
     curl_easy_setopt() is a macro with variadic arguments, type unsafe.
     Various SetCurlXxxOption() helpers ensure it is called with a pointer,
@@ -603,7 +601,7 @@ CURLcode HttpOperation::SetCurlPtrOption(CURLoption option, void *value)
     - a blob (struct curl_blob*)
     - a headers chunk (curl_slist *)
   */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
+  const CURLcode rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
 
   if (rc != CURLE_OK)
   {
@@ -618,13 +616,11 @@ CURLcode HttpOperation::SetCurlPtrOption(CURLoption option, void *value)
 // NOLINTNEXTLINE(google-runtime-int)
 CURLcode HttpOperation::SetCurlLongOption(CURLoption option, long value)
 {
-  CURLcode rc;
-
   /*
     curl_easy_setopt() is a macro with variadic arguments, type unsafe.
     SetCurlLongOption() ensures it is called with a long.
   */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
+  const CURLcode rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
 
   if (rc != CURLE_OK)
   {
@@ -638,13 +634,11 @@ CURLcode HttpOperation::SetCurlLongOption(CURLoption option, long value)
 
 CURLcode HttpOperation::SetCurlOffOption(CURLoption option, curl_off_t value)
 {
-  CURLcode rc;
-
   /*
     curl_easy_setopt() is a macro with variadic arguments, type unsafe.
     SetCurlOffOption() ensures it is called with a curl_off_t.
   */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
+  const CURLcode rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
 
   if (rc != CURLE_OK)
   {
@@ -732,21 +726,20 @@ CURLcode HttpOperation::Setup()
     return CURLE_FAILED_INIT;
   }
 
-  CURLcode rc;
-
   curl_error_message_[0] = '\0';
   curl_easy_setopt(curl_resource_.easy_handle, CURLOPT_ERRORBUFFER, curl_error_message_);
 
 // Support for custom debug function callback was added in version 7.9.6 so we guard against
 // exposing the default CURL output by keeping verbosity always disabled in lower versions.
 #if LIBCURL_VERSION_NUM < CURL_VERSION_BITS(7, 9, 6)
-  rc = SetCurlLongOption(CURLOPT_VERBOSE, 0L);
+  CURLcode rc = SetCurlLongOption(CURLOPT_VERBOSE, 0L);
   if (rc != CURLE_OK)
   {
     return rc;
   }
 #else
-  rc = SetCurlLongOption(CURLOPT_VERBOSE, (is_log_enabled_ && kEnableCurlLogging) ? 1L : 0L);
+  CURLcode rc =
+      SetCurlLongOption(CURLOPT_VERBOSE, (is_log_enabled_ && kEnableCurlLogging) ? 1L : 0L);
   if (rc != CURLE_OK)
   {
     return rc;
diff --git a/deps/opentelemetry-cpp/ext/test/http/BUILD b/deps/opentelemetry-cpp/ext/test/http/BUILD
index d030ec2847d..c7d1dfde69d 100644
--- a/deps/opentelemetry-cpp/ext/test/http/BUILD
+++ b/deps/opentelemetry-cpp/ext/test/http/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "curl_http_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/ext/test/http/curl_http_test.cc b/deps/opentelemetry-cpp/ext/test/http/curl_http_test.cc
index fda96692870..9a4968e05f8 100644
--- a/deps/opentelemetry-cpp/ext/test/http/curl_http_test.cc
+++ b/deps/opentelemetry-cpp/ext/test/http/curl_http_test.cc
@@ -217,6 +217,9 @@ class BasicCurlHttpTests : public ::testing::Test, public HTTP_SERVER_NS::HttpRe
   }
 };
 
+class DISABLED_BasicCurlHttpTests : public BasicCurlHttpTests
+{};
+
 TEST_F(BasicCurlHttpTests, DoNothing) {}
 
 TEST_F(BasicCurlHttpTests, HttpRequest)
@@ -495,7 +498,8 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
             "http://127.0.0.1:31339/");
 }
 
-TEST_F(BasicCurlHttpTests, SendGetRequestAsync)
+// DISABLED, see https://github.com/open-telemetry/opentelemetry-cpp/issues/3535
+TEST_F(DISABLED_BasicCurlHttpTests, SendGetRequestAsync)
 {
   curl::HttpClient http_client;
 
@@ -528,6 +532,8 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsync)
       ASSERT_FALSE(sessions[i]->IsSessionActive());
 
       ASSERT_TRUE(handlers[i]->is_called_.load(std::memory_order_acquire));
+
+      // TODO: Spurious test failures here.
       ASSERT_TRUE(handlers[i]->got_response_.load(std::memory_order_acquire));
     }
 
diff --git a/deps/opentelemetry-cpp/ext/test/http/url_parser_test.cc b/deps/opentelemetry-cpp/ext/test/http/url_parser_test.cc
index 450bdd424cf..729891a85b5 100644
--- a/deps/opentelemetry-cpp/ext/test/http/url_parser_test.cc
+++ b/deps/opentelemetry-cpp/ext/test/http/url_parser_test.cc
@@ -15,10 +15,10 @@ struct ParsedUrl
 {
   std::string scheme;
   std::string host;
-  std::uint16_t port;
+  std::uint16_t port{};
   std::string path;
   std::string query;
-  bool success;
+  bool success{};
 
   friend void PrintTo(const ParsedUrl &p, std::ostream *os)
   {
diff --git a/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/BUILD b/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/BUILD
index 8c1c8c17e97..5c3b1971553 100644
--- a/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/BUILD
+++ b/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 cc_binary(
     name = "w3c_tracecontext_http_test_server",
     srcs = [
diff --git a/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/main.cc b/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/main.cc
index 1ee3a2d5116..57edb0860bd 100644
--- a/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/main.cc
+++ b/deps/opentelemetry-cpp/ext/test/w3c_tracecontext_http_test_server/main.cc
@@ -110,7 +110,7 @@ nostd::shared_ptr<trace_api::Tracer> get_tracer()
 struct Uri
 {
   std::string host;
-  uint16_t port;
+  uint16_t port{};
   std::string path;
 
   Uri(const std::string &uri)
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 
   constexpr char default_host[]   = "localhost";
   constexpr uint16_t default_port = 30000;
-  uint16_t port;
+  uint16_t port{default_port};
   std::atomic_bool stop_server(false);
 
   // The port the validation service listens to can be specified via the command line.
@@ -187,10 +187,6 @@ int main(int argc, char *argv[])
   {
     port = static_cast<uint16_t>(atoi(argv[1]));
   }
-  else
-  {
-    port = default_port;
-  }
 
   auto root_span = get_tracer()->StartSpan(__func__);
   trace_api::Scope scope(root_span);
diff --git a/deps/opentelemetry-cpp/sdk/BUILD b/deps/opentelemetry-cpp/sdk/BUILD
index b19ae921e56..52ed22afb52 100644
--- a/deps/opentelemetry-cpp/sdk/BUILD
+++ b/deps/opentelemetry-cpp/sdk/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/CMakeLists.txt
index 8e508cfca5b..c433c560c2f 100644
--- a/deps/opentelemetry-cpp/sdk/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/CMakeLists.txt
@@ -31,7 +31,25 @@ otel_add_component(
   "include/opentelemetry"
   FILES_MATCHING
   PATTERN
-  "*.h")
+  "*.h"
+  PATTERN
+  "sdk/configuration/*.h"
+  EXCLUDE)
+
+if(WITH_CONFIGURATION)
+  otel_add_component(
+    COMPONENT
+    configuration
+    TARGETS
+    opentelemetry_configuration
+    FILES_DIRECTORY
+    "include/opentelemetry/"
+    FILES_DESTINATION
+    "include/opentelemetry"
+    FILES_MATCHING
+    PATTERN
+    "sdk/configuration/*.h")
+endif()
 
 if(BUILD_TESTING)
   add_subdirectory(test)
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/common/attribute_utils.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/common/attribute_utils.h
index c2d0209a7db..a1ac74b239d 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/common/attribute_utils.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/common/attribute_utils.h
@@ -83,7 +83,7 @@ struct AttributeConverter
   {
     return OwnedAttributeValue(std::string(v));
   }
-  OwnedAttributeValue operator()(std::string v) { return OwnedAttributeValue(v); }
+  OwnedAttributeValue operator()(std::string v) { return OwnedAttributeValue(std::move(v)); }
   OwnedAttributeValue operator()(const char *v) { return OwnedAttributeValue(std::string(v)); }
   OwnedAttributeValue operator()(nostd::span<const uint8_t> v) { return convertSpan<uint8_t>(v); }
   OwnedAttributeValue operator()(nostd::span<const bool> v) { return convertSpan<bool>(v); }
@@ -100,8 +100,7 @@ struct AttributeConverter
   template <typename T, typename U = T>
   OwnedAttributeValue convertSpan(nostd::span<const U> vals)
   {
-    const std::vector<T> copy(vals.begin(), vals.end());
-    return OwnedAttributeValue(std::move(copy));
+    return OwnedAttributeValue(std::vector<T>(vals.begin(), vals.end()));
   }
 };
 
@@ -171,11 +170,7 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
   // Construct attribute map and populate with attributes
   AttributeMap(const opentelemetry::common::KeyValueIterable &attributes) : AttributeMap()
   {
-    attributes.ForEachKeyValue(
-        [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-          SetAttribute(key, value);
-          return true;
-        });
+    ConstructFrom(attributes);
   }
 
   // Construct attribute map and populate with optional attributes
@@ -183,11 +178,7 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
   {
     if (attributes != nullptr)
     {
-      attributes->ForEachKeyValue(
-          [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-            SetAttribute(key, value);
-            return true;
-          });
+      ConstructFrom(*attributes);
     }
   }
 
@@ -203,6 +194,15 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
     }
   }
 
+  void ConstructFrom(const opentelemetry::common::KeyValueIterable &attributes)
+  {
+    attributes.ForEachKeyValue(
+        [&](nostd::string_view key, const opentelemetry::common::AttributeValue &value) noexcept {
+          SetAttribute(key, value);
+          return true;
+        });
+  }
+
   // Returns a reference to this map
   const std::unordered_map<std::string, OwnedAttributeValue> &GetAttributes() const noexcept
   {
@@ -213,7 +213,7 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
   void SetAttribute(nostd::string_view key,
                     const opentelemetry::common::AttributeValue &value) noexcept
   {
-    (*this)[std::string(key)] = nostd::visit(converter_, value);
+    (*this)[std::string(key)] = nostd::visit(AttributeConverter(), value);
   }
 
   // Compare the attributes of this map with another KeyValueIterable
@@ -235,7 +235,7 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
             {
               // Order of arguments is important here. OwnedAttributeValue is first then
               // AttributeValue AttributeEqualToVisitor does not support the reverse order
-              return nostd::visit(equal_to_visitor_, kv.second, value);
+              return nostd::visit(AttributeEqualToVisitor(), kv.second, value);
             }
           }
           return false;
@@ -243,10 +243,6 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
 
     return is_equal;
   }
-
-private:
-  AttributeConverter converter_;
-  AttributeEqualToVisitor equal_to_visitor_;
 };
 
 /**
@@ -291,11 +287,8 @@ class OrderedAttributeMap : public std::map<std::string, OwnedAttributeValue>
   void SetAttribute(nostd::string_view key,
                     const opentelemetry::common::AttributeValue &value) noexcept
   {
-    (*this)[std::string(key)] = nostd::visit(converter_, value);
+    (*this)[std::string(key)] = nostd::visit(AttributeConverter(), value);
   }
-
-private:
-  AttributeConverter converter_;
 };
 
 }  // namespace common
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/cardinality_limits_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/cardinality_limits_configuration.h
new file mode 100644
index 00000000000..808663cf4c0
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/cardinality_limits_configuration.h
@@ -0,0 +1,34 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstddef>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/meter_provider.yaml
+// YAML-NODE: CardinalityLimits
+class CardinalityLimitsConfiguration
+{
+public:
+  std::size_t default_limit;
+  // For all limits, 0 means unset, use default_limit
+  std::size_t counter;
+  std::size_t gauge;
+  std::size_t histogram;
+  std::size_t observable_counter;
+  std::size_t observable_gauge;
+  std::size_t observable_up_down_counter;
+  std::size_t up_down_counter;
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration.h
index 7629c28bcf8..05dfffcb808 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration.h
@@ -7,11 +7,13 @@
 #include <string>
 
 #include "opentelemetry/sdk/configuration/attribute_limits_configuration.h"
+#include "opentelemetry/sdk/configuration/distribution_configuration.h"
 #include "opentelemetry/sdk/configuration/document.h"
 #include "opentelemetry/sdk/configuration/logger_provider_configuration.h"
 #include "opentelemetry/sdk/configuration/meter_provider_configuration.h"
 #include "opentelemetry/sdk/configuration/propagator_configuration.h"
 #include "opentelemetry/sdk/configuration/resource_configuration.h"
+#include "opentelemetry/sdk/configuration/severity_number.h"
 #include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
 #include "opentelemetry/version.h"
 
@@ -65,7 +67,7 @@ class Configuration
 
   std::string file_format;
   bool disabled{false};
-  std::string log_level;
+  enum SeverityNumber log_level = SeverityNumber::info;
 
   std::unique_ptr<AttributeLimitsConfiguration> attribute_limits;
   std::unique_ptr<LoggerProviderConfiguration> logger_provider;
@@ -74,6 +76,7 @@ class Configuration
   std::unique_ptr<TracerProviderConfiguration> tracer_provider;
   std::unique_ptr<ResourceConfiguration> resource;
   // Ignored: instrumentation
+  std::unique_ptr<DistributionConfiguration> distribution;
 
 private:
   std::unique_ptr<Document> doc_;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h
index cd4f6e3af58..dc5a3b77ef9 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h
@@ -5,8 +5,92 @@
 
 #include <memory>
 
+#include "opentelemetry/sdk/configuration/aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/always_off_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/always_on_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/attribute_limits_configuration.h"
+#include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/attributes_configuration.h"
+#include "opentelemetry/sdk/configuration/base2_exponential_bucket_histogram_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/batch_log_record_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/batch_span_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/boolean_array_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/boolean_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/cardinality_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
+#include "opentelemetry/sdk/configuration/console_log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/console_span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/default_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/distribution_configuration.h"
+#include "opentelemetry/sdk/configuration/document.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
+#include "opentelemetry/sdk/configuration/double_array_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/double_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/drop_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/exemplar_filter.h"
+#include "opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_log_record_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_metric_producer_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/extension_span_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
+#include "opentelemetry/sdk/configuration/instrument_type.h"
+#include "opentelemetry/sdk/configuration/integer_array_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/integer_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
+#include "opentelemetry/sdk/configuration/jaeger_remote_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/last_value_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/log_record_limits_configuration.h"
+#include "opentelemetry/sdk/configuration/log_record_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/logger_provider_configuration.h"
+#include "opentelemetry/sdk/configuration/meter_provider_configuration.h"
+#include "opentelemetry/sdk/configuration/metric_producer_configuration.h"
+#include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
+#include "opentelemetry/sdk/configuration/open_census_metric_producer_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_file_log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_file_push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_file_span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
+#include "opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/parent_based_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h"
+#include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/propagator_configuration.h"
+#include "opentelemetry/sdk/configuration/pull_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/pull_metric_reader_configuration.h"
+#include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/resource_configuration.h"
+#include "opentelemetry/sdk/configuration/sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/severity_number.h"
+#include "opentelemetry/sdk/configuration/simple_log_record_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/simple_span_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
+#include "opentelemetry/sdk/configuration/span_limits_configuration.h"
+#include "opentelemetry/sdk/configuration/span_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/string_array_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/string_array_configuration.h"
+#include "opentelemetry/sdk/configuration/string_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/sum_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/temporality_preference.h"
+#include "opentelemetry/sdk/configuration/trace_id_ratio_based_sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
+#include "opentelemetry/sdk/configuration/translation_strategy.h"
+#include "opentelemetry/sdk/configuration/view_configuration.h"
+#include "opentelemetry/sdk/configuration/view_selector_configuration.h"
+#include "opentelemetry/sdk/configuration/view_stream_configuration.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -18,7 +102,279 @@ namespace configuration
 class ConfigurationParser
 {
 public:
-  static std::unique_ptr<Configuration> Parse(std::unique_ptr<Document> doc);
+  OtlpHttpEncoding ParseOtlpHttpEncoding(const std::unique_ptr<DocumentNode> &node,
+                                         const std::string &name) const;
+
+  SeverityNumber ParseSeverityNumber(const std::unique_ptr<DocumentNode> &node,
+                                     const std::string &name) const;
+
+  std::unique_ptr<StringArrayConfiguration> ParseStringArrayConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<IncludeExcludeConfiguration> ParseIncludeExcludeConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<HeadersConfiguration> ParseHeadersConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<AttributeLimitsConfiguration> ParseAttributeLimitsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<HttpTlsConfiguration> ParseHttpTlsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<GrpcTlsConfiguration> ParseGrpcTlsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpHttpLogRecordExporterConfiguration>
+  ParseOtlpHttpLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpGrpcLogRecordExporterConfiguration>
+  ParseOtlpGrpcLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpFileLogRecordExporterConfiguration>
+  ParseOtlpFileLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ConsoleLogRecordExporterConfiguration> ParseConsoleLogRecordExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionLogRecordExporterConfiguration>
+  ParseExtensionLogRecordExporterConfiguration(const std::string &name,
+                                               std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<LogRecordExporterConfiguration> ParseLogRecordExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<BatchLogRecordProcessorConfiguration> ParseBatchLogRecordProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<SimpleLogRecordProcessorConfiguration> ParseSimpleLogRecordProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionLogRecordProcessorConfiguration>
+  ParseExtensionLogRecordProcessorConfiguration(const std::string &name,
+                                                std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<LogRecordProcessorConfiguration> ParseLogRecordProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<LogRecordLimitsConfiguration> ParseLogRecordLimitsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<LoggerProviderConfiguration> ParseLoggerProviderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  DefaultHistogramAggregation ParseDefaultHistogramAggregation(
+      const std::unique_ptr<DocumentNode> &node,
+      const std::string &name) const;
+
+  TemporalityPreference ParseTemporalityPreference(const std::unique_ptr<DocumentNode> &node,
+                                                   const std::string &name) const;
+
+  std::unique_ptr<OtlpHttpPushMetricExporterConfiguration>
+  ParseOtlpHttpPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpGrpcPushMetricExporterConfiguration>
+  ParseOtlpGrpcPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpFilePushMetricExporterConfiguration>
+  ParseOtlpFilePushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ConsolePushMetricExporterConfiguration>
+  ParseConsolePushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  TranslationStrategy ParseTranslationStrategy(const std::unique_ptr<DocumentNode> &node,
+                                               const std::string &name) const;
+
+  std::unique_ptr<PrometheusPullMetricExporterConfiguration>
+  ParsePrometheusPullMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionPushMetricExporterConfiguration>
+  ParsePushMetricExporterExtensionConfiguration(const std::string &name,
+                                                std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<ExtensionPullMetricExporterConfiguration>
+  ParsePullMetricExporterExtensionConfiguration(const std::string &name,
+                                                std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<PushMetricExporterConfiguration> ParsePushMetricExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<PullMetricExporterConfiguration> ParsePullMetricExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OpenCensusMetricProducerConfiguration> ParseOpenCensusMetricProducerConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionMetricProducerConfiguration> ParseExtensionMetricProducerConfiguration(
+      const std::string &name,
+      std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<MetricProducerConfiguration> ParseMetricProducerConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<CardinalityLimitsConfiguration> ParseCardinalityLimitsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<PeriodicMetricReaderConfiguration> ParsePeriodicMetricReaderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<PullMetricReaderConfiguration> ParsePullMetricReaderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<MetricReaderConfiguration> ParseMetricReaderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  InstrumentType ParseInstrumentType(const std::unique_ptr<DocumentNode> &node,
+                                     const std::string &name) const;
+
+  ExemplarFilter ParseExemplarFilter(const std::unique_ptr<DocumentNode> &node,
+                                     const std::string &name) const;
+
+  std::unique_ptr<ViewSelectorConfiguration> ParseViewSelectorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<DefaultAggregationConfiguration> ParseDefaultAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<DropAggregationConfiguration> ParseDropAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExplicitBucketHistogramAggregationConfiguration>
+  ParseExplicitBucketHistogramAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<Base2ExponentialBucketHistogramAggregationConfiguration>
+  ParseBase2ExponentialBucketHistogramAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<LastValueAggregationConfiguration> ParseLastValueAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<SumAggregationConfiguration> ParseSumAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<AggregationConfiguration> ParseAggregationConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ViewStreamConfiguration> ParseViewStreamConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ViewConfiguration> ParseViewConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<MeterProviderConfiguration> ParseMeterProviderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<PropagatorConfiguration> ParsePropagatorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<SpanLimitsConfiguration> ParseSpanLimitsConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<AlwaysOffSamplerConfiguration> ParseAlwaysOffSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<AlwaysOnSamplerConfiguration> ParseAlwaysOnSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<JaegerRemoteSamplerConfiguration> ParseJaegerRemoteSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<ParentBasedSamplerConfiguration> ParseParentBasedSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<TraceIdRatioBasedSamplerConfiguration> ParseTraceIdRatioBasedSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<ExtensionSamplerConfiguration> ParseSamplerExtensionConfiguration(
+      const std::string &name,
+      std::unique_ptr<DocumentNode> node,
+      size_t depth) const;
+
+  std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
+      const std::unique_ptr<DocumentNode> &node,
+      size_t depth) const;
+
+  std::unique_ptr<OtlpHttpSpanExporterConfiguration> ParseOtlpHttpSpanExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpGrpcSpanExporterConfiguration> ParseOtlpGrpcSpanExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<OtlpFileSpanExporterConfiguration> ParseOtlpFileSpanExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ConsoleSpanExporterConfiguration> ParseConsoleSpanExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionSpanExporterConfiguration> ParseExtensionSpanExporterConfiguration(
+      const std::string &name,
+      std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<SpanExporterConfiguration> ParseSpanExporterConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<BatchSpanProcessorConfiguration> ParseBatchSpanProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<SimpleSpanProcessorConfiguration> ParseSimpleSpanProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ExtensionSpanProcessorConfiguration> ParseExtensionSpanProcessorConfiguration(
+      const std::string &name,
+      std::unique_ptr<DocumentNode> node) const;
+
+  std::unique_ptr<SpanProcessorConfiguration> ParseSpanProcessorConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<TracerProviderConfiguration> ParseTracerProviderConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<StringAttributeValueConfiguration> ParseStringAttributeValueConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<IntegerAttributeValueConfiguration> ParseIntegerAttributeValueConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<DoubleAttributeValueConfiguration> ParseDoubleAttributeValueConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<BooleanAttributeValueConfiguration> ParseBooleanAttributeValueConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<StringArrayAttributeValueConfiguration>
+  ParseStringArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<IntegerArrayAttributeValueConfiguration>
+  ParseIntegerArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<DoubleArrayAttributeValueConfiguration>
+  ParseDoubleArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<BooleanArrayAttributeValueConfiguration>
+  ParseBooleanArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<AttributesConfiguration> ParseAttributesConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<ResourceConfiguration> ParseResourceConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<DistributionConfiguration> ParseDistributionConfiguration(
+      const std::unique_ptr<DocumentNode> &node) const;
+
+  std::unique_ptr<Configuration> Parse(std::unique_ptr<Document> doc);
+
+private:
+  std::string version_;
+  int version_major_;
+  int version_minor_;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configured_sdk.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configured_sdk.h
index c2205a8be31..64d2be0b0b4 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configured_sdk.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/configured_sdk.h
@@ -48,6 +48,7 @@ class ConfiguredSdk
    */
   void UnInstall();
 
+  opentelemetry::sdk::common::internal_log::LogLevel log_level;
   opentelemetry::sdk::resource::Resource resource;
   std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
   std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h
index e36e3a961fe..8755b31e9ab 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/console_push_metric_exporter_configuration.h
@@ -3,9 +3,11 @@
 
 #pragma once
 
+#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
+#include "opentelemetry/sdk/configuration/temporality_preference.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -14,8 +16,8 @@ namespace sdk
 namespace configuration
 {
 
-// YAML-SCHEMA: schema/common.json
-// YAML-NODE: Console
+// YAML-SCHEMA: schema/meter_provider.json
+// YAML-NODE: ConsoleMetricExporter
 class ConsolePushMetricExporterConfiguration : public PushMetricExporterConfiguration
 {
 public:
@@ -23,6 +25,10 @@ class ConsolePushMetricExporterConfiguration : public PushMetricExporterConfigur
   {
     visitor->VisitConsole(this);
   }
+
+  TemporalityPreference temporality_preference{TemporalityPreference::cumulative};
+  DefaultHistogramAggregation default_histogram_aggregation{
+      DefaultHistogramAggregation::explicit_bucket_histogram};
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_configuration.h
new file mode 100644
index 00000000000..a46582450f4
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_configuration.h
@@ -0,0 +1,27 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "opentelemetry/sdk/configuration/distribution_entry_configuration.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+class DistributionConfiguration
+{
+public:
+  std::vector<std::unique_ptr<DistributionEntryConfiguration>> entries;
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_entry_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_entry_configuration.h
new file mode 100644
index 00000000000..ee85aa39551
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/distribution_entry_configuration.h
@@ -0,0 +1,27 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "opentelemetry/sdk/configuration/document_node.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+class DistributionEntryConfiguration
+{
+public:
+  std::string name;
+  std::unique_ptr<DocumentNode> node;
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/document_node.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/document_node.h
index 1c3f4bef9fd..646a15de179 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/document_node.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/document_node.h
@@ -16,6 +16,7 @@ namespace configuration
 
 class DocumentNodeConstIterator;
 class PropertiesNodeConstIterator;
+class DocumentNodeLocation;
 
 class DocumentNode
 {
@@ -30,6 +31,8 @@ class DocumentNode
   DocumentNode &operator=(const DocumentNode &other) = default;
   virtual ~DocumentNode()                            = default;
 
+  virtual DocumentNodeLocation Location() const = 0;
+
   virtual std::string Key() const = 0;
 
   virtual bool AsBoolean() const        = 0;
@@ -172,6 +175,17 @@ class PropertiesNodeConstIterator
   std::unique_ptr<PropertiesNodeConstIteratorImpl> impl_;
 };
 
+class DocumentNodeLocation
+{
+public:
+  size_t offset;
+  size_t line;
+  size_t col;
+  std::string filename;
+
+  std::string ToString() const;
+};
+
 }  // namespace configuration
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/exemplar_filter.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/exemplar_filter.h
new file mode 100644
index 00000000000..09abafe1dcb
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/exemplar_filter.h
@@ -0,0 +1,27 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstdint>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/meter_provider.yaml
+// YAML-NODE: ExemplarFilter
+enum class ExemplarFilter : std::uint8_t
+{
+  always_on,
+  always_off,
+  trace_based
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/grpc_tls_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/grpc_tls_configuration.h
new file mode 100644
index 00000000000..9a10b8e6c8a
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/grpc_tls_configuration.h
@@ -0,0 +1,30 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/common.yaml
+// YAML-NODE: GrpcTls
+class GrpcTlsConfiguration
+{
+public:
+  std::string ca_file;
+  std::string key_file;
+  std::string cert_file;
+  bool insecure{false};
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/http_tls_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/http_tls_configuration.h
new file mode 100644
index 00000000000..7414137db40
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/http_tls_configuration.h
@@ -0,0 +1,29 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/common.yaml
+// YAML-NODE: HttpTls
+class HttpTlsConfiguration
+{
+public:
+  std::string ca_file;
+  std::string key_file;
+  std::string cert_file;
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h
index 4fa558157d6..0b72fd7afcb 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <cstddef>
-
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
 #include "opentelemetry/version.h"
@@ -25,7 +23,7 @@ class IntegerAttributeValueConfiguration : public AttributeValueConfiguration
     visitor->VisitInteger(this);
   }
 
-  std::size_t value;
+  long long value;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/invalid_schema_exception.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/invalid_schema_exception.h
index c6abe648b30..c4fe726af52 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/invalid_schema_exception.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/invalid_schema_exception.h
@@ -19,7 +19,14 @@ namespace configuration
 class InvalidSchemaException : public std::runtime_error
 {
 public:
-  InvalidSchemaException(const std::string &msg) : std::runtime_error(msg) {}
+  InvalidSchemaException(const DocumentNodeLocation &location, const std::string &msg)
+      : std::runtime_error(msg), location_(location)
+  {}
+
+  std::string Where() const { return location_.ToString(); }
+
+private:
+  DocumentNodeLocation location_;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h
index 6f57de41500..3ade70f7fc5 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "opentelemetry/sdk/configuration/exemplar_filter.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
 #include "opentelemetry/sdk/configuration/view_configuration.h"
 #include "opentelemetry/version.h"
@@ -16,14 +17,14 @@ namespace sdk
 namespace configuration
 {
 
-// YAML-SCHEMA: schema/meter_provider.json
+// YAML-SCHEMA: schema/meter_provider.yaml
 // YAML-NODE: MeterProvider
 class MeterProviderConfiguration
 {
 public:
   std::vector<std::unique_ptr<MetricReaderConfiguration>> readers;
   std::vector<std::unique_ptr<ViewConfiguration>> views;
-  // FIXME: exemplar_filter
+  ExemplarFilter exemplar_filter = ExemplarFilter::trace_based;
   // FIXME: meter_configurator
 };
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h
index c8078cbcaf1..1d0f4a40d58 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration_visitor.h"
@@ -28,14 +29,11 @@ class OtlpGrpcLogRecordExporterConfiguration : public LogRecordExporterConfigura
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<GrpcTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
   std::size_t timeout{0};
-  bool insecure{false};
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h
index f0264d323f9..fe63a5e5b92 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
@@ -30,14 +31,11 @@ class OtlpGrpcPushMetricExporterConfiguration : public PushMetricExporterConfigu
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<GrpcTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
   std::size_t timeout{0};
-  bool insecure{false};
   TemporalityPreference temporality_preference{TemporalityPreference::cumulative};
   DefaultHistogramAggregation default_histogram_aggregation{
       DefaultHistogramAggregation::explicit_bucket_histogram};
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h
index efbf6011b21..2c2d1169073 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h"
@@ -28,14 +29,11 @@ class OtlpGrpcSpanExporterConfiguration : public SpanExporterConfiguration
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<GrpcTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
   std::size_t timeout{0};
-  bool insecure{false};
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h
index 87d83f56c06..7a27dfc77dc 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration_visitor.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
@@ -29,9 +30,7 @@ class OtlpHttpLogRecordExporterConfiguration : public LogRecordExporterConfigura
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<HttpTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h
index eb8aac1ca1d..4c71d45b46c 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h
@@ -8,6 +8,7 @@
 
 #include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
@@ -31,9 +32,7 @@ class OtlpHttpPushMetricExporterConfiguration : public PushMetricExporterConfigu
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<HttpTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h
index 76e0474fd33..39353fa371e 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h"
@@ -29,9 +30,7 @@ class OtlpHttpSpanExporterConfiguration : public SpanExporterConfiguration
   }
 
   std::string endpoint;
-  std::string certificate_file;
-  std::string client_key_file;
-  std::string client_certificate_file;
+  std::unique_ptr<HttpTlsConfiguration> tls;
   std::unique_ptr<HeadersConfiguration> headers;
   std::string headers_list;
   std::string compression;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h
index ac38cb6206b..21264ee88a7 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "opentelemetry/sdk/configuration/cardinality_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_producer_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration_visitor.h"
@@ -18,7 +19,7 @@ namespace sdk
 namespace configuration
 {
 
-// YAML-SCHEMA: schema/meter_provider.json
+// YAML-SCHEMA: schema/meter_provider.yaml
 // YAML-NODE: PeriodicMetricReader
 class PeriodicMetricReaderConfiguration : public MetricReaderConfiguration
 {
@@ -32,6 +33,7 @@ class PeriodicMetricReaderConfiguration : public MetricReaderConfiguration
   std::size_t timeout{0};
   std::unique_ptr<PushMetricExporterConfiguration> exporter;
   std::vector<std::unique_ptr<MetricProducerConfiguration>> producers;
+  std::unique_ptr<CardinalityLimitsConfiguration> cardinality_limits;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h
index 99b4fbcc857..c3aa03fe650 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h
@@ -6,8 +6,10 @@
 #include <string>
 
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
 #include "opentelemetry/sdk/configuration/pull_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/pull_metric_exporter_configuration_visitor.h"
+#include "opentelemetry/sdk/configuration/translation_strategy.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -28,10 +30,10 @@ class PrometheusPullMetricExporterConfiguration : public PullMetricExporterConfi
 
   std::string host;
   std::size_t port{0};
-  bool without_units{false};
-  bool without_type_suffix{false};
   bool without_scope_info{false};
-  // FIXME: with_resource_constant_labels;
+  bool without_target_info{false};
+  std::unique_ptr<IncludeExcludeConfiguration> with_resource_constant_labels;
+  TranslationStrategy translation_strategy;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h
index de317689ce2..4e6fd20fafd 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/pull_metric_reader_configuration.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "opentelemetry/sdk/configuration/cardinality_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_producer_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration_visitor.h"
@@ -18,7 +19,7 @@ namespace sdk
 namespace configuration
 {
 
-// YAML-SCHEMA: schema/meter_provider.json
+// YAML-SCHEMA: schema/meter_provider.yaml
 // YAML-NODE: PullMetricReader
 class PullMetricReaderConfiguration : public MetricReaderConfiguration
 {
@@ -30,7 +31,7 @@ class PullMetricReaderConfiguration : public MetricReaderConfiguration
 
   std::unique_ptr<PullMetricExporterConfiguration> exporter;
   std::vector<std::unique_ptr<MetricProducerConfiguration>> producers;
-  // FIXME: cardinality_limits
+  std::unique_ptr<CardinalityLimitsConfiguration> cardinality_limits;
 };
 
 }  // namespace configuration
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/registry.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/registry.h
index 81d38d2ef65..955c218b0dd 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/registry.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/registry.h
@@ -27,7 +27,6 @@
 #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/text_map_propagator_builder.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -89,16 +88,6 @@ class Registry
     console_span_builder_ = std::move(builder);
   }
 
-  const ZipkinSpanExporterBuilder *GetZipkinSpanBuilder() const
-  {
-    return zipkin_span_builder_.get();
-  }
-
-  void SetZipkinSpanBuilder(std::unique_ptr<ZipkinSpanExporterBuilder> &&builder)
-  {
-    zipkin_span_builder_ = std::move(builder);
-  }
-
   const OtlpHttpPushMetricExporterBuilder *GetOtlpHttpPushMetricExporterBuilder() const
   {
     return otlp_http_push_metric_builder_.get();
@@ -251,7 +240,6 @@ class Registry
   std::unique_ptr<OtlpGrpcSpanExporterBuilder> otlp_grpc_span_builder_;
   std::unique_ptr<OtlpFileSpanExporterBuilder> otlp_file_span_builder_;
   std::unique_ptr<ConsoleSpanExporterBuilder> console_span_builder_;
-  std::unique_ptr<ZipkinSpanExporterBuilder> zipkin_span_builder_;
 
   std::unique_ptr<OtlpHttpPushMetricExporterBuilder> otlp_http_push_metric_builder_;
   std::unique_ptr<OtlpGrpcPushMetricExporterBuilder> otlp_grpc_push_metric_builder_;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document.h
index 8fa8ca13d0a..9d464e63be1 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document.h
@@ -22,16 +22,23 @@ class RymlDocument : public Document
 public:
   static std::unique_ptr<Document> Parse(const std::string &source, const std::string &content);
 
-  RymlDocument(ryml::Tree tree) : tree_(std::move(tree)) {}
+  RymlDocument() {}
   RymlDocument(RymlDocument &&)                      = delete;
   RymlDocument(const RymlDocument &)                 = delete;
   RymlDocument &operator=(RymlDocument &&)           = delete;
   RymlDocument &operator=(const RymlDocument &other) = delete;
   ~RymlDocument() override                           = default;
 
+  int ParseDocument(const std::string &source, const std::string &content);
+
   std::unique_ptr<DocumentNode> GetRootNode() override;
 
+  DocumentNodeLocation Location(ryml::ConstNodeRef node) const;
+
 private:
+  ryml::ParserOptions opts_;
+  ryml::Parser::handler_type event_handler_;
+  std::unique_ptr<ryml::Parser> parser_;
   ryml::Tree tree_;
 };
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h
index d524f57a214..82cdb8e6832 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h
@@ -17,16 +17,22 @@ namespace sdk
 namespace configuration
 {
 
+class RymlDocument;
+
 class RymlDocumentNode : public DocumentNode
 {
 public:
-  RymlDocumentNode(ryml::ConstNodeRef node, std::size_t depth) : node_(node), depth_(depth) {}
+  RymlDocumentNode(const RymlDocument *doc, ryml::ConstNodeRef node, std::size_t depth)
+      : doc_(doc), node_(node), depth_(depth)
+  {}
   RymlDocumentNode(RymlDocumentNode &&)                      = delete;
   RymlDocumentNode(const RymlDocumentNode &)                 = delete;
   RymlDocumentNode &operator=(RymlDocumentNode &&)           = delete;
   RymlDocumentNode &operator=(const RymlDocumentNode &other) = delete;
   ~RymlDocumentNode() override                               = default;
 
+  DocumentNodeLocation Location() const override;
+
   std::string Key() const override;
 
   bool AsBoolean() const override;
@@ -62,6 +68,7 @@ class RymlDocumentNode : public DocumentNode
   ryml::ConstNodeRef GetRequiredRymlChildNode(const std::string &name) const;
   ryml::ConstNodeRef GetRymlChildNode(const std::string &name) const;
 
+  const RymlDocument *doc_;
   ryml::ConstNodeRef node_;
   std::size_t depth_;
 };
@@ -69,7 +76,8 @@ class RymlDocumentNode : public DocumentNode
 class RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
 {
 public:
-  RymlDocumentNodeConstIteratorImpl(ryml::ConstNodeRef parent,
+  RymlDocumentNodeConstIteratorImpl(const RymlDocument *doc,
+                                    ryml::ConstNodeRef parent,
                                     std::size_t index,
                                     std::size_t depth);
   RymlDocumentNodeConstIteratorImpl(RymlDocumentNodeConstIteratorImpl &&)            = delete;
@@ -84,6 +92,7 @@ class RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
   bool Equal(const DocumentNodeConstIteratorImpl *rhs) const override;
 
 private:
+  const RymlDocument *doc_;
   ryml::ConstNodeRef parent_;
   std::size_t index_;
   std::size_t depth_;
@@ -92,7 +101,8 @@ class RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
 class RymlPropertiesNodeConstIteratorImpl : public PropertiesNodeConstIteratorImpl
 {
 public:
-  RymlPropertiesNodeConstIteratorImpl(ryml::ConstNodeRef parent,
+  RymlPropertiesNodeConstIteratorImpl(const RymlDocument *doc,
+                                      ryml::ConstNodeRef parent,
                                       std::size_t index,
                                       std::size_t depth);
   RymlPropertiesNodeConstIteratorImpl(RymlPropertiesNodeConstIteratorImpl &&)            = delete;
@@ -108,6 +118,7 @@ class RymlPropertiesNodeConstIteratorImpl : public PropertiesNodeConstIteratorIm
   bool Equal(const PropertiesNodeConstIteratorImpl *rhs) const override;
 
 private:
+  const RymlDocument *doc_;
   ryml::ConstNodeRef parent_;
   std::size_t index_;
   std::size_t depth_;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h
index 9f31ba68e01..5ff817f8f46 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/sdk_builder.h
@@ -44,7 +44,6 @@
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/string_array_attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/string_attribute_value_configuration.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 #include "opentelemetry/sdk/logs/logger_provider.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
@@ -106,9 +105,6 @@ class SdkBuilder
   std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateConsoleSpanExporter(
       const opentelemetry::sdk::configuration::ConsoleSpanExporterConfiguration *model) const;
 
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateZipkinSpanExporter(
-      const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const;
-
   std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CreateExtensionSpanExporter(
       const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) const;
 
@@ -259,6 +255,9 @@ class SdkBuilder
                    const std::unique_ptr<opentelemetry::sdk::configuration::ResourceConfiguration>
                        &opt_model) const;
 
+  void SetLogLevel(opentelemetry::sdk::common::internal_log::LogLevel &sdk_log_level,
+                   opentelemetry::sdk::configuration::SeverityNumber model_log_level) const;
+
   std::unique_ptr<ConfiguredSdk> CreateConfiguredSdk(
       const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model) const;
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/severity_number.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/severity_number.h
new file mode 100644
index 00000000000..9cc09ecf2df
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/severity_number.h
@@ -0,0 +1,48 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstdint>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/common.yaml
+// YAML-NODE: SeverityNumber
+enum class SeverityNumber : std::uint8_t
+{
+  trace,
+  trace2,
+  trace3,
+  trace4,
+  debug,
+  debug2,
+  debug3,
+  debug4,
+  info,
+  info2,
+  info3,
+  info4,
+  warn,
+  warn2,
+  warn3,
+  warn4,
+  error,
+  error2,
+  error3,
+  error4,
+  fatal,
+  fatal2,
+  fatal3,
+  fatal4
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h
index 685584220a6..751274ee84d 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h
@@ -15,7 +15,6 @@ class OtlpHttpSpanExporterConfiguration;
 class OtlpGrpcSpanExporterConfiguration;
 class OtlpFileSpanExporterConfiguration;
 class ConsoleSpanExporterConfiguration;
-class ZipkinSpanExporterConfiguration;
 class ExtensionSpanExporterConfiguration;
 
 class SpanExporterConfigurationVisitor
@@ -33,7 +32,6 @@ class SpanExporterConfigurationVisitor
   virtual void VisitOtlpGrpc(const OtlpGrpcSpanExporterConfiguration *model)   = 0;
   virtual void VisitOtlpFile(const OtlpFileSpanExporterConfiguration *model)   = 0;
   virtual void VisitConsole(const ConsoleSpanExporterConfiguration *model)     = 0;
-  virtual void VisitZipkin(const ZipkinSpanExporterConfiguration *model)       = 0;
   virtual void VisitExtension(const ExtensionSpanExporterConfiguration *model) = 0;
 };
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/translation_strategy.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/translation_strategy.h
new file mode 100644
index 00000000000..e6f1244b919
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/translation_strategy.h
@@ -0,0 +1,28 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstdint>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/meter_provider.json
+// YAML-NODE: ExperimentalPrometheusMetricExporter
+enum class TranslationStrategy : std::uint8_t
+{
+  UnderscoreEscapingWithSuffixes,
+  UnderscoreEscapingWithoutSuffixes,
+  NoUTF8EscapingWithSuffixes,
+  NoTranslation
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h
deleted file mode 100644
index 2b140e4c485..00000000000
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace configuration
-{
-
-class ZipkinSpanExporterBuilder
-{
-public:
-  ZipkinSpanExporterBuilder()                                                  = default;
-  ZipkinSpanExporterBuilder(ZipkinSpanExporterBuilder &&)                      = default;
-  ZipkinSpanExporterBuilder(const ZipkinSpanExporterBuilder &)                 = default;
-  ZipkinSpanExporterBuilder &operator=(ZipkinSpanExporterBuilder &&)           = default;
-  ZipkinSpanExporterBuilder &operator=(const ZipkinSpanExporterBuilder &other) = default;
-  virtual ~ZipkinSpanExporterBuilder()                                         = default;
-
-  virtual std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(
-      const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const = 0;
-};
-
-}  // namespace configuration
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h
deleted file mode 100644
index fc64f30841f..00000000000
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
-#include "opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace configuration
-{
-
-// YAML-SCHEMA: schema/tracer_provider.json
-// YAML-NODE: Zipkin
-class ZipkinSpanExporterConfiguration : public SpanExporterConfiguration
-{
-public:
-  void Accept(SpanExporterConfigurationVisitor *visitor) const override
-  {
-    visitor->VisitZipkin(this);
-  }
-
-  std::string endpoint;
-  std::size_t timeout{0};
-};
-
-}  // namespace configuration
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
index 84e03bcf37f..8533527ff57 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
@@ -15,25 +15,71 @@ namespace sdk
 namespace logs
 {
 
+namespace batch_log_record_processor_options_env
+{
+
+/// @brief Returns the max queue size from the OTEL_BLRP_MAX_QUEUE_SIZE environment variable
+/// or the default value (2048) if not set.
+OPENTELEMETRY_EXPORT size_t GetMaxQueueSizeFromEnv();
+
+/// @brief Returns the schedule delay from the OTEL_BLRP_SCHEDULE_DELAY environment variable
+/// or the default value (1000ms) if not set.
+OPENTELEMETRY_EXPORT std::chrono::milliseconds GetScheduleDelayFromEnv();
+
+/// @brief Returns the export timeout from the OTEL_BLRP_EXPORT_TIMEOUT environment variable
+/// or the default value (30000ms) if not set.
+OPENTELEMETRY_EXPORT std::chrono::milliseconds GetExportTimeoutFromEnv();
+
+/// @brief Returns the max export batch size from the OTEL_BLRP_MAX_EXPORT_BATCH_SIZE environment
+/// variable or the default value (512) if not set.
+OPENTELEMETRY_EXPORT size_t GetMaxExportBatchSizeFromEnv();
+
+}  // namespace batch_log_record_processor_options_env
+
 /**
  * Struct to hold batch LogRecordProcessor options.
+ *
+ * This is an aggregate type that supports C++20 designated initializers.
+ * Default values are read from environment variables when an instance is created:
+ * - OTEL_BLRP_MAX_QUEUE_SIZE (default: 2048)
+ * - OTEL_BLRP_SCHEDULE_DELAY (default: 1000ms)
+ * - OTEL_BLRP_EXPORT_TIMEOUT (default: 30000ms)
+ * - OTEL_BLRP_MAX_EXPORT_BATCH_SIZE (default: 512)
+ *
+ * Usage notes:
+ * - If you use default initialization (e.g., `BatchLogRecordProcessorOptions opts{}`), all fields
+ *   are set by reading the environment variables (or hardcoded defaults if unset).
+ * - If you use aggregate initialization with explicit values (positional or designated),
+ *   those values override the environment variable defaults for the specified fields.
+ * - With C++20 designated initializers, you can override only specific fields; unspecified
+ *   fields will use environment variables or hardcoded defaults.
  */
-struct BatchLogRecordProcessorOptions
+struct OPENTELEMETRY_EXPORT BatchLogRecordProcessorOptions
 {
   /**
-   * The maximum buffer/queue size. After the size is reached, spans are
+   * The maximum buffer/queue size. After the size is reached, log records are
    * dropped.
    */
-  size_t max_queue_size = 2048;
+  size_t max_queue_size = batch_log_record_processor_options_env::GetMaxQueueSizeFromEnv();
 
   /* The time interval between two consecutive exports. */
-  std::chrono::milliseconds schedule_delay_millis = std::chrono::milliseconds(5000);
+  std::chrono::milliseconds schedule_delay_millis =
+      batch_log_record_processor_options_env::GetScheduleDelayFromEnv();
+
+  /**
+   * The maximum time allowed to export data.
+   * It is not currently used by the SDK and the parameter is ignored.
+   * TODO: Implement the parameter in BatchLogRecordProcessor
+   */
+  std::chrono::milliseconds export_timeout_millis =
+      batch_log_record_processor_options_env::GetExportTimeoutFromEnv();
 
   /**
    * The maximum batch size of every export. It must be smaller or
    * equal to max_queue_size.
    */
-  size_t max_export_batch_size = 512;
+  size_t max_export_batch_size =
+      batch_log_record_processor_options_env::GetMaxExportBatchSizeFromEnv();
 };
 
 }  // namespace logs
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h
index 2effa4933cc..088a115f9e5 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h
@@ -5,6 +5,7 @@
 
 #include <vector>
 
+#include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
 #include "opentelemetry/version.h"
 
@@ -13,6 +14,7 @@ namespace sdk
 {
 namespace metrics
 {
+
 class AggregationConfig
 {
 public:
@@ -20,6 +22,8 @@ class AggregationConfig
       : cardinality_limit_(cardinality_limit)
   {}
 
+  virtual AggregationType GetType() const noexcept { return AggregationType::kDefault; }
+
   static const AggregationConfig *GetOrDefault(const AggregationConfig *config)
   {
     if (config)
@@ -37,6 +41,12 @@ class AggregationConfig
 class HistogramAggregationConfig : public AggregationConfig
 {
 public:
+  HistogramAggregationConfig(size_t cardinality_limit = kAggregationCardinalityLimit)
+      : AggregationConfig(cardinality_limit)
+  {}
+
+  AggregationType GetType() const noexcept override { return AggregationType::kHistogram; }
+
   std::vector<double> boundaries_;
   bool record_min_max_ = true;
 };
@@ -44,6 +54,16 @@ class HistogramAggregationConfig : public AggregationConfig
 class Base2ExponentialHistogramAggregationConfig : public AggregationConfig
 {
 public:
+  Base2ExponentialHistogramAggregationConfig(
+      size_t cardinality_limit = kAggregationCardinalityLimit)
+      : AggregationConfig(cardinality_limit)
+  {}
+
+  AggregationType GetType() const noexcept override
+  {
+    return AggregationType::kBase2ExponentialHistogram;
+  }
+
   size_t max_buckets_  = 160;
   int32_t max_scale_   = 20;
   bool record_min_max_ = true;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
index abc4070010b..70f6f8ee74f 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
@@ -192,8 +192,6 @@ class DefaultAggregation
       case InstrumentType::kGauge:
       case InstrumentType::kObservableGauge:
         return AggregationType::kLastValue;
-      case InstrumentType::kSummary:
-        return AggregationType::kSummary;
       default:
         return AggregationType::kDrop;
     }
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
index 6650ced1aee..30fa04e47fd 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
@@ -22,8 +22,7 @@ using PointType       = opentelemetry::nostd::variant<SumPointData,
                                                       HistogramPointData,
                                                       Base2ExponentialHistogramPointData,
                                                       LastValuePointData,
-                                                      DropPointData,
-                                                      SummaryPointData>;
+                                                      DropPointData>;
 
 struct PointDataAttributes
 {
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
index fa10997ef6a..a88bf25a764 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
@@ -167,20 +167,6 @@ class DropPointData
   DropPointData &operator=(DropPointData &&) = default;
 };
 
-class SummaryPointData
-{
-public:
-// TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
-  SummaryPointData(SummaryPointData &&)            = default;
-  SummaryPointData(const SummaryPointData &)       = default;
-  SummaryPointData &operator=(SummaryPointData &&) = default;
-  SummaryPointData()                               = default;
-
-  uint64_t count_                 = {};
-  ValueType sum_                  = {};
-  std::unordered_map<double, ValueType> quantile_values_ = {};
-};
-
 }  // namespace metrics
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
index bb8db1ac095..93c183f83f2 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
@@ -62,7 +62,6 @@ class PeriodicExportingMetricReader : public MetricReader
 
   /* The background worker thread */
   std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
-  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation_;
   std::thread worker_thread_;
 };
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h
index f816fc05a03..79e6f2754ce 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h
@@ -21,8 +21,6 @@ struct PeriodicExportingMetricReaderRuntimeOptions
 {
   std::shared_ptr<sdk::common::ThreadInstrumentation> periodic_thread_instrumentation =
       std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
 };
 
 }  // namespace metrics
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
index 86225918b66..620fddedb50 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
@@ -24,8 +24,7 @@ enum class InstrumentType
   kObservableCounter,
   kObservableGauge,
   kObservableUpDownCounter,
-  kGauge,
-  kSummary
+  kGauge
 };
 
 enum class InstrumentClass
@@ -49,8 +48,7 @@ enum class AggregationType
   kLastValue,
   kSum,
   kDefault,
-  kBase2ExponentialHistogram,
-  kSummary
+  kBase2ExponentialHistogram
 };
 
 enum class AggregationTemporality
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/meter.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/meter.h
index 9e2107fcd17..2fdc6c121ce 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/meter.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/meter.h
@@ -131,6 +131,14 @@ class Meter final : public opentelemetry::metrics::Meter
   std::vector<MetricData> Collect(CollectorHandle *collector,
                                   opentelemetry::common::SystemTimestamp collect_ts) noexcept;
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  uintptr_t RegisterCallback(
+      opentelemetry::metrics::MultiObservableCallbackPtr callback,
+      void *state,
+      nostd::span<opentelemetry::metrics::ObservableInstrument *> instruments) noexcept override;
+
+  void DeregisterCallback(uintptr_t callback_id) noexcept override;
+#endif
 private:
   // order of declaration is important here - instrumentation scope should destroy after
   // meter-context.
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/multi_observer_result.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/multi_observer_result.h
new file mode 100644
index 00000000000..11ee2e30906
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/multi_observer_result.h
@@ -0,0 +1,52 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <unordered_map>
+
+#include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/multi_observer_result.h"
+#include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/metrics/observer_result.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace metrics
+{
+class OPENTELEMETRY_EXPORT MultiObserverResult final
+    : public opentelemetry::metrics::MultiObserverResult
+{
+public:
+  void RegisterInstrument(opentelemetry::metrics::ObservableInstrument *instrument);
+  void DeregisterInstrument(opentelemetry::metrics::ObservableInstrument *instrument);
+  size_t InstrumentCount() const;
+  bool HasInstrument(const opentelemetry::metrics::ObservableInstrument *instrument) const;
+  void GetInstruments(
+      nostd::function_ref<void(opentelemetry::metrics::ObservableInstrument *)> callback);
+  void Reset();
+  void StoreResults(opentelemetry::common::SystemTimestamp collection_ts);
+
+protected:
+  opentelemetry::metrics::ObserverResultT<double> &ForInstrumentDouble(
+      const opentelemetry::metrics::ObservableInstrument *instrument) override;
+  opentelemetry::metrics::ObserverResultT<int64_t> &ForInstrumentInt64(
+      const opentelemetry::metrics::ObservableInstrument *instrument) override;
+
+private:
+  // This is _different_ to opentelemetry::metrics::ObserverResult because this variant is
+  // a variant directly of ObserverResultT, not of _pointers_ to ObserverResultT.
+  // This allows us to avoid an unnescessary layer of inderection and a bunch of allocations.
+  using ObserverResultDirect =
+      nostd::variant<nostd::monostate, ObserverResultT<double>, ObserverResultT<int64_t>>;
+  std::unordered_map<opentelemetry::metrics::ObservableInstrument *, ObserverResultDirect>
+      observer_results_;
+};
+}  // namespace metrics
+}  // namespace sdk
+
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h
index 2dd82a99918..110aa20f9f8 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h
@@ -188,7 +188,7 @@ class AttributesHashMapWithCustomHash
   /**
    * Iterate the hash to yield key and value stored in hash.
    */
-  bool GetAllEnteries(
+  bool GetAllEntries(
       nostd::function_ref<bool(const MetricAttributes &, Aggregation &)> callback) const
   {
     for (auto &kv : hash_map_)
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
index 2a77b2f8561..2424daa153d 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
@@ -30,8 +30,7 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage
     storages_.push_back(storage);
   }
 
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::context::Context &context) noexcept override
+  void RecordLong(int64_t value, const opentelemetry::context::Context &context) noexcept override
   {
     for (auto &s : storages_)
     {
@@ -39,9 +38,9 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage
     }
   }
 
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::common::KeyValueIterable &attributes,
-                          const opentelemetry::context::Context &context) noexcept override
+  void RecordLong(int64_t value,
+                  const opentelemetry::common::KeyValueIterable &attributes,
+                  const opentelemetry::context::Context &context) noexcept override
   {
     for (auto &s : storages_)
     {
@@ -49,8 +48,7 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage
     }
   }
 
-  virtual void RecordDouble(double value,
-                            const opentelemetry::context::Context &context) noexcept override
+  void RecordDouble(double value, const opentelemetry::context::Context &context) noexcept override
   {
     for (auto &s : storages_)
     {
@@ -58,9 +56,9 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage
     }
   }
 
-  virtual void RecordDouble(double value,
-                            const opentelemetry::common::KeyValueIterable &attributes,
-                            const opentelemetry::context::Context &context) noexcept override
+  void RecordDouble(double value,
+                    const opentelemetry::common::KeyValueIterable &attributes,
+                    const opentelemetry::context::Context &context) noexcept override
   {
     for (auto &s : storages_)
     {
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h
index b584cc055f7..d06801a0070 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h
@@ -3,34 +3,52 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <vector>
 
 #include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/meter.h"
+#include "opentelemetry/sdk/metrics/multi_observer_result.h"
 #include "opentelemetry/version.h"
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+#  include <unordered_map>
+#  include "opentelemetry/nostd/span.h"
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
 namespace metrics
 {
 
-struct ObservableCallbackRecord
-{
-  opentelemetry::metrics::ObservableCallbackPtr callback;
-  void *state;
-  opentelemetry::metrics::ObservableInstrument *instrument;
-};
+struct ObservableCallbackRecord;
 
 class ObservableRegistry
 {
 public:
+  // Constructor & destructor need to be defined in the observable_registry.cc TU, rather
+  // than implicitly defaulted here, so that we can have a unique_ptr to an incomplete
+  // class as a member.
+  ObservableRegistry();
+  ~ObservableRegistry();
+
+  // Add a callback of the single-instrument form
   void AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
                    void *state,
                    opentelemetry::metrics::ObservableInstrument *instrument);
-
+  // Add a callback with the multi-instrument signature
+  uintptr_t AddCallback(opentelemetry::metrics::MultiObservableCallbackPtr callback,
+                        void *state,
+                        nostd::span<opentelemetry::metrics::ObservableInstrument *> instruments);
+  // Callbacks added with Meter::RegisterCallback have can be removed by passing back the handle
+  // returned
+  void RemoveCallback(uintptr_t id);
+  // Callbacks added with ObservableInstrument::AddCallback can be removed by passing back the
+  // original (callback function, state, instrument).
   void RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
                       void *state,
                       opentelemetry::metrics::ObservableInstrument *instrument);
@@ -40,7 +58,7 @@ class ObservableRegistry
   void Observe(opentelemetry::common::SystemTimestamp collection_ts);
 
 private:
-  std::vector<std::unique_ptr<ObservableCallbackRecord>> callbacks_;
+  std::unordered_map<uintptr_t, std::unique_ptr<ObservableCallbackRecord>> callbacks_;
   std::mutex callbacks_m_;
 };
 
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
index fd1e4bee0c2..be93450dc1c 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
@@ -4,13 +4,16 @@
 #pragma once
 
 #include <algorithm>
+#include <cassert>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/view/instrument_selector.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector.h"
@@ -47,6 +50,60 @@ class ViewRegistry
   {
     // TBD - thread-safe ?
 
+    // Validate parameters
+    if (!instrument_selector || !meter_selector || !view)
+    {
+      OTEL_INTERNAL_LOG_ERROR(
+          "[ViewRegistry::AddView] Invalid parameters: instrument_selector, meter_selector, and "
+          "view cannot be null. Ignoring AddView call.");
+      return;
+    }
+
+    auto aggregation_config = view->GetAggregationConfig();
+    if (aggregation_config)
+    {
+      bool valid                   = false;
+      auto aggregation_config_type = aggregation_config->GetType();
+      auto aggregation_type        = view->GetAggregationType();
+
+      if (aggregation_type == AggregationType::kDefault)
+      {
+        bool is_monotonic;
+        aggregation_type = DefaultAggregation::GetDefaultAggregationType(
+            instrument_selector->GetInstrumentType(), is_monotonic);
+      }
+
+      switch (aggregation_type)
+      {
+        case AggregationType::kHistogram:
+          valid = (aggregation_config_type == AggregationType::kHistogram);
+          break;
+
+        case AggregationType::kBase2ExponentialHistogram:
+          valid = (aggregation_config_type == AggregationType::kBase2ExponentialHistogram);
+          break;
+
+        case AggregationType::kDrop:
+        case AggregationType::kLastValue:
+        case AggregationType::kSum:
+          valid = (aggregation_config_type == AggregationType::kDefault);
+          break;
+
+        default:
+          // Unreachable: all AggregationType enum values are handled above
+          assert(false && "Unreachable: unhandled AggregationType");
+          valid = false;
+      }
+
+      if (!valid)
+      {
+        OTEL_INTERNAL_LOG_ERROR(
+            "[ViewRegistry::AddView] AggregationType and AggregationConfig type mismatch. "
+            "Ignoring AddView call.");
+        return;
+      }
+    }
+
     auto registered_view = std::unique_ptr<RegisteredView>(new RegisteredView{
         std::move(instrument_selector), std::move(meter_selector), std::move(view)});
     registered_views_.push_back(std::move(registered_view));
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
index ac1052383b8..56b41b6291c 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <chrono>
+#include <cstddef>
 
 #include "opentelemetry/version.h"
 
@@ -14,25 +15,77 @@ namespace sdk
 namespace trace
 {
 
+namespace batch_span_processor_options_env
+{
+
+/// @brief Returns the max queue size from the OTEL_BSP_MAX_QUEUE_SIZE environment variable
+/// or the default value (2048) if not set.
+OPENTELEMETRY_EXPORT size_t GetMaxQueueSizeFromEnv();
+
+/// @brief Returns the schedule delay from the OTEL_BSP_SCHEDULE_DELAY environment variable
+/// or the default value (5000ms) if not set.
+OPENTELEMETRY_EXPORT std::chrono::milliseconds GetScheduleDelayFromEnv();
+
+/// @brief Returns the export timeout from the OTEL_BSP_EXPORT_TIMEOUT environment variable
+/// or the default value (30000ms) if not set.
+OPENTELEMETRY_EXPORT std::chrono::milliseconds GetExportTimeoutFromEnv();
+
+/// @brief Returns the max export batch size from the OTEL_BSP_MAX_EXPORT_BATCH_SIZE environment
+/// variable or the default value (512) if not set.
+OPENTELEMETRY_EXPORT size_t GetMaxExportBatchSizeFromEnv();
+
+}  // namespace batch_span_processor_options_env
+
 /**
  * Struct to hold batch SpanProcessor options.
+ *
+ * This is an aggregate type that supports C++20 designated initializers.
+ * Default values are read from environment variables when an instance is created:
+ * - OTEL_BSP_MAX_QUEUE_SIZE (default: 2048)
+ * - OTEL_BSP_SCHEDULE_DELAY (default: 5000ms)
+ * - OTEL_BSP_EXPORT_TIMEOUT (default: 30000ms)
+ * - OTEL_BSP_MAX_EXPORT_BATCH_SIZE (default: 512)
+ *
+ * Usage notes:
+ * - If you use default initialization (e.g., `BatchSpanProcessorOptions opts{}`), all fields
+ *   are set by reading the environment variables (or hardcoded defaults if unset).
+ * - If you use aggregate initialization with explicit values (positional or designated),
+ *   those values override the environment variable defaults for the specified fields.
+ * - With C++20 designated initializers, you can override only specific fields; unspecified
+ *   fields will use environment variables or hardcoded defaults.
+ *
+ * Examples:
+ *   // All fields use env vars or hardcoded defaults
+ *   BatchSpanProcessorOptions opts1{};
+ *
+ *   // C++20: Only max_queue_size overridden, other fields read from env vars/defaults
+ *   BatchSpanProcessorOptions opts3{.max_queue_size = 100};
  */
-struct BatchSpanProcessorOptions
+struct OPENTELEMETRY_EXPORT BatchSpanProcessorOptions
 {
   /**
    * The maximum buffer/queue size. After the size is reached, spans are
    * dropped.
    */
-  size_t max_queue_size = 2048;
+  size_t max_queue_size = batch_span_processor_options_env::GetMaxQueueSizeFromEnv();
 
   /* The time interval between two consecutive exports. */
-  std::chrono::milliseconds schedule_delay_millis = std::chrono::milliseconds(5000);
+  std::chrono::milliseconds schedule_delay_millis =
+      batch_span_processor_options_env::GetScheduleDelayFromEnv();
+
+  /**
+   * The maximum time allowed to export data.
+   * It is not currently used by the SDK and the parameter is ignored.
+   * TODO: Implement the parameter in BatchSpanProcessor
+   */
+  std::chrono::milliseconds export_timeout =
+      batch_span_processor_options_env::GetExportTimeoutFromEnv();
 
   /**
    * The maximum batch size of every export. It must be smaller or
    * equal to max_queue_size.
    */
-  size_t max_export_batch_size = 512;
+  size_t max_export_batch_size = batch_span_processor_options_env::GetMaxExportBatchSizeFromEnv();
 };
 
 }  // namespace trace
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
index 4f732df5a4c..83b200f02aa 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
@@ -73,8 +73,8 @@ class MultiSpanProcessor : public SpanProcessor
     return recordable;
   }
 
-  virtual void OnStart(Recordable &span,
-                       const opentelemetry::trace::SpanContext &parent_context) noexcept override
+  void OnStart(Recordable &span,
+               const opentelemetry::trace::SpanContext &parent_context) noexcept override
   {
     auto multi_recordable = static_cast<MultiRecordable *>(&span);
     ProcessorNode *node   = head_;
@@ -90,7 +90,7 @@ class MultiSpanProcessor : public SpanProcessor
     }
   }
 
-  virtual void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
+  void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
   {
     auto multi_recordable = static_cast<MultiRecordable *>(span.release());
     ProcessorNode *node   = head_;
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/version/version.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/version/version.h
index a5045807a55..2103cfccf5e 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/version/version.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/version/version.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#define OPENTELEMETRY_SDK_VERSION "1.23.0"
+#define OPENTELEMETRY_SDK_VERSION "1.25.0"
 
 #include "opentelemetry/version.h"
 
diff --git a/deps/opentelemetry-cpp/sdk/src/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/src/CMakeLists.txt
index 377d3056277..c922726547c 100644
--- a/deps/opentelemetry-cpp/sdk/src/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/src/CMakeLists.txt
@@ -7,3 +7,7 @@ add_subdirectory(metrics)
 add_subdirectory(logs)
 add_subdirectory(version)
 add_subdirectory(resource)
+
+if(WITH_CONFIGURATION)
+  add_subdirectory(configuration)
+endif()
diff --git a/deps/opentelemetry-cpp/sdk/src/common/BUILD b/deps/opentelemetry-cpp/sdk/src/common/BUILD
index 19b47034f7b..5b47897c9b0 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/common/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/common/base64.cc b/deps/opentelemetry-cpp/sdk/src/common/base64.cc
index b6da954677a..ce4e2f67222 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/base64.cc
+++ b/deps/opentelemetry-cpp/sdk/src/common/base64.cc
@@ -44,9 +44,13 @@ static int Base64EscapeInternal(unsigned char *dest,
                                 Base64EscapeChars &base64_enc_map,
                                 unsigned char padding_char)
 {
-  std::size_t i, n, nopadding;
-  int C1, C2, C3;
-  unsigned char *p;
+  std::size_t i{};
+  std::size_t n{};
+  std::size_t nopadding{};
+  int C1{};
+  int C2{};
+  int C3{};
+  unsigned char *p{nullptr};
 
   if (slen == 0)
   {
@@ -161,10 +165,13 @@ static int Base64UnescapeInternal(unsigned char *dst,
                                   Base64UnescapeChars &base64_dec_map,
                                   unsigned char padding_char)
 {
-  std::size_t i, n;
-  std::size_t j, x;
-  std::size_t valid_slen, line_len;
-  unsigned char *p;
+  std::size_t i{};
+  std::size_t n{};
+  std::size_t j{};
+  std::size_t x{};
+  std::size_t valid_slen{};
+  std::size_t line_len{};
+  unsigned char *p{nullptr};
 
   /* First pass: check for validity and get output length */
   for (i = n = j = valid_slen = line_len = 0; i < slen; i++)
diff --git a/deps/opentelemetry-cpp/sdk/src/common/disabled.cc b/deps/opentelemetry-cpp/sdk/src/common/disabled.cc
index 340f4cffee2..b49eb922a1c 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/disabled.cc
+++ b/deps/opentelemetry-cpp/sdk/src/common/disabled.cc
@@ -15,10 +15,9 @@ bool GetSdkDisabled()
 {
   constexpr char kEnv[] = "OTEL_SDK_DISABLED";
 
-  bool exists;
-  bool value;
+  bool value{};
 
-  exists = GetBoolEnvironmentVariable(kEnv, value);
+  const bool exists = GetBoolEnvironmentVariable(kEnv, value);
   if (!exists)
   {
     value = false;
diff --git a/deps/opentelemetry-cpp/sdk/src/common/env_variables.cc b/deps/opentelemetry-cpp/sdk/src/common/env_variables.cc
index 016f738d4ea..b72933a8028 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/env_variables.cc
+++ b/deps/opentelemetry-cpp/sdk/src/common/env_variables.cc
@@ -97,7 +97,14 @@ static bool GetTimeoutFromString(const char *input, std::chrono::system_clock::d
 
   for (; *input && std::isdigit(*input); ++input)
   {
-    result = result * 10 + (*input - '0');
+    auto digit = (*input - '0');
+
+    if (result > (std::numeric_limits<decltype(result)>::max() - digit) / 10)
+    {
+      // Rejecting overflow as invalid.
+      return false;
+    }
+    result = result * 10 + digit;
   }
 
   if (result == 0)
diff --git a/deps/opentelemetry-cpp/sdk/src/common/fast_random_number_generator.h b/deps/opentelemetry-cpp/sdk/src/common/fast_random_number_generator.h
index 13e6c738d10..66c9c06b63e 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/fast_random_number_generator.h
+++ b/deps/opentelemetry-cpp/sdk/src/common/fast_random_number_generator.h
@@ -25,7 +25,7 @@ namespace common
  *
  * ...
  * #define NOMINMAX
- * #include <Windows.h>
+ * #include <windows.h>
  * ...
  *
  * See:
diff --git a/deps/opentelemetry-cpp/sdk/src/common/platform/BUILD b/deps/opentelemetry-cpp/sdk/src/common/platform/BUILD
index f089ebf7182..bf4deb17139 100644
--- a/deps/opentelemetry-cpp/sdk/src/common/platform/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/common/platform/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/BUILD b/deps/opentelemetry-cpp/sdk/src/configuration/BUILD
new file mode 100644
index 00000000000..88743276389
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/BUILD
@@ -0,0 +1,17 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "configuration",
+    srcs = glob(["**/*.cc"]),
+    include_prefix = "src/configuration",
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "@rapidyaml",
+    ],
+)
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/src/configuration/CMakeLists.txt
new file mode 100644
index 00000000000..0cfb3d67ac0
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(
+  opentelemetry_configuration
+  configuration_parser.cc
+  document_node.cc
+  yaml_configuration_parser.cc
+  ryml_document.cc
+  ryml_document_node.cc
+  configured_sdk.cc
+  sdk_builder.cc
+  registry.cc)
+
+set_target_properties(opentelemetry_configuration PROPERTIES EXPORT_NAME
+                                                             configuration)
+set_target_version(opentelemetry_configuration)
+
+target_include_directories(
+  opentelemetry_configuration
+  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>"
+         "$<INSTALL_INTERFACE:include>")
+
+target_link_libraries(
+  opentelemetry_configuration
+  PUBLIC opentelemetry_api opentelemetry_common opentelemetry_trace
+         opentelemetry_metrics opentelemetry_logs
+  PRIVATE ryml::ryml)
+
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    configuration "OpenTelemetry SDK - Configuration"
+    "Components for exporting traces in the OpenTelemetry SDK."
+    "opentelemetry_configuration")
+endif()
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/configuration_parser.cc b/deps/opentelemetry-cpp/sdk/src/configuration/configuration_parser.cc
index 7b0abcbca72..702a093275d 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/configuration_parser.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/configuration_parser.cc
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <stddef.h>
+#include <stdio.h>
 #include <cstddef>
 #include <fstream>
 #include <map>
@@ -22,6 +23,7 @@
 #include "opentelemetry/sdk/configuration/batch_span_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/boolean_array_attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/boolean_attribute_value_configuration.h"
+#include "opentelemetry/sdk/configuration/cardinality_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
 #include "opentelemetry/sdk/configuration/configuration_parser.h"
 #include "opentelemetry/sdk/configuration/console_log_record_exporter_configuration.h"
@@ -29,11 +31,14 @@
 #include "opentelemetry/sdk/configuration/console_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/default_aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/distribution_configuration.h"
+#include "opentelemetry/sdk/configuration/distribution_entry_configuration.h"
 #include "opentelemetry/sdk/configuration/document.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/double_array_attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/double_attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/drop_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/exemplar_filter.h"
 #include "opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/extension_log_record_processor_configuration.h"
@@ -43,7 +48,9 @@
 #include "opentelemetry/sdk/configuration/extension_sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/extension_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/extension_span_processor_configuration.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
 #include "opentelemetry/sdk/configuration/instrument_type.h"
 #include "opentelemetry/sdk/configuration/integer_array_attribute_value_configuration.h"
@@ -78,6 +85,7 @@
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/resource_configuration.h"
 #include "opentelemetry/sdk/configuration/sampler_configuration.h"
+#include "opentelemetry/sdk/configuration/severity_number.h"
 #include "opentelemetry/sdk/configuration/simple_log_record_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/simple_span_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
@@ -90,10 +98,10 @@
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
 #include "opentelemetry/sdk/configuration/trace_id_ratio_based_sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
+#include "opentelemetry/sdk/configuration/translation_strategy.h"
 #include "opentelemetry/sdk/configuration/view_configuration.h"
 #include "opentelemetry/sdk/configuration/view_selector_configuration.h"
 #include "opentelemetry/sdk/configuration/view_stream_configuration.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -105,7 +113,9 @@ namespace configuration
 // FIXME: proper sizing
 constexpr size_t MAX_SAMPLER_DEPTH = 10;
 
-static OtlpHttpEncoding ParseOtlpHttpEncoding(const std::string &name)
+OtlpHttpEncoding ConfigurationParser::ParseOtlpHttpEncoding(
+    const std::unique_ptr<DocumentNode> &node,
+    const std::string &name) const
 {
   if (name == "protobuf")
   {
@@ -119,11 +129,139 @@ static OtlpHttpEncoding ParseOtlpHttpEncoding(const std::string &name)
 
   std::string message("Illegal OtlpHttpEncoding: ");
   message.append(name);
-  throw InvalidSchemaException(message);
+  throw InvalidSchemaException(node->Location(), message);
 }
 
-static std::unique_ptr<StringArrayConfiguration> ParseStringArrayConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+SeverityNumber ConfigurationParser::ParseSeverityNumber(const std::unique_ptr<DocumentNode> &node,
+                                                        const std::string &name) const
+{
+  if (name == "trace")
+  {
+    return SeverityNumber::trace;
+  }
+
+  if (name == "trace2")
+  {
+    return SeverityNumber::trace2;
+  }
+
+  if (name == "trace3")
+  {
+    return SeverityNumber::trace3;
+  }
+
+  if (name == "trace4")
+  {
+    return SeverityNumber::trace4;
+  }
+
+  if (name == "debug")
+  {
+    return SeverityNumber::debug;
+  }
+
+  if (name == "debug2")
+  {
+    return SeverityNumber::debug2;
+  }
+
+  if (name == "debug3")
+  {
+    return SeverityNumber::debug3;
+  }
+
+  if (name == "debug4")
+  {
+    return SeverityNumber::debug4;
+  }
+
+  if (name == "info")
+  {
+    return SeverityNumber::info;
+  }
+
+  if (name == "info2")
+  {
+    return SeverityNumber::info2;
+  }
+
+  if (name == "info3")
+  {
+    return SeverityNumber::info3;
+  }
+
+  if (name == "info4")
+  {
+    return SeverityNumber::info4;
+  }
+
+  if (name == "warn")
+  {
+    return SeverityNumber::warn;
+  }
+
+  if (name == "warn2")
+  {
+    return SeverityNumber::warn2;
+  }
+
+  if (name == "warn3")
+  {
+    return SeverityNumber::warn3;
+  }
+
+  if (name == "warn4")
+  {
+    return SeverityNumber::warn4;
+  }
+
+  if (name == "error")
+  {
+    return SeverityNumber::error;
+  }
+
+  if (name == "error2")
+  {
+    return SeverityNumber::error2;
+  }
+
+  if (name == "error3")
+  {
+    return SeverityNumber::error3;
+  }
+
+  if (name == "error4")
+  {
+    return SeverityNumber::error4;
+  }
+
+  if (name == "fatal")
+  {
+    return SeverityNumber::fatal;
+  }
+
+  if (name == "fatal2")
+  {
+    return SeverityNumber::fatal2;
+  }
+
+  if (name == "fatal3")
+  {
+    return SeverityNumber::fatal3;
+  }
+
+  if (name == "fatal4")
+  {
+    return SeverityNumber::fatal4;
+  }
+
+  std::string message("Illegal SeverityNumber: ");
+  message.append(name);
+  throw InvalidSchemaException(node->Location(), message);
+}
+
+std::unique_ptr<StringArrayConfiguration> ConfigurationParser::ParseStringArrayConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<StringArrayConfiguration>();
 
@@ -139,8 +277,8 @@ static std::unique_ptr<StringArrayConfiguration> ParseStringArrayConfiguration(
   return model;
 }
 
-static std::unique_ptr<IncludeExcludeConfiguration> ParseIncludeExcludeConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<IncludeExcludeConfiguration> ConfigurationParser::ParseIncludeExcludeConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<IncludeExcludeConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -160,8 +298,8 @@ static std::unique_ptr<IncludeExcludeConfiguration> ParseIncludeExcludeConfigura
   return model;
 }
 
-static std::unique_ptr<HeadersConfiguration> ParseHeadersConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<HeadersConfiguration> ConfigurationParser::ParseHeadersConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<HeadersConfiguration>();
   std::unique_ptr<DocumentNode> kv_pair;
@@ -188,8 +326,9 @@ static std::unique_ptr<HeadersConfiguration> ParseHeadersConfiguration(
   return model;
 }
 
-static std::unique_ptr<AttributeLimitsConfiguration> ParseAttributeLimitsConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<AttributeLimitsConfiguration>
+ConfigurationParser::ParseAttributeLimitsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<AttributeLimitsConfiguration>();
 
@@ -199,16 +338,45 @@ static std::unique_ptr<AttributeLimitsConfiguration> ParseAttributeLimitsConfigu
   return model;
 }
 
-static std::unique_ptr<OtlpHttpLogRecordExporterConfiguration>
-ParseOtlpHttpLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<HttpTlsConfiguration> ConfigurationParser::ParseHttpTlsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
+{
+  auto model = std::make_unique<HttpTlsConfiguration>();
+
+  model->ca_file   = node->GetString("ca_file", "");
+  model->key_file  = node->GetString("key_file", "");
+  model->cert_file = node->GetString("cert_file", "");
+
+  return model;
+}
+
+std::unique_ptr<GrpcTlsConfiguration> ConfigurationParser::ParseGrpcTlsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
+{
+  auto model = std::make_unique<GrpcTlsConfiguration>();
+
+  model->ca_file   = node->GetString("ca_file", "");
+  model->key_file  = node->GetString("key_file", "");
+  model->cert_file = node->GetString("cert_file", "");
+  model->insecure  = node->GetBoolean("insecure", false);
+
+  return model;
+}
+
+std::unique_ptr<OtlpHttpLogRecordExporterConfiguration>
+ConfigurationParser::ParseOtlpHttpLogRecordExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpHttpLogRecordExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseHttpTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -220,22 +388,26 @@ ParseOtlpHttpLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode>
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
 
-  std::string encoding = node->GetString("encoding", "protobuf");
-  model->encoding      = ParseOtlpHttpEncoding(encoding);
+  const std::string encoding = node->GetString("encoding", "protobuf");
+  model->encoding            = ParseOtlpHttpEncoding(node, encoding);
 
   return model;
 }
 
-static std::unique_ptr<OtlpGrpcLogRecordExporterConfiguration>
-ParseOtlpGrpcLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpGrpcLogRecordExporterConfiguration>
+ConfigurationParser::ParseOtlpGrpcLogRecordExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpGrpcLogRecordExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseGrpcTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -246,13 +418,13 @@ ParseOtlpGrpcLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode>
   model->headers_list = node->GetString("headers_list", "");
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
-  model->insecure     = node->GetBoolean("insecure", false);
 
   return model;
 }
 
-static std::unique_ptr<OtlpFileLogRecordExporterConfiguration>
-ParseOtlpFileLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpFileLogRecordExporterConfiguration>
+ConfigurationParser::ParseOtlpFileLogRecordExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpFileLogRecordExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -262,17 +434,19 @@ ParseOtlpFileLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode>
   return model;
 }
 
-static std::unique_ptr<ConsoleLogRecordExporterConfiguration>
-ParseConsoleLogRecordExporterConfiguration(const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<ConsoleLogRecordExporterConfiguration>
+ConfigurationParser::ParseConsoleLogRecordExporterConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<ConsoleLogRecordExporterConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<ExtensionLogRecordExporterConfiguration>
-ParseExtensionLogRecordExporterConfiguration(const std::string &name,
-                                             std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionLogRecordExporterConfiguration>
+ConfigurationParser::ParseExtensionLogRecordExporterConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionLogRecordExporterConfiguration>();
 
@@ -282,8 +456,9 @@ ParseExtensionLogRecordExporterConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<LogRecordExporterConfiguration> ParseLogRecordExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<LogRecordExporterConfiguration>
+ConfigurationParser::ParseLogRecordExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<LogRecordExporterConfiguration> model;
 
@@ -302,7 +477,7 @@ static std::unique_ptr<LogRecordExporterConfiguration> ParseLogRecordExporterCon
   {
     std::string message("Illegal log record exporter, count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "otlp_http")
@@ -329,8 +504,9 @@ static std::unique_ptr<LogRecordExporterConfiguration> ParseLogRecordExporterCon
   return model;
 }
 
-static std::unique_ptr<BatchLogRecordProcessorConfiguration>
-ParseBatchLogRecordProcessorConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<BatchLogRecordProcessorConfiguration>
+ConfigurationParser::ParseBatchLogRecordProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<BatchLogRecordProcessorConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -346,8 +522,9 @@ ParseBatchLogRecordProcessorConfiguration(const std::unique_ptr<DocumentNode> &n
   return model;
 }
 
-static std::unique_ptr<SimpleLogRecordProcessorConfiguration>
-ParseSimpleLogRecordProcessorConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<SimpleLogRecordProcessorConfiguration>
+ConfigurationParser::ParseSimpleLogRecordProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<SimpleLogRecordProcessorConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -358,9 +535,10 @@ ParseSimpleLogRecordProcessorConfiguration(const std::unique_ptr<DocumentNode> &
   return model;
 }
 
-static std::unique_ptr<ExtensionLogRecordProcessorConfiguration>
-ParseExtensionLogRecordProcessorConfiguration(const std::string &name,
-                                              std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionLogRecordProcessorConfiguration>
+ConfigurationParser::ParseExtensionLogRecordProcessorConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionLogRecordProcessorConfiguration>();
 
@@ -370,8 +548,9 @@ ParseExtensionLogRecordProcessorConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<LogRecordProcessorConfiguration> ParseLogRecordProcessorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<LogRecordProcessorConfiguration>
+ConfigurationParser::ParseLogRecordProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<LogRecordProcessorConfiguration> model;
 
@@ -390,7 +569,7 @@ static std::unique_ptr<LogRecordProcessorConfiguration> ParseLogRecordProcessorC
   {
     std::string message("Illegal log record processor, count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "batch")
@@ -409,8 +588,9 @@ static std::unique_ptr<LogRecordProcessorConfiguration> ParseLogRecordProcessorC
   return model;
 }
 
-static std::unique_ptr<LogRecordLimitsConfiguration> ParseLogRecordLimitsConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<LogRecordLimitsConfiguration>
+ConfigurationParser::ParseLogRecordLimitsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<LogRecordLimitsConfiguration>();
 
@@ -420,8 +600,8 @@ static std::unique_ptr<LogRecordLimitsConfiguration> ParseLogRecordLimitsConfigu
   return model;
 }
 
-static std::unique_ptr<LoggerProviderConfiguration> ParseLoggerProviderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<LoggerProviderConfiguration> ConfigurationParser::ParseLoggerProviderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<LoggerProviderConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -437,7 +617,7 @@ static std::unique_ptr<LoggerProviderConfiguration> ParseLoggerProviderConfigura
   if (count == 0)
   {
     std::string message("Illegal logger provider, 0 processors");
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(child->Location(), message);
   }
 
   child = node->GetChildNode("limits");
@@ -449,7 +629,9 @@ static std::unique_ptr<LoggerProviderConfiguration> ParseLoggerProviderConfigura
   return model;
 }
 
-static DefaultHistogramAggregation ParseDefaultHistogramAggregation(const std::string &name)
+DefaultHistogramAggregation ConfigurationParser::ParseDefaultHistogramAggregation(
+    const std::unique_ptr<DocumentNode> &node,
+    const std::string &name) const
 {
   if (name == "explicit_bucket_histogram")
   {
@@ -463,10 +645,12 @@ static DefaultHistogramAggregation ParseDefaultHistogramAggregation(const std::s
 
   std::string message("Illegal default_histogram_aggregation: ");
   message.append(name);
-  throw InvalidSchemaException(message);
+  throw InvalidSchemaException(node->Location(), message);
 }
 
-static TemporalityPreference ParseTemporalityPreference(const std::string &name)
+TemporalityPreference ConfigurationParser::ParseTemporalityPreference(
+    const std::unique_ptr<DocumentNode> &node,
+    const std::string &name) const
 {
   if (name == "cumulative")
   {
@@ -485,19 +669,23 @@ static TemporalityPreference ParseTemporalityPreference(const std::string &name)
 
   std::string message("Illegal temporality preference: ");
   message.append(name);
-  throw InvalidSchemaException(message);
+  throw InvalidSchemaException(node->Location(), message);
 }
 
-static std::unique_ptr<OtlpHttpPushMetricExporterConfiguration>
-ParseOtlpHttpPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpHttpPushMetricExporterConfiguration>
+ConfigurationParser::ParseOtlpHttpPushMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpHttpPushMetricExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseHttpTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -509,30 +697,35 @@ ParseOtlpHttpPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode>
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
 
-  std::string temporality_preference = node->GetString("temporality_preference", "cumulative");
-  model->temporality_preference      = ParseTemporalityPreference(temporality_preference);
+  const std::string temporality_preference =
+      node->GetString("temporality_preference", "cumulative");
+  model->temporality_preference = ParseTemporalityPreference(node, temporality_preference);
 
-  std::string default_histogram_aggregation =
+  const std::string default_histogram_aggregation =
       node->GetString("default_histogram_aggregation", "explicit_bucket_histogram");
   model->default_histogram_aggregation =
-      ParseDefaultHistogramAggregation(default_histogram_aggregation);
+      ParseDefaultHistogramAggregation(node, default_histogram_aggregation);
 
-  std::string encoding = node->GetString("encoding", "protobuf");
-  model->encoding      = ParseOtlpHttpEncoding(encoding);
+  const std::string encoding = node->GetString("encoding", "protobuf");
+  model->encoding            = ParseOtlpHttpEncoding(node, encoding);
 
   return model;
 }
 
-static std::unique_ptr<OtlpGrpcPushMetricExporterConfiguration>
-ParseOtlpGrpcPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpGrpcPushMetricExporterConfiguration>
+ConfigurationParser::ParseOtlpGrpcPushMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpGrpcPushMetricExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseGrpcTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -544,65 +737,115 @@ ParseOtlpGrpcPushMetricExporterConfiguration(const std::unique_ptr<DocumentNode>
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
 
-  std::string temporality_preference = node->GetString("temporality_preference", "cumulative");
-  model->temporality_preference      = ParseTemporalityPreference(temporality_preference);
+  const std::string temporality_preference =
+      node->GetString("temporality_preference", "cumulative");
+  model->temporality_preference = ParseTemporalityPreference(node, temporality_preference);
 
-  std::string default_histogram_aggregation =
+  const std::string default_histogram_aggregation =
       node->GetString("default_histogram_aggregation", "explicit_bucket_histogram");
   model->default_histogram_aggregation =
-      ParseDefaultHistogramAggregation(default_histogram_aggregation);
-
-  model->insecure = node->GetBoolean("insecure", false);
+      ParseDefaultHistogramAggregation(node, default_histogram_aggregation);
 
   return model;
 }
 
-static std::unique_ptr<OtlpFilePushMetricExporterConfiguration>
-ParseOtlpFilePushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpFilePushMetricExporterConfiguration>
+ConfigurationParser::ParseOtlpFilePushMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpFilePushMetricExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
   model->output_stream = node->GetString("output_stream", "");
 
-  std::string temporality_preference = node->GetString("temporality_preference", "cumulative");
-  model->temporality_preference      = ParseTemporalityPreference(temporality_preference);
+  const std::string temporality_preference =
+      node->GetString("temporality_preference", "cumulative");
+  model->temporality_preference = ParseTemporalityPreference(node, temporality_preference);
 
-  std::string default_histogram_aggregation =
+  const std::string default_histogram_aggregation =
       node->GetString("default_histogram_aggregation", "explicit_bucket_histogram");
   model->default_histogram_aggregation =
-      ParseDefaultHistogramAggregation(default_histogram_aggregation);
+      ParseDefaultHistogramAggregation(node, default_histogram_aggregation);
 
   return model;
 }
 
-static std::unique_ptr<ConsolePushMetricExporterConfiguration>
-ParseConsolePushMetricExporterConfiguration(const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<ConsolePushMetricExporterConfiguration>
+ConfigurationParser::ParseConsolePushMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ConsolePushMetricExporterConfiguration>();
 
-  // FIXME-CONFIG: https://github.com/open-telemetry/opentelemetry-configuration/issues/242
+  const std::string temporality_preference =
+      node->GetString("temporality_preference", "cumulative");
+  model->temporality_preference = ParseTemporalityPreference(node, temporality_preference);
+
+  const std::string default_histogram_aggregation =
+      node->GetString("default_histogram_aggregation", "explicit_bucket_histogram");
+  model->default_histogram_aggregation =
+      ParseDefaultHistogramAggregation(node, default_histogram_aggregation);
 
   return model;
 }
 
-static std::unique_ptr<PrometheusPullMetricExporterConfiguration>
-ParsePrometheusPullMetricExporterConfiguration(const std::unique_ptr<DocumentNode> &node)
+TranslationStrategy ConfigurationParser::ParseTranslationStrategy(
+    const std::unique_ptr<DocumentNode> &node,
+    const std::string &name) const
+{
+  if (name == "UnderscoreEscapingWithSuffixes")
+  {
+    return TranslationStrategy::UnderscoreEscapingWithSuffixes;
+  }
+
+  if (name == "UnderscoreEscapingWithoutSuffixes")
+  {
+    return TranslationStrategy::UnderscoreEscapingWithoutSuffixes;
+  }
+
+  if (name == "NoUTF8EscapingWithSuffixes")
+  {
+    return TranslationStrategy::NoUTF8EscapingWithSuffixes;
+  }
+
+  if (name == "NoTranslation")
+  {
+    return TranslationStrategy::NoTranslation;
+  }
+
+  std::string message("Illegal TranslationStrategy: ");
+  message.append(name);
+  throw InvalidSchemaException(node->Location(), message);
+}
+
+std::unique_ptr<PrometheusPullMetricExporterConfiguration>
+ConfigurationParser::ParsePrometheusPullMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<PrometheusPullMetricExporterConfiguration>();
+  std::unique_ptr<DocumentNode> child;
 
   model->host                = node->GetString("host", "localhost");
   model->port                = node->GetInteger("port", 9464);
-  model->without_units       = node->GetBoolean("without_units", false);
-  model->without_type_suffix = node->GetBoolean("without_type_suffix", false);
   model->without_scope_info  = node->GetBoolean("without_scope_info", false);
+  model->without_target_info = node->GetBoolean("without_target_info", false);
+
+  child = node->GetChildNode("with_resource_constant_labels");
+  if (child)
+  {
+    model->with_resource_constant_labels = ParseIncludeExcludeConfiguration(child);
+  }
+
+  std::string translation_strategy =
+      node->GetString("translation_strategy", "UnderscoreEscapingWithSuffixes");
+  model->translation_strategy = ParseTranslationStrategy(node, translation_strategy);
 
   return model;
 }
 
-static std::unique_ptr<ExtensionPushMetricExporterConfiguration>
-ParsePushMetricExporterExtensionConfiguration(const std::string &name,
-                                              std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionPushMetricExporterConfiguration>
+ConfigurationParser::ParsePushMetricExporterExtensionConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionPushMetricExporterConfiguration>();
 
@@ -612,9 +855,10 @@ ParsePushMetricExporterExtensionConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<ExtensionPullMetricExporterConfiguration>
-ParsePullMetricExporterExtensionConfiguration(const std::string &name,
-                                              std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionPullMetricExporterConfiguration>
+ConfigurationParser::ParsePullMetricExporterExtensionConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionPullMetricExporterConfiguration>();
 
@@ -624,8 +868,9 @@ ParsePullMetricExporterExtensionConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<PushMetricExporterConfiguration> ParsePushMetricExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<PushMetricExporterConfiguration>
+ConfigurationParser::ParsePushMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<PushMetricExporterConfiguration> model;
 
@@ -644,7 +889,7 @@ static std::unique_ptr<PushMetricExporterConfiguration> ParsePushMetricExporterC
   {
     std::string message("Illegal push metric exporter, count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "otlp_http")
@@ -671,8 +916,9 @@ static std::unique_ptr<PushMetricExporterConfiguration> ParsePushMetricExporterC
   return model;
 }
 
-static std::unique_ptr<PullMetricExporterConfiguration> ParsePullMetricExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<PullMetricExporterConfiguration>
+ConfigurationParser::ParsePullMetricExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<PullMetricExporterConfiguration> model;
 
@@ -691,7 +937,7 @@ static std::unique_ptr<PullMetricExporterConfiguration> ParsePullMetricExporterC
   {
     std::string message("Illegal pull metric exporter, count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "prometheus/development")
@@ -706,17 +952,19 @@ static std::unique_ptr<PullMetricExporterConfiguration> ParsePullMetricExporterC
   return model;
 }
 
-static std::unique_ptr<OpenCensusMetricProducerConfiguration>
-ParseOpenCensusMetricProducerConfiguration(const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<OpenCensusMetricProducerConfiguration>
+ConfigurationParser::ParseOpenCensusMetricProducerConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<OpenCensusMetricProducerConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<ExtensionMetricProducerConfiguration>
-ParseExtensionMetricProducerConfiguration(const std::string &name,
-                                          std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionMetricProducerConfiguration>
+ConfigurationParser::ParseExtensionMetricProducerConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionMetricProducerConfiguration>();
 
@@ -726,8 +974,8 @@ ParseExtensionMetricProducerConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<MetricProducerConfiguration> ParseMetricProducerConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<MetricProducerConfiguration> ConfigurationParser::ParseMetricProducerConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<MetricProducerConfiguration> model;
 
@@ -746,7 +994,7 @@ static std::unique_ptr<MetricProducerConfiguration> ParseMetricProducerConfigura
   {
     std::string message("Illegal metric producer, properties count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "opencensus")
@@ -761,8 +1009,27 @@ static std::unique_ptr<MetricProducerConfiguration> ParseMetricProducerConfigura
   return model;
 }
 
-static std::unique_ptr<PeriodicMetricReaderConfiguration> ParsePeriodicMetricReaderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<CardinalityLimitsConfiguration>
+ConfigurationParser::ParseCardinalityLimitsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
+{
+  auto model = std::make_unique<CardinalityLimitsConfiguration>();
+
+  model->default_limit              = node->GetInteger("default", 2000);
+  model->counter                    = node->GetInteger("counter", 0);
+  model->gauge                      = node->GetInteger("gauge", 0);
+  model->histogram                  = node->GetInteger("histogram", 0);
+  model->observable_counter         = node->GetInteger("observable_counter", 0);
+  model->observable_gauge           = node->GetInteger("observable_gauge", 0);
+  model->observable_up_down_counter = node->GetInteger("observable_up_down_counter", 0);
+  model->up_down_counter            = node->GetInteger("up_down_counter", 0);
+
+  return model;
+}
+
+std::unique_ptr<PeriodicMetricReaderConfiguration>
+ConfigurationParser::ParsePeriodicMetricReaderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<PeriodicMetricReaderConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -783,11 +1050,18 @@ static std::unique_ptr<PeriodicMetricReaderConfiguration> ParsePeriodicMetricRea
     }
   }
 
+  child = node->GetChildNode("cardinality_limits");
+  if (child)
+  {
+    model->cardinality_limits = ParseCardinalityLimitsConfiguration(child);
+  }
+
   return model;
 }
 
-static std::unique_ptr<PullMetricReaderConfiguration> ParsePullMetricReaderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<PullMetricReaderConfiguration>
+ConfigurationParser::ParsePullMetricReaderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<PullMetricReaderConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -805,11 +1079,17 @@ static std::unique_ptr<PullMetricReaderConfiguration> ParsePullMetricReaderConfi
     }
   }
 
+  child = node->GetChildNode("cardinality_limits");
+  if (child)
+  {
+    model->cardinality_limits = ParseCardinalityLimitsConfiguration(child);
+  }
+
   return model;
 }
 
-static std::unique_ptr<MetricReaderConfiguration> ParseMetricReaderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<MetricReaderConfiguration> ConfigurationParser::ParseMetricReaderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<MetricReaderConfiguration> model;
 
@@ -828,7 +1108,7 @@ static std::unique_ptr<MetricReaderConfiguration> ParseMetricReaderConfiguration
   {
     std::string message("Illegal metric reader, count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "periodic")
@@ -843,13 +1123,14 @@ static std::unique_ptr<MetricReaderConfiguration> ParseMetricReaderConfiguration
   {
     std::string message("Illegal metric reader: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   return model;
 }
 
-static InstrumentType ParseInstrumentType(const std::string &name)
+InstrumentType ConfigurationParser::ParseInstrumentType(const std::unique_ptr<DocumentNode> &node,
+                                                        const std::string &name) const
 {
   if (name == "")
   {
@@ -888,18 +1169,46 @@ static InstrumentType ParseInstrumentType(const std::string &name)
 
   std::string message("Illegal instrument type: ");
   message.append(name);
-  throw InvalidSchemaException(message);
+  throw InvalidSchemaException(node->Location(), message);
+}
+
+ExemplarFilter ConfigurationParser::ParseExemplarFilter(const std::unique_ptr<DocumentNode> &node,
+                                                        const std::string &name) const
+{
+  if (name == "")
+  {
+    return ExemplarFilter::trace_based;
+  }
+
+  if (name == "always_on")
+  {
+    return ExemplarFilter::always_on;
+  }
+
+  if (name == "always_off")
+  {
+    return ExemplarFilter::always_off;
+  }
+
+  if (name == "trace_based")
+  {
+    return ExemplarFilter::trace_based;
+  }
+
+  std::string message("Illegal exemplar filter: ");
+  message.append(name);
+  throw InvalidSchemaException(node->Location(), message);
 }
 
-static std::unique_ptr<ViewSelectorConfiguration> ParseViewSelectorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<ViewSelectorConfiguration> ConfigurationParser::ParseViewSelectorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ViewSelectorConfiguration>();
 
   model->instrument_name = node->GetString("instrument_name", "");
 
   std::string instrument_type = node->GetString("instrument_type", "");
-  model->instrument_type      = ParseInstrumentType(instrument_type);
+  model->instrument_type      = ParseInstrumentType(node, instrument_type);
 
   model->unit             = node->GetString("unit", "");
   model->meter_name       = node->GetString("meter_name", "");
@@ -909,24 +1218,27 @@ static std::unique_ptr<ViewSelectorConfiguration> ParseViewSelectorConfiguration
   return model;
 }
 
-static std::unique_ptr<DefaultAggregationConfiguration> ParseDefaultAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<DefaultAggregationConfiguration>
+ConfigurationParser::ParseDefaultAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<DefaultAggregationConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<DropAggregationConfiguration> ParseDropAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<DropAggregationConfiguration>
+ConfigurationParser::ParseDropAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<DropAggregationConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<ExplicitBucketHistogramAggregationConfiguration>
-ParseExplicitBucketHistogramAggregationConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<ExplicitBucketHistogramAggregationConfiguration>
+ConfigurationParser::ParseExplicitBucketHistogramAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ExplicitBucketHistogramAggregationConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -950,9 +1262,9 @@ ParseExplicitBucketHistogramAggregationConfiguration(const std::unique_ptr<Docum
   return model;
 }
 
-static std::unique_ptr<Base2ExponentialBucketHistogramAggregationConfiguration>
-ParseBase2ExponentialBucketHistogramAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<Base2ExponentialBucketHistogramAggregationConfiguration>
+ConfigurationParser::ParseBase2ExponentialBucketHistogramAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<Base2ExponentialBucketHistogramAggregationConfiguration>();
 
@@ -963,24 +1275,25 @@ ParseBase2ExponentialBucketHistogramAggregationConfiguration(
   return model;
 }
 
-static std::unique_ptr<LastValueAggregationConfiguration> ParseLastValueAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<LastValueAggregationConfiguration>
+ConfigurationParser::ParseLastValueAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<LastValueAggregationConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<SumAggregationConfiguration> ParseSumAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<SumAggregationConfiguration> ConfigurationParser::ParseSumAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<SumAggregationConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<AggregationConfiguration> ParseAggregationConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<AggregationConfiguration> ConfigurationParser::ParseAggregationConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<AggregationConfiguration> model;
   std::unique_ptr<DocumentNode> child;
@@ -991,7 +1304,7 @@ static std::unique_ptr<AggregationConfiguration> ParseAggregationConfiguration(
   {
     std::string message("Illegal aggregation, children: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   child            = node->GetChild(0);
@@ -1025,14 +1338,14 @@ static std::unique_ptr<AggregationConfiguration> ParseAggregationConfiguration(
   {
     std::string message("Illegal aggregation: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   return model;
 }
 
-static std::unique_ptr<ViewStreamConfiguration> ParseViewStreamConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<ViewStreamConfiguration> ConfigurationParser::ParseViewStreamConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ViewStreamConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1056,8 +1369,8 @@ static std::unique_ptr<ViewStreamConfiguration> ParseViewStreamConfiguration(
   return model;
 }
 
-static std::unique_ptr<ViewConfiguration> ParseViewConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<ViewConfiguration> ConfigurationParser::ParseViewConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ViewConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1071,8 +1384,8 @@ static std::unique_ptr<ViewConfiguration> ParseViewConfiguration(
   return model;
 }
 
-static std::unique_ptr<MeterProviderConfiguration> ParseMeterProviderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<MeterProviderConfiguration> ConfigurationParser::ParseMeterProviderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<MeterProviderConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1087,7 +1400,7 @@ static std::unique_ptr<MeterProviderConfiguration> ParseMeterProviderConfigurati
   if (model->readers.size() == 0)
   {
     std::string message("Illegal meter provider, 0 readers");
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(child->Location(), message);
   }
 
   child = node->GetChildNode("views");
@@ -1100,11 +1413,16 @@ static std::unique_ptr<MeterProviderConfiguration> ParseMeterProviderConfigurati
     }
   }
 
+  std::string exemplar_filter = node->GetString("exemplar_filter", "trace_based");
+  model->exemplar_filter      = ParseExemplarFilter(node, exemplar_filter);
+
+  // FIXME: meter_configurator/development
+
   return model;
 }
 
-static std::unique_ptr<PropagatorConfiguration> ParsePropagatorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<PropagatorConfiguration> ConfigurationParser::ParsePropagatorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<PropagatorConfiguration>();
 
@@ -1135,7 +1453,7 @@ static std::unique_ptr<PropagatorConfiguration> ParsePropagatorConfiguration(
         message.append(std::to_string(num_child));
         message.append(", properties count: ");
         message.append(std::to_string(count));
-        throw InvalidSchemaException(message);
+        throw InvalidSchemaException(element->Location(), message);
       }
 
       model->composite.push_back(name);
@@ -1147,8 +1465,8 @@ static std::unique_ptr<PropagatorConfiguration> ParsePropagatorConfiguration(
   return model;
 }
 
-static std::unique_ptr<SpanLimitsConfiguration> ParseSpanLimitsConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<SpanLimitsConfiguration> ConfigurationParser::ParseSpanLimitsConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<SpanLimitsConfiguration>();
 
@@ -1162,22 +1480,20 @@ static std::unique_ptr<SpanLimitsConfiguration> ParseSpanLimitsConfiguration(
   return model;
 }
 
-static std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
-    const std::unique_ptr<DocumentNode> &node,
-    size_t depth);
-
-static std::unique_ptr<AlwaysOffSamplerConfiguration> ParseAlwaysOffSamplerConfiguration(
+std::unique_ptr<AlwaysOffSamplerConfiguration>
+ConfigurationParser::ParseAlwaysOffSamplerConfiguration(
     const std::unique_ptr<DocumentNode> & /* node */,
-    size_t /* depth */)
+    size_t /* depth */) const
 {
   auto model = std::make_unique<AlwaysOffSamplerConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<AlwaysOnSamplerConfiguration> ParseAlwaysOnSamplerConfiguration(
+std::unique_ptr<AlwaysOnSamplerConfiguration>
+ConfigurationParser::ParseAlwaysOnSamplerConfiguration(
     const std::unique_ptr<DocumentNode> & /* node */,
-    size_t /* depth */)
+    size_t /* depth */) const
 {
   auto model = std::make_unique<AlwaysOnSamplerConfiguration>();
 
@@ -1185,9 +1501,10 @@ static std::unique_ptr<AlwaysOnSamplerConfiguration> ParseAlwaysOnSamplerConfigu
 }
 
 // NOLINTBEGIN(misc-no-recursion)
-static std::unique_ptr<JaegerRemoteSamplerConfiguration> ParseJaegerRemoteSamplerConfiguration(
+std::unique_ptr<JaegerRemoteSamplerConfiguration>
+ConfigurationParser::ParseJaegerRemoteSamplerConfiguration(
     const std::unique_ptr<DocumentNode> &node,
-    size_t depth)
+    size_t depth) const
 {
   auto model = std::make_unique<JaegerRemoteSamplerConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1210,9 +1527,9 @@ static std::unique_ptr<JaegerRemoteSamplerConfiguration> ParseJaegerRemoteSample
 // NOLINTEND(misc-no-recursion)
 
 // NOLINTBEGIN(misc-no-recursion)
-static std::unique_ptr<ParentBasedSamplerConfiguration> ParseParentBasedSamplerConfiguration(
-    const std::unique_ptr<DocumentNode> &node,
-    size_t depth)
+std::unique_ptr<ParentBasedSamplerConfiguration>
+ConfigurationParser::ParseParentBasedSamplerConfiguration(const std::unique_ptr<DocumentNode> &node,
+                                                          size_t depth) const
 {
   auto model = std::make_unique<ParentBasedSamplerConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1251,9 +1568,10 @@ static std::unique_ptr<ParentBasedSamplerConfiguration> ParseParentBasedSamplerC
 }
 // NOLINTEND(misc-no-recursion)
 
-static std::unique_ptr<TraceIdRatioBasedSamplerConfiguration>
-ParseTraceIdRatioBasedSamplerConfiguration(const std::unique_ptr<DocumentNode> &node,
-                                           size_t /* depth */)
+std::unique_ptr<TraceIdRatioBasedSamplerConfiguration>
+ConfigurationParser::ParseTraceIdRatioBasedSamplerConfiguration(
+    const std::unique_ptr<DocumentNode> &node,
+    size_t /* depth */) const
 {
   auto model = std::make_unique<TraceIdRatioBasedSamplerConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1263,10 +1581,10 @@ ParseTraceIdRatioBasedSamplerConfiguration(const std::unique_ptr<DocumentNode> &
   return model;
 }
 
-static std::unique_ptr<ExtensionSamplerConfiguration> ParseSamplerExtensionConfiguration(
-    const std::string &name,
-    std::unique_ptr<DocumentNode> node,
-    size_t depth)
+std::unique_ptr<ExtensionSamplerConfiguration>
+ConfigurationParser::ParseSamplerExtensionConfiguration(const std::string &name,
+                                                        std::unique_ptr<DocumentNode> node,
+                                                        size_t depth) const
 {
   auto model = std::make_unique<ExtensionSamplerConfiguration>();
 
@@ -1278,9 +1596,9 @@ static std::unique_ptr<ExtensionSamplerConfiguration> ParseSamplerExtensionConfi
 }
 
 // NOLINTBEGIN(misc-no-recursion)
-static std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
+std::unique_ptr<SamplerConfiguration> ConfigurationParser::ParseSamplerConfiguration(
     const std::unique_ptr<DocumentNode> &node,
-    size_t depth)
+    size_t depth) const
 {
   /*
    * ParseSamplerConfiguration() is recursive,
@@ -1290,7 +1608,7 @@ static std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
   {
     std::string message("Samplers nested too deeply: ");
     message.append(std::to_string(depth));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   std::unique_ptr<SamplerConfiguration> model;
@@ -1310,7 +1628,7 @@ static std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
   {
     std::string message("Illegal sampler, properties count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "always_off")
@@ -1342,16 +1660,20 @@ static std::unique_ptr<SamplerConfiguration> ParseSamplerConfiguration(
 }
 // NOLINTEND(misc-no-recursion)
 
-static std::unique_ptr<OtlpHttpSpanExporterConfiguration> ParseOtlpHttpSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpHttpSpanExporterConfiguration>
+ConfigurationParser::ParseOtlpHttpSpanExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpHttpSpanExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseHttpTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -1363,22 +1685,26 @@ static std::unique_ptr<OtlpHttpSpanExporterConfiguration> ParseOtlpHttpSpanExpor
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
 
-  std::string encoding = node->GetString("encoding", "protobuf");
-  model->encoding      = ParseOtlpHttpEncoding(encoding);
+  const std::string encoding = node->GetString("encoding", "protobuf");
+  model->encoding            = ParseOtlpHttpEncoding(node, encoding);
 
   return model;
 }
 
-static std::unique_ptr<OtlpGrpcSpanExporterConfiguration> ParseOtlpGrpcSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpGrpcSpanExporterConfiguration>
+ConfigurationParser::ParseOtlpGrpcSpanExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpGrpcSpanExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
 
-  model->endpoint                = node->GetRequiredString("endpoint");
-  model->certificate_file        = node->GetString("certificate_file", "");
-  model->client_key_file         = node->GetString("client_key_file", "");
-  model->client_certificate_file = node->GetString("client_certificate_file", "");
+  model->endpoint = node->GetRequiredString("endpoint");
+
+  child = node->GetChildNode("tls");
+  if (child)
+  {
+    model->tls = ParseGrpcTlsConfiguration(child);
+  }
 
   child = node->GetChildNode("headers");
   if (child)
@@ -1389,13 +1715,13 @@ static std::unique_ptr<OtlpGrpcSpanExporterConfiguration> ParseOtlpGrpcSpanExpor
   model->headers_list = node->GetString("headers_list", "");
   model->compression  = node->GetString("compression", "");
   model->timeout      = node->GetInteger("timeout", 10000);
-  model->insecure     = node->GetBoolean("insecure", false);
 
   return model;
 }
 
-static std::unique_ptr<OtlpFileSpanExporterConfiguration> ParseOtlpFileSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<OtlpFileSpanExporterConfiguration>
+ConfigurationParser::ParseOtlpFileSpanExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<OtlpFileSpanExporterConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1405,28 +1731,19 @@ static std::unique_ptr<OtlpFileSpanExporterConfiguration> ParseOtlpFileSpanExpor
   return model;
 }
 
-static std::unique_ptr<ConsoleSpanExporterConfiguration> ParseConsoleSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> & /* node */)
+std::unique_ptr<ConsoleSpanExporterConfiguration>
+ConfigurationParser::ParseConsoleSpanExporterConfiguration(
+    const std::unique_ptr<DocumentNode> & /* node */) const
 {
   auto model = std::make_unique<ConsoleSpanExporterConfiguration>();
 
   return model;
 }
 
-static std::unique_ptr<ZipkinSpanExporterConfiguration> ParseZipkinSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
-{
-  auto model = std::make_unique<ZipkinSpanExporterConfiguration>();
-
-  model->endpoint = node->GetRequiredString("endpoint");
-  model->timeout  = node->GetInteger("timeout", 10000);
-
-  return model;
-}
-
-static std::unique_ptr<ExtensionSpanExporterConfiguration> ParseExtensionSpanExporterConfiguration(
+std::unique_ptr<ExtensionSpanExporterConfiguration>
+ConfigurationParser::ParseExtensionSpanExporterConfiguration(
     const std::string &name,
-    std::unique_ptr<DocumentNode> node)
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionSpanExporterConfiguration>();
 
@@ -1436,8 +1753,8 @@ static std::unique_ptr<ExtensionSpanExporterConfiguration> ParseExtensionSpanExp
   return model;
 }
 
-static std::unique_ptr<SpanExporterConfiguration> ParseSpanExporterConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<SpanExporterConfiguration> ConfigurationParser::ParseSpanExporterConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<SpanExporterConfiguration> model;
 
@@ -1456,7 +1773,7 @@ static std::unique_ptr<SpanExporterConfiguration> ParseSpanExporterConfiguration
   {
     std::string message("Illegal span exporter, properties count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "otlp_http")
@@ -1475,10 +1792,6 @@ static std::unique_ptr<SpanExporterConfiguration> ParseSpanExporterConfiguration
   {
     model = ParseConsoleSpanExporterConfiguration(child);
   }
-  else if (name == "zipkin")
-  {
-    model = ParseZipkinSpanExporterConfiguration(child);
-  }
   else
   {
     model = ParseExtensionSpanExporterConfiguration(name, std::move(child));
@@ -1487,8 +1800,9 @@ static std::unique_ptr<SpanExporterConfiguration> ParseSpanExporterConfiguration
   return model;
 }
 
-static std::unique_ptr<BatchSpanProcessorConfiguration> ParseBatchSpanProcessorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<BatchSpanProcessorConfiguration>
+ConfigurationParser::ParseBatchSpanProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<BatchSpanProcessorConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1504,8 +1818,9 @@ static std::unique_ptr<BatchSpanProcessorConfiguration> ParseBatchSpanProcessorC
   return model;
 }
 
-static std::unique_ptr<SimpleSpanProcessorConfiguration> ParseSimpleSpanProcessorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<SimpleSpanProcessorConfiguration>
+ConfigurationParser::ParseSimpleSpanProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<SimpleSpanProcessorConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1516,9 +1831,10 @@ static std::unique_ptr<SimpleSpanProcessorConfiguration> ParseSimpleSpanProcesso
   return model;
 }
 
-static std::unique_ptr<ExtensionSpanProcessorConfiguration>
-ParseExtensionSpanProcessorConfiguration(const std::string &name,
-                                         std::unique_ptr<DocumentNode> node)
+std::unique_ptr<ExtensionSpanProcessorConfiguration>
+ConfigurationParser::ParseExtensionSpanProcessorConfiguration(
+    const std::string &name,
+    std::unique_ptr<DocumentNode> node) const
 {
   auto model = std::make_unique<ExtensionSpanProcessorConfiguration>();
 
@@ -1528,8 +1844,8 @@ ParseExtensionSpanProcessorConfiguration(const std::string &name,
   return model;
 }
 
-static std::unique_ptr<SpanProcessorConfiguration> ParseSpanProcessorConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<SpanProcessorConfiguration> ConfigurationParser::ParseSpanProcessorConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   std::unique_ptr<SpanProcessorConfiguration> model;
 
@@ -1548,7 +1864,7 @@ static std::unique_ptr<SpanProcessorConfiguration> ParseSpanProcessorConfigurati
   {
     std::string message("Illegal span processor, properties count: ");
     message.append(std::to_string(count));
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   if (name == "batch")
@@ -1567,8 +1883,8 @@ static std::unique_ptr<SpanProcessorConfiguration> ParseSpanProcessorConfigurati
   return model;
 }
 
-static std::unique_ptr<TracerProviderConfiguration> ParseTracerProviderConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<TracerProviderConfiguration> ConfigurationParser::ParseTracerProviderConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<TracerProviderConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1584,7 +1900,7 @@ static std::unique_ptr<TracerProviderConfiguration> ParseTracerProviderConfigura
   if (count == 0)
   {
     std::string message("Illegal tracer provider, 0 processors");
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(node->Location(), message);
   }
 
   child = node->GetChildNode("limits");
@@ -1602,8 +1918,9 @@ static std::unique_ptr<TracerProviderConfiguration> ParseTracerProviderConfigura
   return model;
 }
 
-static std::unique_ptr<StringAttributeValueConfiguration> ParseStringAttributeValueConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<StringAttributeValueConfiguration>
+ConfigurationParser::ParseStringAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<StringAttributeValueConfiguration>();
 
@@ -1612,8 +1929,9 @@ static std::unique_ptr<StringAttributeValueConfiguration> ParseStringAttributeVa
   return model;
 }
 
-static std::unique_ptr<IntegerAttributeValueConfiguration> ParseIntegerAttributeValueConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<IntegerAttributeValueConfiguration>
+ConfigurationParser::ParseIntegerAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<IntegerAttributeValueConfiguration>();
 
@@ -1622,8 +1940,9 @@ static std::unique_ptr<IntegerAttributeValueConfiguration> ParseIntegerAttribute
   return model;
 }
 
-static std::unique_ptr<DoubleAttributeValueConfiguration> ParseDoubleAttributeValueConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<DoubleAttributeValueConfiguration>
+ConfigurationParser::ParseDoubleAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<DoubleAttributeValueConfiguration>();
 
@@ -1632,8 +1951,9 @@ static std::unique_ptr<DoubleAttributeValueConfiguration> ParseDoubleAttributeVa
   return model;
 }
 
-static std::unique_ptr<BooleanAttributeValueConfiguration> ParseBooleanAttributeValueConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<BooleanAttributeValueConfiguration>
+ConfigurationParser::ParseBooleanAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<BooleanAttributeValueConfiguration>();
 
@@ -1642,8 +1962,9 @@ static std::unique_ptr<BooleanAttributeValueConfiguration> ParseBooleanAttribute
   return model;
 }
 
-static std::unique_ptr<StringArrayAttributeValueConfiguration>
-ParseStringArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<StringArrayAttributeValueConfiguration>
+ConfigurationParser::ParseStringArrayAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<StringArrayAttributeValueConfiguration>();
 
@@ -1659,8 +1980,9 @@ ParseStringArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode>
   return model;
 }
 
-static std::unique_ptr<IntegerArrayAttributeValueConfiguration>
-ParseIntegerArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<IntegerArrayAttributeValueConfiguration>
+ConfigurationParser::ParseIntegerArrayAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<IntegerArrayAttributeValueConfiguration>();
 
@@ -1676,8 +1998,9 @@ ParseIntegerArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode>
   return model;
 }
 
-static std::unique_ptr<DoubleArrayAttributeValueConfiguration>
-ParseDoubleArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<DoubleArrayAttributeValueConfiguration>
+ConfigurationParser::ParseDoubleArrayAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<DoubleArrayAttributeValueConfiguration>();
 
@@ -1693,8 +2016,9 @@ ParseDoubleArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode>
   return model;
 }
 
-static std::unique_ptr<BooleanArrayAttributeValueConfiguration>
-ParseBooleanArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<BooleanArrayAttributeValueConfiguration>
+ConfigurationParser::ParseBooleanArrayAttributeValueConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<BooleanArrayAttributeValueConfiguration>();
 
@@ -1710,8 +2034,8 @@ ParseBooleanArrayAttributeValueConfiguration(const std::unique_ptr<DocumentNode>
   return model;
 }
 
-static std::unique_ptr<AttributesConfiguration> ParseAttributesConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<AttributesConfiguration> ConfigurationParser::ParseAttributesConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<AttributesConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1787,7 +2111,7 @@ static std::unique_ptr<AttributesConfiguration> ParseAttributesConfiguration(
     {
       std::string message("Illegal attribute type: ");
       message.append(type);
-      throw InvalidSchemaException(message);
+      throw InvalidSchemaException(node->Location(), message);
     }
 
     std::pair<std::string, std::unique_ptr<AttributeValueConfiguration>> entry(
@@ -1798,8 +2122,8 @@ static std::unique_ptr<AttributesConfiguration> ParseAttributesConfiguration(
   return model;
 }
 
-static std::unique_ptr<ResourceConfiguration> ParseResourceConfiguration(
-    const std::unique_ptr<DocumentNode> &node)
+std::unique_ptr<ResourceConfiguration> ConfigurationParser::ParseResourceConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
 {
   auto model = std::make_unique<ResourceConfiguration>();
   std::unique_ptr<DocumentNode> child;
@@ -1822,6 +2146,33 @@ static std::unique_ptr<ResourceConfiguration> ParseResourceConfiguration(
   return model;
 }
 
+std::unique_ptr<DistributionConfiguration> ConfigurationParser::ParseDistributionConfiguration(
+    const std::unique_ptr<DocumentNode> &node) const
+{
+  auto model = std::make_unique<DistributionConfiguration>();
+
+  for (auto it = node->begin(); it != node->end(); ++it)
+  {
+    std::unique_ptr<DocumentNode> child(*it);
+    std::string name = child->Key();
+
+    auto entry  = std::make_unique<DistributionEntryConfiguration>();
+    entry->name = std::move(name);
+    entry->node = std::move(child);
+
+    model->entries.push_back(std::move(entry));
+  }
+
+  size_t count = model->entries.size();
+  if (count == 0)
+  {
+    std::string message("Illegal distribution, 0 entries");
+    throw InvalidSchemaException(node->Location(), message);
+  }
+
+  return model;
+}
+
 std::unique_ptr<Configuration> ConfigurationParser::Parse(std::unique_ptr<Document> doc)
 {
   std::unique_ptr<DocumentNode> node = doc->GetRootNode();
@@ -1829,7 +2180,43 @@ std::unique_ptr<Configuration> ConfigurationParser::Parse(std::unique_ptr<Docume
   auto model = std::make_unique<Configuration>(std::move(doc));
 
   model->file_format = node->GetRequiredString("file_format");
-  model->disabled    = node->GetBoolean("disabled", false);
+
+  {
+    int count{};
+    int major{};
+    int minor{};
+
+    count = sscanf(model->file_format.c_str(), "%d.%d", &major, &minor);
+    if (count != 2)
+    {
+      std::string message("Invalid file_format");
+      throw InvalidSchemaException(node->Location(), message);
+    }
+
+    if (major != 1)
+    {
+      std::string message("Unsupported file_format, major = ");
+      message.append(std::to_string(major));
+      throw InvalidSchemaException(node->Location(), message);
+    }
+
+    if (minor != 0)
+    {
+      std::string message("Unsupported file_format, major = ");
+      message.append(std::to_string(major));
+      message.append(", minor = ");
+      message.append(std::to_string(minor));
+      throw InvalidSchemaException(node->Location(), message);
+    }
+
+    version_major_ = major;
+    version_minor_ = minor;
+  }
+
+  model->disabled = node->GetBoolean("disabled", false);
+
+  const std::string log_level = node->GetString("log_level", "info");
+  model->log_level            = ParseSeverityNumber(node, log_level);
 
   std::unique_ptr<DocumentNode> child;
 
@@ -1869,6 +2256,14 @@ std::unique_ptr<Configuration> ConfigurationParser::Parse(std::unique_ptr<Docume
     model->resource = ParseResourceConfiguration(child);
   }
 
+  // FIXME: instrumentation/development
+
+  child = node->GetChildNode("distribution");
+  if (child)
+  {
+    model->distribution = ParseDistributionConfiguration(child);
+  }
+
   return model;
 }
 
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/configured_sdk.cc b/deps/opentelemetry-cpp/sdk/src/configuration/configured_sdk.cc
index 3eb81c9e488..0f6c7d564fc 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/configured_sdk.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/configured_sdk.cc
@@ -58,6 +58,8 @@ std::unique_ptr<ConfiguredSdk> ConfiguredSdk::Create(
 
 void ConfiguredSdk::Install()
 {
+  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(log_level);
+
   if (propagator)
   {
     opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(propagator);
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/document_node.cc b/deps/opentelemetry-cpp/sdk/src/configuration/document_node.cc
index bc2bc76f0f8..f5aafe9f76d 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/document_node.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/document_node.cc
@@ -31,14 +31,13 @@ std::string DocumentNode::DoSubstitution(const std::string &text) const
 
   std::string result;
 
-  std::string::size_type current_pos;
-  std::string::size_type begin_pos;
-  std::string::size_type end_pos;
+  std::string::size_type current_pos{};
+  std::string::size_type begin_pos{};
+  std::string::size_type end_pos{};
   std::string copy;
   std::string substitution;
 
-  current_pos = 0;
-  begin_pos   = text.find(begin_token);
+  begin_pos = text.find(begin_token);
 
   while (begin_pos != std::string::npos)
   {
@@ -96,23 +95,23 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
   static std::string env_with_replacement{"env:-"};
   static std::string replacement_token{":-"};
 
-  size_t len = text.length();
-  char c;
-  std::string::size_type begin_name;
-  std::string::size_type end_name;
-  std::string::size_type begin_fallback;
-  std::string::size_type end_fallback;
-  std::string::size_type pos;
+  const std::size_t len{text.length()};
+  char c{};
+  std::string::size_type begin_name{};
+  std::string::size_type end_name{};
+  std::string::size_type begin_fallback{};
+  std::string::size_type end_fallback{};
+  std::string::size_type pos{};
   std::string name;
   std::string fallback;
   std::string sub;
-  bool env_exists;
+  bool env_exists{};
 
   if (len < 4)
   {
     std::string message = illegal_msg;
     message.append(text);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   c = text[0];
@@ -120,7 +119,7 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
   {
     std::string message = illegal_msg;
     message.append(text);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   c = text[1];
@@ -128,7 +127,7 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
   {
     std::string message = illegal_msg;
     message.append(text);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   c = text[len - 1];
@@ -136,7 +135,7 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
   {
     std::string message = illegal_msg;
     message.append(text);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   begin_name = 2;
@@ -160,7 +159,7 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
   {
     std::string message = illegal_msg;
     message.append(text);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   end_name = begin_name + 1;
@@ -195,7 +194,7 @@ std::string DocumentNode::DoOneSubstitution(const std::string &text) const
     {
       std::string message = illegal_msg;
       message.append(text);
-      throw InvalidSchemaException(message);
+      throw InvalidSchemaException(Location(), message);
     }
     // text is of the form ${ENV_NAME:-fallback}
     begin_fallback = pos + replacement_token.length();
@@ -233,7 +232,7 @@ bool DocumentNode::BooleanFromString(const std::string &value) const
 
   std::string message("Illegal boolean value: ");
   message.append(value);
-  throw InvalidSchemaException(message);
+  throw InvalidSchemaException(Location(), message);
 }
 
 size_t DocumentNode::IntegerFromString(const std::string &value) const
@@ -246,7 +245,7 @@ size_t DocumentNode::IntegerFromString(const std::string &value) const
   {
     std::string message("Illegal integer value: ");
     message.append(value);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
   return val;
 }
@@ -261,11 +260,27 @@ double DocumentNode::DoubleFromString(const std::string &value) const
   {
     std::string message("Illegal double value: ");
     message.append(value);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
   return val;
 }
 
+std::string DocumentNodeLocation::ToString() const
+{
+  // Format: <filename>:line-number[column-number](offset)
+  std::string where;
+  where.append("<");
+  where.append(filename);
+  where.append(">:");
+  where.append(std::to_string(line));
+  where.append("[");
+  where.append(std::to_string(col));
+  where.append("](");
+  where.append(std::to_string(offset));
+  where.append(")");
+  return where;
+}
+
 }  // namespace configuration
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document.cc b/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document.cc
index 24968bcc0e8..83a067455e3 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document.cc
@@ -23,46 +23,64 @@ namespace configuration
 
 std::unique_ptr<Document> RymlDocument::Parse(const std::string &source, const std::string &content)
 {
-  ryml::ParserOptions opts;
-  opts.locations(true);
+  auto doc     = std::make_unique<RymlDocument>();
+  const int rc = doc->ParseDocument(source, content);
+  if (rc == 0)
+  {
+    return doc;
+  }
 
-  ryml::Parser::handler_type event_handler;
-  ryml::Parser parser(&event_handler, opts);
+  return nullptr;
+}
+
+int RymlDocument::ParseDocument(const std::string &source, const std::string &content)
+{
+  opts_.locations(true);
+  parser_ = std::make_unique<ryml::Parser>(&event_handler_, opts_);
 
-  ryml::Tree tree;
   ryml::csubstr filename;
   ryml::csubstr csubstr_content;
-  std::unique_ptr<Document> doc;
 
   filename        = ryml::to_csubstr(source);
   csubstr_content = ryml::to_csubstr(content);
 
   try
   {
-    tree = parse_in_arena(&parser, filename, csubstr_content);
-    tree.resolve();
+    tree_ = parse_in_arena(parser_.get(), filename, csubstr_content);
+    tree_.resolve();
   }
   catch (const std::exception &e)
   {
     OTEL_INTERNAL_LOG_ERROR("[Ryml Document] Parse failed with exception: " << e.what());
-    return doc;
+    return 1;
   }
   catch (...)
   {
     OTEL_INTERNAL_LOG_ERROR("[Ryml Document] Parse failed with unknown exception.");
-    return doc;
+    return 2;
   }
 
-  doc = std::make_unique<RymlDocument>(tree);
-  return doc;
+  return 0;
 }
 
 std::unique_ptr<DocumentNode> RymlDocument::GetRootNode()
 {
-  auto node = std::make_unique<RymlDocumentNode>(tree_.rootref(), 0);
+  auto node = std::make_unique<RymlDocumentNode>(this, tree_.rootref(), 0);
   return node;
 }
 
+DocumentNodeLocation RymlDocument::Location(ryml::ConstNodeRef node) const
+{
+  DocumentNodeLocation loc;
+  auto ryml_loc = parser_->location(node);
+  loc.offset    = ryml_loc.offset;
+  loc.line      = ryml_loc.line;
+  loc.col       = ryml_loc.col;
+  loc.filename  = std::string(ryml_loc.name.str, ryml_loc.name.len);
+
+  return loc;
+}
+
 }  // namespace configuration
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document_node.cc b/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document_node.cc
index 286c4f8e5b3..ea5986ee3c5 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document_node.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/ryml_document_node.cc
@@ -5,12 +5,14 @@
 #include <memory>
 #include <ostream>
 #include <ryml.hpp>
+#include <stdexcept>
 #include <string>
 #include <utility>
 
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
+#include "opentelemetry/sdk/configuration/ryml_document.h"
 #include "opentelemetry/sdk/configuration/ryml_document_node.h"
 #include "opentelemetry/version.h"
 
@@ -48,13 +50,18 @@ static void DebugNode(opentelemetry::nostd::string_view name, ryml::ConstNodeRef
 }
 #endif  // WITH_DEBUG_NODE
 
+DocumentNodeLocation RymlDocumentNode::Location() const
+{
+  return doc_->Location(node_);
+}
+
 std::string RymlDocumentNode::Key() const
 {
   OTEL_INTERNAL_LOG_DEBUG("RymlDocumentNode::Key()");
 
   if (!node_.has_key())
   {
-    throw InvalidSchemaException("Yaml: no key");
+    throw InvalidSchemaException(Location(), "Yaml: no key");
   }
 
   ryml::csubstr k = node_.key();
@@ -68,7 +75,7 @@ bool RymlDocumentNode::AsBoolean() const
 
   if (!node_.is_val() && !node_.is_keyval())
   {
-    throw InvalidSchemaException("Yaml: not scalar");
+    throw InvalidSchemaException(Location(), "Yaml: not scalar");
   }
   ryml::csubstr view = node_.val();
   std::string value(view.str, view.len);
@@ -81,7 +88,7 @@ size_t RymlDocumentNode::AsInteger() const
 
   if (!node_.is_val() && !node_.is_keyval())
   {
-    throw InvalidSchemaException("Yaml: not scalar");
+    throw InvalidSchemaException(Location(), "Yaml: not scalar");
   }
   ryml::csubstr view = node_.val();
   std::string value(view.str, view.len);
@@ -94,7 +101,7 @@ double RymlDocumentNode::AsDouble() const
 
   if (!node_.is_val() && !node_.is_keyval())
   {
-    throw InvalidSchemaException("Yaml: not scalar");
+    throw InvalidSchemaException(Location(), "Yaml: not scalar");
   }
   ryml::csubstr view = node_.val();
   std::string value(view.str, view.len);
@@ -107,7 +114,7 @@ std::string RymlDocumentNode::AsString() const
 
   if (!node_.is_val() && !node_.is_keyval())
   {
-    throw InvalidSchemaException("Yaml: not scalar");
+    throw InvalidSchemaException(Location(), "Yaml: not scalar");
   }
   ryml::csubstr view = node_.val();
   std::string value(view.str, view.len);
@@ -120,7 +127,7 @@ ryml::ConstNodeRef RymlDocumentNode::GetRequiredRymlChildNode(const std::string
   {
     std::string message("Yaml: not a map, looking for: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   const char *name_str = name.c_str();
@@ -128,7 +135,7 @@ ryml::ConstNodeRef RymlDocumentNode::GetRequiredRymlChildNode(const std::string
   {
     std::string message("Yaml: required node: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   ryml::ConstNodeRef ryml_child = node_[name_str];
@@ -161,11 +168,11 @@ std::unique_ptr<DocumentNode> RymlDocumentNode::GetRequiredChildNode(const std::
   {
     std::string message("Yaml nested too deeply: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   auto ryml_child = GetRequiredRymlChildNode(name);
-  auto child      = std::make_unique<RymlDocumentNode>(ryml_child, depth_ + 1);
+  auto child      = std::make_unique<RymlDocumentNode>(doc_, ryml_child, depth_ + 1);
   return child;
 }
 
@@ -177,7 +184,7 @@ std::unique_ptr<DocumentNode> RymlDocumentNode::GetChildNode(const std::string &
   {
     std::string message("Yaml nested too deeply: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   std::unique_ptr<DocumentNode> child;
@@ -194,7 +201,7 @@ std::unique_ptr<DocumentNode> RymlDocumentNode::GetChildNode(const std::string &
   }
 
   ryml::ConstNodeRef ryml_child = node_[name_str];
-  child                         = std::make_unique<RymlDocumentNode>(ryml_child, depth_ + 1);
+  child                         = std::make_unique<RymlDocumentNode>(doc_, ryml_child, depth_ + 1);
   return child;
 }
 
@@ -326,7 +333,7 @@ std::string RymlDocumentNode::GetRequiredString(const std::string &name) const
   {
     std::string message("Yaml: string value is empty: ");
     message.append(name);
-    throw InvalidSchemaException(message);
+    throw InvalidSchemaException(Location(), message);
   }
 
   return value;
@@ -359,13 +366,13 @@ DocumentNodeConstIterator RymlDocumentNode::begin() const
 #ifdef WITH_DEBUG_NODE
   DebugNode("::begin()", node_);
 
-  for (int index = 0; index < node_.num_children(); index++)
+  for (long unsigned int index = 0; index < node_.num_children(); index++)
   {
     DebugNode("(child)", node_[index]);
   }
 #endif  // WITH_DEBUG_NODE
 
-  auto impl = std::make_unique<RymlDocumentNodeConstIteratorImpl>(node_, 0, depth_);
+  auto impl = std::make_unique<RymlDocumentNodeConstIteratorImpl>(doc_, node_, 0, depth_);
 
   return DocumentNodeConstIterator(std::move(impl));
 }
@@ -374,8 +381,8 @@ DocumentNodeConstIterator RymlDocumentNode::end() const
 {
   OTEL_INTERNAL_LOG_DEBUG("RymlDocumentNode::end()");
 
-  auto impl =
-      std::make_unique<RymlDocumentNodeConstIteratorImpl>(node_, node_.num_children(), depth_);
+  auto impl = std::make_unique<RymlDocumentNodeConstIteratorImpl>(doc_, node_, node_.num_children(),
+                                                                  depth_);
 
   return DocumentNodeConstIterator(std::move(impl));
 }
@@ -389,7 +396,7 @@ std::unique_ptr<DocumentNode> RymlDocumentNode::GetChild(size_t index) const
 {
   std::unique_ptr<DocumentNode> child;
   ryml::ConstNodeRef ryml_child = node_[index];
-  child                         = std::make_unique<RymlDocumentNode>(ryml_child, depth_ + 1);
+  child                         = std::make_unique<RymlDocumentNode>(doc_, ryml_child, depth_ + 1);
   return child;
 }
 
@@ -400,13 +407,13 @@ PropertiesNodeConstIterator RymlDocumentNode::begin_properties() const
 #ifdef WITH_DEBUG_NODE
   DebugNode("::begin_properties()", node_);
 
-  for (int index = 0; index < node_.num_children(); index++)
+  for (long unsigned int index = 0; index < node_.num_children(); index++)
   {
     DebugNode("(child)", node_[index]);
   }
 #endif  // WITH_DEBUG_NODE
 
-  auto impl = std::make_unique<RymlPropertiesNodeConstIteratorImpl>(node_, 0, depth_);
+  auto impl = std::make_unique<RymlPropertiesNodeConstIteratorImpl>(doc_, node_, 0, depth_);
 
   return PropertiesNodeConstIterator(std::move(impl));
 }
@@ -415,16 +422,17 @@ PropertiesNodeConstIterator RymlDocumentNode::end_properties() const
 {
   OTEL_INTERNAL_LOG_DEBUG("RymlDocumentNode::end_properties()");
 
-  auto impl =
-      std::make_unique<RymlPropertiesNodeConstIteratorImpl>(node_, node_.num_children(), depth_);
+  auto impl = std::make_unique<RymlPropertiesNodeConstIteratorImpl>(doc_, node_,
+                                                                    node_.num_children(), depth_);
 
   return PropertiesNodeConstIterator(std::move(impl));
 }
 
-RymlDocumentNodeConstIteratorImpl::RymlDocumentNodeConstIteratorImpl(ryml::ConstNodeRef parent,
+RymlDocumentNodeConstIteratorImpl::RymlDocumentNodeConstIteratorImpl(const RymlDocument *doc,
+                                                                     ryml::ConstNodeRef parent,
                                                                      size_t index,
                                                                      size_t depth)
-    : parent_(parent), index_(index), depth_(depth)
+    : doc_(doc), parent_(parent), index_(index), depth_(depth)
 {}
 
 RymlDocumentNodeConstIteratorImpl::~RymlDocumentNodeConstIteratorImpl() {}
@@ -440,10 +448,9 @@ std::unique_ptr<DocumentNode> RymlDocumentNodeConstIteratorImpl::Item() const
   ryml::ConstNodeRef ryml_item = parent_[index_];
   if (ryml_item.invalid())
   {
-    // FIXME: runtime exception really
-    throw InvalidSchemaException("iterator is lost");
+    throw std::runtime_error("iterator is lost");
   }
-  item = std::make_unique<RymlDocumentNode>(ryml_item, depth_ + 1);
+  item = std::make_unique<RymlDocumentNode>(doc_, ryml_item, depth_ + 1);
   return item;
 }
 
@@ -454,10 +461,11 @@ bool RymlDocumentNodeConstIteratorImpl::Equal(const DocumentNodeConstIteratorImp
   return index_ == other->index_;
 }
 
-RymlPropertiesNodeConstIteratorImpl::RymlPropertiesNodeConstIteratorImpl(ryml::ConstNodeRef parent,
+RymlPropertiesNodeConstIteratorImpl::RymlPropertiesNodeConstIteratorImpl(const RymlDocument *doc,
+                                                                         ryml::ConstNodeRef parent,
                                                                          size_t index,
                                                                          size_t depth)
-    : parent_(parent), index_(index), depth_(depth)
+    : doc_(doc), parent_(parent), index_(index), depth_(depth)
 {}
 
 RymlPropertiesNodeConstIteratorImpl::~RymlPropertiesNodeConstIteratorImpl() {}
@@ -485,7 +493,7 @@ std::unique_ptr<DocumentNode> RymlPropertiesNodeConstIteratorImpl::Value() const
   std::unique_ptr<DocumentNode> item;
 
   ryml::ConstNodeRef ryml_item = parent_[index_];
-  item                         = std::make_unique<RymlDocumentNode>(ryml_item, depth_ + 1);
+  item                         = std::make_unique<RymlDocumentNode>(doc_, ryml_item, depth_ + 1);
 
   OTEL_INTERNAL_LOG_DEBUG("RymlPropertiesNodeConstIteratorImpl::Value()");
 
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/sdk_builder.cc b/deps/opentelemetry-cpp/sdk/src/configuration/sdk_builder.cc
index 0da1af86dce..17751ba7df7 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/sdk_builder.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/sdk_builder.cc
@@ -101,6 +101,7 @@
 #include "opentelemetry/sdk/configuration/sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/sampler_configuration_visitor.h"
 #include "opentelemetry/sdk/configuration/sdk_builder.h"
+#include "opentelemetry/sdk/configuration/severity_number.h"
 #include "opentelemetry/sdk/configuration/simple_log_record_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/simple_span_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
@@ -116,8 +117,6 @@
 #include "opentelemetry/sdk/configuration/view_configuration.h"
 #include "opentelemetry/sdk/configuration/view_selector_configuration.h"
 #include "opentelemetry/sdk/configuration/view_stream_configuration.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_builder.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
 #include "opentelemetry/sdk/logs/batch_log_record_processor_factory.h"
 #include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
@@ -126,6 +125,7 @@
 #include "opentelemetry/sdk/logs/processor.h"
 #include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
 #include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
+#include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
@@ -156,6 +156,10 @@
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/version.h"
 
+#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
+#  include "opentelemetry/sdk/configuration/exemplar_filter.h"
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
@@ -180,29 +184,31 @@ class ResourceAttributeValueSetter
   void VisitString(
       const opentelemetry::sdk::configuration::StringAttributeValueConfiguration *model) override
   {
-    opentelemetry::common::AttributeValue attribute_value(model->value);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(model->value);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitInteger(
       const opentelemetry::sdk::configuration::IntegerAttributeValueConfiguration *model) override
   {
-    opentelemetry::common::AttributeValue attribute_value(model->value);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    /* Provide exact type to opentelemetry::common::AttributeValue variant. */
+    int64_t value = model->value;
+    opentelemetry::common::AttributeValue attr_value(value);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitDouble(
       const opentelemetry::sdk::configuration::DoubleAttributeValueConfiguration *model) override
   {
-    opentelemetry::common::AttributeValue attribute_value(model->value);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(model->value);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitBoolean(
       const opentelemetry::sdk::configuration::BooleanAttributeValueConfiguration *model) override
   {
-    opentelemetry::common::AttributeValue attribute_value(model->value);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(model->value);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitStringArray(
@@ -222,8 +228,8 @@ class ResourceAttributeValueSetter
 
     nostd::span<const nostd::string_view> span(string_view_array.data(), string_view_array.size());
 
-    opentelemetry::common::AttributeValue attribute_value(span);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(span);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitIntegerArray(
@@ -243,8 +249,8 @@ class ResourceAttributeValueSetter
 
     nostd::span<const int64_t> span(int_array.data(), int_array.size());
 
-    opentelemetry::common::AttributeValue attribute_value(span);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(span);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitDoubleArray(
@@ -257,8 +263,8 @@ class ResourceAttributeValueSetter
 
     nostd::span<const double> span(model->value.data(), model->value.size());
 
-    opentelemetry::common::AttributeValue attribute_value(span);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(span);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   void VisitBooleanArray(
@@ -281,8 +287,8 @@ class ResourceAttributeValueSetter
 
     nostd::span<const bool> span(&bool_array[0], length);
 
-    opentelemetry::common::AttributeValue attribute_value(span);
-    resource_attributes_.SetAttribute(name_, attribute_value);
+    opentelemetry::common::AttributeValue attr_value(span);
+    resource_attributes_.SetAttribute(name_, attr_value);
   }
 
   opentelemetry::common::AttributeValue attribute_value;
@@ -415,12 +421,6 @@ class SpanExporterBuilder
     exporter = sdk_builder_->CreateConsoleSpanExporter(model);
   }
 
-  void VisitZipkin(
-      const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) override
-  {
-    exporter = sdk_builder_->CreateZipkinSpanExporter(model);
-  }
-
   void VisitExtension(
       const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) override
   {
@@ -709,12 +709,8 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> SdkBuilder::CreateAlwaysOnSa
 std::unique_ptr<opentelemetry::sdk::trace::Sampler> SdkBuilder::CreateJaegerRemoteSampler(
     const opentelemetry::sdk::configuration::JaegerRemoteSamplerConfiguration * /* model */) const
 {
-  std::unique_ptr<opentelemetry::sdk::trace::Sampler> sdk;
-
   static const std::string die("JaegerRemoteSampler not supported");
   throw UnsupportedException(die);
-
-  return sdk;
 }
 
 std::unique_ptr<opentelemetry::sdk::trace::Sampler> SdkBuilder::CreateParentBasedSampler(
@@ -827,9 +823,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateOtlpH
     const opentelemetry::sdk::configuration::OtlpHttpSpanExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> sdk;
-  const OtlpHttpSpanExporterBuilder *builder;
-
-  builder = registry_->GetOtlpHttpSpanBuilder();
+  const OtlpHttpSpanExporterBuilder *builder = registry_->GetOtlpHttpSpanBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpHttpSpanExporter() using registered http builder");
@@ -845,9 +839,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateOtlpG
     const opentelemetry::sdk::configuration::OtlpGrpcSpanExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> sdk;
-  const OtlpGrpcSpanExporterBuilder *builder;
-
-  builder = registry_->GetOtlpGrpcSpanBuilder();
+  const OtlpGrpcSpanExporterBuilder *builder = registry_->GetOtlpGrpcSpanBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpGrpcSpanExporter() using registered grpc builder");
@@ -863,9 +855,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateOtlpF
     const opentelemetry::sdk::configuration::OtlpFileSpanExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> sdk;
-  const OtlpFileSpanExporterBuilder *builder;
-
-  builder = registry_->GetOtlpFileSpanBuilder();
+  const OtlpFileSpanExporterBuilder *builder = registry_->GetOtlpFileSpanBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpFileSpanExporter() using registered file builder");
@@ -894,23 +884,6 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateConso
   throw UnsupportedException(die);
 }
 
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateZipkinSpanExporter(
-    const opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *model) const
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> sdk;
-  const ZipkinSpanExporterBuilder *builder = registry_->GetZipkinSpanBuilder();
-
-  if (builder != nullptr)
-  {
-    OTEL_INTERNAL_LOG_DEBUG("CreateZipkinSpanExporter() using registered builder");
-    sdk = builder->Build(model);
-    return sdk;
-  }
-
-  static const std::string die("No builder for ZipkinSpanExporter");
-  throw UnsupportedException(die);
-}
-
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> SdkBuilder::CreateExtensionSpanExporter(
     const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model) const
 {
@@ -1149,11 +1122,11 @@ SdkBuilder::CreatePropagator(
 static opentelemetry::sdk::metrics::InstrumentType ConvertInstrumentType(
     enum opentelemetry::sdk::configuration::InstrumentType config)
 {
-  opentelemetry::sdk::metrics::InstrumentType sdk;
+  opentelemetry::sdk::metrics::InstrumentType sdk{
+      opentelemetry::sdk::metrics::InstrumentType::kCounter};
 
   switch (config)
   {
-    case opentelemetry::sdk::configuration::InstrumentType::none:
     case opentelemetry::sdk::configuration::InstrumentType::counter:
       sdk = opentelemetry::sdk::metrics::InstrumentType::kCounter;
       break;
@@ -1172,19 +1145,49 @@ static opentelemetry::sdk::metrics::InstrumentType ConvertInstrumentType(
     case opentelemetry::sdk::configuration::InstrumentType::up_down_counter:
       sdk = opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter;
       break;
+    case opentelemetry::sdk::configuration::InstrumentType::none:
+    default:
+      sdk = opentelemetry::sdk::metrics::InstrumentType::kCounter;
+      break;
+  }
+
+  return sdk;
+}
+
+#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
+
+static opentelemetry::sdk::metrics::ExemplarFilterType ConvertExemplarFilter(
+    enum opentelemetry::sdk::configuration::ExemplarFilter config)
+{
+  opentelemetry::sdk::metrics::ExemplarFilterType sdk{
+      opentelemetry::sdk::metrics::ExemplarFilterType::kTraceBased};
+
+  switch (config)
+  {
+    case opentelemetry::sdk::configuration::ExemplarFilter::always_on:
+      sdk = opentelemetry::sdk::metrics::ExemplarFilterType::kAlwaysOn;
+      break;
+    case opentelemetry::sdk::configuration::ExemplarFilter::always_off:
+      sdk = opentelemetry::sdk::metrics::ExemplarFilterType::kAlwaysOff;
+      break;
+    case opentelemetry::sdk::configuration::ExemplarFilter::trace_based:
+      sdk = opentelemetry::sdk::metrics::ExemplarFilterType::kTraceBased;
+      break;
+    default:
+      break;
   }
 
   return sdk;
 }
+#endif /* ENABLE_METRICS_EXEMPLAR_PREVIEW */
 
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 SdkBuilder::CreateOtlpHttpPushMetricExporter(
     const opentelemetry::sdk::configuration::OtlpHttpPushMetricExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> sdk;
-  const OtlpHttpPushMetricExporterBuilder *builder;
-
-  builder = registry_->GetOtlpHttpPushMetricExporterBuilder();
+  const OtlpHttpPushMetricExporterBuilder *builder =
+      registry_->GetOtlpHttpPushMetricExporterBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpHttpPushMetricExporter() using registered http builder");
@@ -1201,9 +1204,8 @@ SdkBuilder::CreateOtlpGrpcPushMetricExporter(
     const opentelemetry::sdk::configuration::OtlpGrpcPushMetricExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> sdk;
-  const OtlpGrpcPushMetricExporterBuilder *builder;
-
-  builder = registry_->GetOtlpGrpcPushMetricExporterBuilder();
+  const OtlpGrpcPushMetricExporterBuilder *builder =
+      registry_->GetOtlpGrpcPushMetricExporterBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpGrpcPushMetricExporter() using registered grpc builder");
@@ -1220,9 +1222,8 @@ SdkBuilder::CreateOtlpFilePushMetricExporter(
     const opentelemetry::sdk::configuration::OtlpFilePushMetricExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> sdk;
-  const OtlpFilePushMetricExporterBuilder *builder;
-
-  builder = registry_->GetOtlpFilePushMetricExporterBuilder();
+  const OtlpFilePushMetricExporterBuilder *builder =
+      registry_->GetOtlpFilePushMetricExporterBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpFilePushMetricExporter() using registered file builder");
@@ -1364,6 +1365,11 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> SdkBuilder::CreatePer
     OTEL_INTERNAL_LOG_WARN("metric producer not supported, ignoring");
   }
 
+  if (model->cardinality_limits != nullptr)
+  {
+    OTEL_INTERNAL_LOG_WARN("cardinality limits not supported, ignoring");
+  }
+
   sdk = opentelemetry::sdk::metrics::PeriodicExportingMetricReaderFactory::Create(
       std::move(exporter_sdk), options);
 
@@ -1382,6 +1388,11 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> SdkBuilder::CreatePul
     OTEL_INTERNAL_LOG_WARN("metric producer not supported, ignoring");
   }
 
+  if (model->cardinality_limits != nullptr)
+  {
+    OTEL_INTERNAL_LOG_WARN("cardinality limits not supported, ignoring");
+  }
+
   return sdk;
 }
 
@@ -1521,6 +1532,17 @@ std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> SdkBuilder::CreateMe
     meter_context->AddMetricReader(metric_reader);
   }
 
+#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
+  auto sdk_exemplar_filter = ConvertExemplarFilter(model->exemplar_filter);
+  meter_context->SetExemplarFilter(sdk_exemplar_filter);
+#else
+  /* Do not spam with warnings if disabled anyway. */
+  if (model->exemplar_filter != ExemplarFilter::always_off)
+  {
+    OTEL_INTERNAL_LOG_WARN("ENABLE_METRICS_EXEMPLAR_PREVIEW not set, ignoring exemplar filter");
+  }
+#endif /* ENABLE_METRICS_EXEMPLAR_PREVIEW */
+
   sdk = opentelemetry::sdk::metrics::MeterProviderFactory::Create(std::move(meter_context));
 
   return sdk;
@@ -1531,9 +1553,7 @@ SdkBuilder::CreateOtlpHttpLogRecordExporter(
     const opentelemetry::sdk::configuration::OtlpHttpLogRecordExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> sdk;
-  const OtlpHttpLogRecordExporterBuilder *builder;
-
-  builder = registry_->GetOtlpHttpLogRecordBuilder();
+  const OtlpHttpLogRecordExporterBuilder *builder = registry_->GetOtlpHttpLogRecordBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpHttpLogRecordExporter() using registered http builder");
@@ -1550,9 +1570,7 @@ SdkBuilder::CreateOtlpGrpcLogRecordExporter(
     const opentelemetry::sdk::configuration::OtlpGrpcLogRecordExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> sdk;
-  const OtlpGrpcLogRecordExporterBuilder *builder;
-
-  builder = registry_->GetOtlpGrpcLogRecordBuilder();
+  const OtlpGrpcLogRecordExporterBuilder *builder = registry_->GetOtlpGrpcLogRecordBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpGrpcLogRecordExporter() using registered grpc builder");
@@ -1569,9 +1587,7 @@ SdkBuilder::CreateOtlpFileLogRecordExporter(
     const opentelemetry::sdk::configuration::OtlpFileLogRecordExporterConfiguration *model) const
 {
   std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> sdk;
-  const OtlpFileLogRecordExporterBuilder *builder;
-
-  builder = registry_->GetOtlpFileLogRecordBuilder();
+  const OtlpFileLogRecordExporterBuilder *builder = registry_->GetOtlpFileLogRecordBuilder();
   if (builder != nullptr)
   {
     OTEL_INTERNAL_LOG_DEBUG("CreateOtlpFileLogRecordExporter() using registered file builder");
@@ -1793,11 +1809,56 @@ void SdkBuilder::SetResource(
   }
 }
 
+void SdkBuilder::SetLogLevel(
+    opentelemetry::sdk::common::internal_log::LogLevel &sdk_log_level,
+    opentelemetry::sdk::configuration::SeverityNumber model_log_level) const
+{
+  sdk_log_level = opentelemetry::sdk::common::internal_log::LogLevel::Info;
+
+  switch (model_log_level)
+  {
+    case SeverityNumber::trace:
+    case SeverityNumber::trace2:
+    case SeverityNumber::trace3:
+    case SeverityNumber::trace4:
+    case SeverityNumber::debug:
+    case SeverityNumber::debug2:
+    case SeverityNumber::debug3:
+    case SeverityNumber::debug4:
+      sdk_log_level = opentelemetry::sdk::common::internal_log::LogLevel::Debug;
+      break;
+    case SeverityNumber::info:
+    case SeverityNumber::info2:
+    case SeverityNumber::info3:
+    case SeverityNumber::info4:
+      sdk_log_level = opentelemetry::sdk::common::internal_log::LogLevel::Info;
+      break;
+    case SeverityNumber::warn:
+    case SeverityNumber::warn2:
+    case SeverityNumber::warn3:
+    case SeverityNumber::warn4:
+      sdk_log_level = opentelemetry::sdk::common::internal_log::LogLevel::Warning;
+      break;
+    case SeverityNumber::error:
+    case SeverityNumber::error2:
+    case SeverityNumber::error3:
+    case SeverityNumber::error4:
+    case SeverityNumber::fatal:
+    case SeverityNumber::fatal2:
+    case SeverityNumber::fatal3:
+    case SeverityNumber::fatal4:
+      sdk_log_level = opentelemetry::sdk::common::internal_log::LogLevel::Error;
+      break;
+  }
+}
+
 std::unique_ptr<ConfiguredSdk> SdkBuilder::CreateConfiguredSdk(
     const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model) const
 {
   auto sdk = std::make_unique<ConfiguredSdk>();
 
+  SetLogLevel(sdk->log_level, model->log_level);
+
   if (!model->disabled)
   {
     SetResource(sdk->resource, model->resource);
diff --git a/deps/opentelemetry-cpp/sdk/src/configuration/yaml_configuration_parser.cc b/deps/opentelemetry-cpp/sdk/src/configuration/yaml_configuration_parser.cc
index 627849362e8..26d1213f03f 100644
--- a/deps/opentelemetry-cpp/sdk/src/configuration/yaml_configuration_parser.cc
+++ b/deps/opentelemetry-cpp/sdk/src/configuration/yaml_configuration_parser.cc
@@ -13,6 +13,7 @@
 #include "opentelemetry/sdk/configuration/configuration.h"
 #include "opentelemetry/sdk/configuration/configuration_parser.h"
 #include "opentelemetry/sdk/configuration/document.h"
+#include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
 #include "opentelemetry/sdk/configuration/ryml_document.h"
 #include "opentelemetry/sdk/configuration/yaml_configuration_parser.h"
 #include "opentelemetry/version.h"
@@ -31,8 +32,8 @@ std::unique_ptr<Configuration> YamlConfigurationParser::ParseFile(const std::str
   {
     static std::string env_var_name("OTEL_EXPERIMENTAL_CONFIG_FILE");
     std::string env_var;
-    bool env_exists;
-    env_exists = sdk::common::GetStringEnvironmentVariable(env_var_name.c_str(), env_var);
+    const bool env_exists =
+        sdk::common::GetStringEnvironmentVariable(env_var_name.c_str(), env_var);
 
     if (env_exists)
     {
@@ -66,6 +67,7 @@ std::unique_ptr<Configuration> YamlConfigurationParser::ParseString(const std::s
 {
   std::unique_ptr<Document> doc;
   std::unique_ptr<Configuration> config;
+  ConfigurationParser config_parser;
 
   doc = RymlDocument::Parse(source, content);
 
@@ -73,9 +75,13 @@ std::unique_ptr<Configuration> YamlConfigurationParser::ParseString(const std::s
   {
     if (doc)
     {
-      config = ConfigurationParser::Parse(std::move(doc));
+      config = config_parser.Parse(std::move(doc));
     }
   }
+  catch (const InvalidSchemaException &e)
+  {
+    OTEL_INTERNAL_LOG_ERROR(e.Where() << ": " << e.what());
+  }
   catch (const std::exception &e)
   {
     OTEL_INTERNAL_LOG_ERROR(
diff --git a/deps/opentelemetry-cpp/sdk/src/logs/BUILD b/deps/opentelemetry-cpp/sdk/src/logs/BUILD
index 8c3e44e2052..2ac88900a87 100644
--- a/deps/opentelemetry-cpp/sdk/src/logs/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/logs/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/logs/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/src/logs/CMakeLists.txt
index e8737821592..338fa8e8f15 100644
--- a/deps/opentelemetry-cpp/sdk/src/logs/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/src/logs/CMakeLists.txt
@@ -14,6 +14,7 @@ add_library(
   simple_log_record_processor.cc
   simple_log_record_processor_factory.cc
   batch_log_record_processor.cc
+  batch_log_record_processor_options.cc
   batch_log_record_processor_factory.cc
   logger_config.cc
   logger_context.cc
diff --git a/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor.cc b/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor.cc
index a656ef1f640..8a03e44d7dc 100644
--- a/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor.cc
+++ b/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor.cc
@@ -255,7 +255,7 @@ void BatchLogRecordProcessor::Export()
   do
   {
     std::vector<std::unique_ptr<Recordable>> records_arr;
-    size_t num_records_to_export;
+    size_t num_records_to_export{};
     std::uint64_t notify_force_flush =
         synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire);
     if (notify_force_flush)
diff --git a/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor_options.cc b/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor_options.cc
new file mode 100644
index 00000000000..f339c31b8f2
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/src/logs/batch_log_record_processor_options.cc
@@ -0,0 +1,75 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+
+#include "opentelemetry/sdk/common/env_variables.h"
+#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace logs
+{
+namespace batch_log_record_processor_options_env
+{
+
+// Environment variable names
+static constexpr const char *kMaxQueueSizeEnv       = "OTEL_BLRP_MAX_QUEUE_SIZE";
+static constexpr const char *kScheduleDelayEnv      = "OTEL_BLRP_SCHEDULE_DELAY";
+static constexpr const char *kExportTimeoutEnv      = "OTEL_BLRP_EXPORT_TIMEOUT";
+static constexpr const char *kMaxExportBatchSizeEnv = "OTEL_BLRP_MAX_EXPORT_BATCH_SIZE";
+
+// Default values
+static constexpr size_t kDefaultMaxQueueSize       = 2048;
+static constexpr size_t kDefaultMaxExportBatchSize = 512;
+
+size_t GetMaxQueueSizeFromEnv()
+{
+  std::uint32_t value{};
+  if (!opentelemetry::sdk::common::GetUintEnvironmentVariable(kMaxQueueSizeEnv, value))
+  {
+    return kDefaultMaxQueueSize;
+  }
+  return static_cast<size_t>(value);
+}
+
+std::chrono::milliseconds GetScheduleDelayFromEnv()
+{
+  static const std::chrono::milliseconds kDefaultScheduleDelay{1000};
+  std::chrono::system_clock::duration duration{0};
+  if (!opentelemetry::sdk::common::GetDurationEnvironmentVariable(kScheduleDelayEnv, duration))
+  {
+    return kDefaultScheduleDelay;
+  }
+  return std::chrono::duration_cast<std::chrono::milliseconds>(duration);
+}
+
+std::chrono::milliseconds GetExportTimeoutFromEnv()
+{
+  static const std::chrono::milliseconds kDefaultExportTimeout{30000};
+  std::chrono::system_clock::duration duration{0};
+  if (!opentelemetry::sdk::common::GetDurationEnvironmentVariable(kExportTimeoutEnv, duration))
+  {
+    return kDefaultExportTimeout;
+  }
+  return std::chrono::duration_cast<std::chrono::milliseconds>(duration);
+}
+
+size_t GetMaxExportBatchSizeFromEnv()
+{
+  std::uint32_t value{};
+  if (!opentelemetry::sdk::common::GetUintEnvironmentVariable(kMaxExportBatchSizeEnv, value))
+  {
+    return kDefaultMaxExportBatchSize;
+  }
+  return static_cast<size_t>(value);
+}
+
+}  // namespace batch_log_record_processor_options_env
+}  // namespace logs
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/BUILD b/deps/opentelemetry-cpp/sdk/src/metrics/BUILD
index aa8ed74b458..be1bdc73de5 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/src/metrics/CMakeLists.txt
index 73abddc16a7..c156aa6fb58 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(
   meter_context.cc
   meter_context_factory.cc
   metric_reader.cc
+  multi_observer_result.cc
   instrument_metadata_validator.cc
   export/periodic_exporting_metric_reader.cc
   export/periodic_exporting_metric_reader_factory.cc
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc b/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc
index c91e86c4a70..aaac9a0d0ee 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc
@@ -310,9 +310,11 @@ std::unique_ptr<Aggregation> Base2ExponentialHistogramAggregation::Merge(
     auto neg_max_index =
         (std::max)(low_res.negative_buckets_->EndIndex(), high_res.negative_buckets_->EndIndex());
 
-    if (static_cast<size_t>(pos_max_index) >
+    // The range [pos_min_index, pos_max_index] contains (pos_max_index - pos_min_index + 1)
+    // buckets. We need to downscale if this count exceeds max_buckets_.
+    if (static_cast<size_t>(pos_max_index) >=
             static_cast<size_t>(pos_min_index) + result_value.max_buckets_ ||
-        static_cast<size_t>(neg_max_index) >
+        static_cast<size_t>(neg_max_index) >=
             static_cast<size_t>(neg_min_index) + result_value.max_buckets_)
     {
       // We need to downscale the buckets to fit into the new max_buckets_.
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc b/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc
index a46a2775e5d..20c4dad7c0c 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc
@@ -33,7 +33,7 @@ int32_t MapToIndexScaleZero(double value)
   // Note: std::frexp() rounds submnormal values to the smallest normal value and returns an
   // exponent corresponding to fractions in the range [0.5, 1), whereas an exponent for the range
   // [1, 2), so subtract 1 from the exponent immediately.
-  int exp;
+  int exp{};
   double frac = std::frexp(value, &exp);
   exp--;
 
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/deps/opentelemetry-cpp/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
index 099b9ac122f..215526505b1 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
@@ -43,8 +43,7 @@ PeriodicExportingMetricReader::PeriodicExportingMetricReader(
     : exporter_{std::move(exporter)},
       export_interval_millis_{options.export_interval_millis},
       export_timeout_millis_{options.export_timeout_millis},
-      worker_thread_instrumentation_(nullptr),
-      collect_thread_instrumentation_(nullptr)
+      worker_thread_instrumentation_(nullptr)
 {
   if (export_interval_millis_ <= export_timeout_millis_)
   {
@@ -63,8 +62,7 @@ PeriodicExportingMetricReader::PeriodicExportingMetricReader(
     : exporter_{std::move(exporter)},
       export_interval_millis_{options.export_interval_millis},
       export_timeout_millis_{options.export_timeout_millis},
-      worker_thread_instrumentation_(runtime_options.periodic_thread_instrumentation),
-      collect_thread_instrumentation_(runtime_options.collect_thread_instrumentation)
+      worker_thread_instrumentation_(runtime_options.periodic_thread_instrumentation)
 {
   if (export_interval_millis_ <= export_timeout_millis_)
   {
@@ -161,13 +159,6 @@ bool PeriodicExportingMetricReader::CollectAndExportOnce()
   try
   {
 #endif
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (collect_thread_instrumentation_ != nullptr)
-    {
-      collect_thread_instrumentation_->OnStart();
-      collect_thread_instrumentation_->BeforeLoad();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
     auto start = std::chrono::steady_clock::now();
     this->Collect([this, &start](ResourceMetrics &metric_data) {
       auto end = std::chrono::steady_clock::now();
@@ -182,13 +173,6 @@ bool PeriodicExportingMetricReader::CollectAndExportOnce()
       return true;
     });
 
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (collect_thread_instrumentation_ != nullptr)
-    {
-      collect_thread_instrumentation_->AfterLoad();
-      collect_thread_instrumentation_->OnEnd();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
 #if OPENTELEMETRY_HAVE_EXCEPTIONS
   }
   catch (std::exception &e)
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/meter.cc b/deps/opentelemetry-cpp/sdk/src/metrics/meter.cc
index d7974d75907..475f8a9c131 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/meter.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/meter.cc
@@ -44,6 +44,10 @@
 #  include "opentelemetry/sdk/metrics/exemplar/reservoir_utils.h"
 #endif
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+#  include "opentelemetry/metrics/meter.h"
+#endif
+
 namespace
 {
 
@@ -663,6 +667,21 @@ std::vector<MetricData> Meter::Collect(CollectorHandle *collector,
   return metric_data_list;
 }
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+uintptr_t Meter::RegisterCallback(
+    opentelemetry::metrics::MultiObservableCallbackPtr callback,
+    void *state,
+    nostd::span<opentelemetry::metrics::ObservableInstrument *> instruments) noexcept
+{
+  return observable_registry_->AddCallback(callback, state, instruments);
+}
+
+void Meter::DeregisterCallback(uintptr_t callback_id) noexcept
+{
+  observable_registry_->RemoveCallback(callback_id);
+}
+#endif
+
 // Implementation of the log message recommended by the SDK specification for duplicate instruments.
 // See
 // https://github.com/open-telemetry/opentelemetry-specification/blob/9c8c30631b0e288de93df7452f91ed47f6fba330/specification/metrics/sdk.md?plain=1#L882
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/multi_observer_result.cc b/deps/opentelemetry-cpp/sdk/src/metrics/multi_observer_result.cc
new file mode 100644
index 00000000000..a8ea0d177a0
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/multi_observer_result.cc
@@ -0,0 +1,154 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <cstddef>
+#include <cstdint>
+#include <ostream>
+#include <unordered_map>
+#include <utility>
+
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/metrics/async_instruments.h"
+#include "opentelemetry/sdk/metrics/multi_observer_result.h"
+#include "opentelemetry/sdk/metrics/observer_result.h"
+#include "opentelemetry/sdk/metrics/state/metric_storage.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace metrics
+{
+
+namespace
+{
+struct StoreResultVisitor
+{
+  void operator()(ObserverResultT<int64_t> &result) const
+  {
+    storage->RecordLong(result.GetMeasurements(), collection_ts);
+  }
+
+  void operator()(ObserverResultT<double> &result) const
+  {
+    storage->RecordDouble(result.GetMeasurements(), collection_ts);
+  }
+
+  void operator()(const nostd::monostate &) const {}
+
+  AsyncWritableMetricStorage *storage;
+  opentelemetry::common::SystemTimestamp collection_ts;
+};
+}  // namespace
+
+void MultiObserverResult::RegisterInstrument(
+    opentelemetry::metrics::ObservableInstrument *instrument)
+{
+  observer_results_.emplace(instrument, nostd::monostate());
+}
+
+void MultiObserverResult::DeregisterInstrument(
+    opentelemetry::metrics::ObservableInstrument *instrument)
+{
+  observer_results_.erase(instrument);
+}
+
+size_t MultiObserverResult::InstrumentCount() const
+{
+  return observer_results_.size();
+}
+
+bool MultiObserverResult::HasInstrument(
+    const opentelemetry::metrics::ObservableInstrument *instrument) const
+{
+  return observer_results_.find(const_cast<opentelemetry::metrics::ObservableInstrument *>(
+             instrument)) != observer_results_.end();
+}
+
+void MultiObserverResult::GetInstruments(
+    nostd::function_ref<void(opentelemetry::metrics::ObservableInstrument *)> callback)
+{
+  for (auto &el : observer_results_)
+  {
+    callback(el.first);
+  }
+}
+
+void MultiObserverResult::Reset()
+{
+  for (auto it = observer_results_.begin(); it != observer_results_.end(); ++it)
+  {
+    it->second = nostd::monostate();
+  }
+}
+
+void MultiObserverResult::StoreResults(opentelemetry::common::SystemTimestamp collection_ts)
+{
+  for (auto &el : observer_results_)
+  {
+    auto *instrument = el.first;
+    auto &result     = el.second;
+
+    auto storage = static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(instrument)
+                       ->GetMetricStorage();
+    nostd::visit(StoreResultVisitor{storage, collection_ts}, result);
+  }
+}
+
+opentelemetry::metrics::ObserverResultT<double> &MultiObserverResult::ForInstrumentDouble(
+    const opentelemetry::metrics::ObservableInstrument *instrument)
+{
+  static opentelemetry::sdk::metrics::ObserverResultT<double> null_result;
+  // const_cast is appropriate here, because we're _not_ modifying the passed-in pointer;
+  // we just need to make it non-const to be able to look it up in our map.
+  auto it = observer_results_.find(
+      const_cast<opentelemetry::metrics::ObservableInstrument *>(instrument));
+  if (it == observer_results_.end())
+  {
+    OTEL_INTERNAL_LOG_ERROR("[MultiObserverResult::ForInstrumentDouble]"
+                            << "The instrument is not registered on with callback");
+    return null_result;
+  }
+  auto *inner = nostd::get_if<ObserverResultT<double>>(&it->second);
+  if (inner == nullptr)
+  {
+    return it->second.emplace<ObserverResultT<double>>();
+  }
+  else
+  {
+    return *inner;
+  }
+}
+
+opentelemetry::metrics::ObserverResultT<int64_t> &MultiObserverResult::ForInstrumentInt64(
+    const opentelemetry::metrics::ObservableInstrument *instrument)
+{
+  static opentelemetry::sdk::metrics::ObserverResultT<int64_t> null_result;
+  auto it = observer_results_.find(
+      const_cast<opentelemetry::metrics::ObservableInstrument *>(instrument));
+  if (it == observer_results_.end())
+  {
+    OTEL_INTERNAL_LOG_ERROR("[MultiObserverResult::ForInstrumentInt64]"
+                            << "The instrument is not registered on with callback");
+    return null_result;
+  }
+
+  auto *inner = nostd::get_if<ObserverResultT<int64_t>>(&it->second);
+  if (inner == nullptr)
+  {
+    return it->second.emplace<ObserverResultT<int64_t>>();
+  }
+  else
+  {
+    return *inner;
+  }
+}
+
+}  // namespace metrics
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/state/observable_registry.cc b/deps/opentelemetry-cpp/sdk/src/metrics/state/observable_registry.cc
index d8d6afb01ba..025e263f251 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/state/observable_registry.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/state/observable_registry.cc
@@ -1,24 +1,24 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <algorithm>
 #include <cstdint>
 #include <mutex>
-#include <ostream>
+#include <unordered_map>
 #include <utility>
-#include <vector>
 
+#include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/metrics/async_instruments.h"
+#include "opentelemetry/metrics/meter.h"
 #include "opentelemetry/metrics/observer_result.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/metrics/async_instruments.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/observer_result.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
+#include "opentelemetry/sdk/metrics/multi_observer_result.h"
 #include "opentelemetry/sdk/metrics/state/observable_registry.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -26,16 +26,59 @@ namespace sdk
 {
 namespace metrics
 {
+struct ObservableCallbackRecord
+{
+  ObservableCallbackRecord(opentelemetry::metrics::ObservableCallbackPtr callback,
+                           void *state,
+                           opentelemetry::metrics::ObservableInstrument *instrument)
+      : callback(callback), state(state)
+  {
+    observable_result.RegisterInstrument(static_cast<ObservableInstrument *>(instrument));
+  }
+
+  ObservableCallbackRecord(opentelemetry::metrics::MultiObservableCallbackPtr callback,
+                           void *state,
+                           nostd::span<opentelemetry::metrics::ObservableInstrument *> instruments)
+      : callback(callback), state(state)
+  {
+    for (auto *instrument : instruments)
+    {
+      observable_result.RegisterInstrument(static_cast<ObservableInstrument *>(instrument));
+    }
+  }
+
+  nostd::variant<opentelemetry::metrics::ObservableCallbackPtr,
+                 opentelemetry::metrics::MultiObservableCallbackPtr>
+      callback;
+  void *state;
+  MultiObserverResult observable_result;
+};
+
+ObservableRegistry::ObservableRegistry()  = default;
+ObservableRegistry::~ObservableRegistry() = default;
 
 void ObservableRegistry::AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
                                      void *state,
                                      opentelemetry::metrics::ObservableInstrument *instrument)
 {
-  // TBD - Check if existing
-  std::unique_ptr<ObservableCallbackRecord> record(
-      new ObservableCallbackRecord{callback, state, instrument});
+  auto record = std::make_unique<ObservableCallbackRecord>(callback, state, instrument);
+  auto token  = reinterpret_cast<uintptr_t>(record.get());
+
   std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  callbacks_.push_back(std::move(record));
+  callbacks_.insert({token, std::move(record)});
+}
+
+uintptr_t ObservableRegistry::AddCallback(
+    opentelemetry::metrics::MultiObservableCallbackPtr callback,
+    void *state,
+    nostd::span<opentelemetry::metrics::ObservableInstrument *> instruments)
+{
+  auto record = std::make_unique<ObservableCallbackRecord>(callback, state, instruments);
+  auto token  = reinterpret_cast<uintptr_t>(record.get());
+
+  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
+  callbacks_.insert({token, std::move(record)});
+  return token;
 }
 
 void ObservableRegistry::RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
@@ -43,65 +86,143 @@ void ObservableRegistry::RemoveCallback(opentelemetry::metrics::ObservableCallba
                                         opentelemetry::metrics::ObservableInstrument *instrument)
 {
   std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  auto new_end = std::remove_if(
-      callbacks_.begin(), callbacks_.end(),
-      [callback, state, instrument](const std::unique_ptr<ObservableCallbackRecord> &record) {
-        return record->callback == callback && record->state == state &&
-               record->instrument == instrument;
-      });
-  callbacks_.erase(new_end, callbacks_.end());
+  for (auto it = callbacks_.begin(); it != callbacks_.end();)
+  {
+    const auto &record = it->second;
+    // Remove the callback if it's registered with the the single-instrument signature
+    auto observable_callback_ptr =
+        nostd::get_if<opentelemetry::metrics::ObservableCallbackPtr>(&record->callback);
+    if (observable_callback_ptr && *observable_callback_ptr == callback && record->state == state &&
+        record->observable_result.HasInstrument(instrument))
+    {
+      it = callbacks_.erase(it);
+    }
+    else
+    {
+      ++it;
+    }
+  }
 }
 
-void ObservableRegistry::CleanupCallback(opentelemetry::metrics::ObservableInstrument *instrument)
+void ObservableRegistry::RemoveCallback(uintptr_t id)
 {
   std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  auto iter = std::remove_if(callbacks_.begin(), callbacks_.end(),
-                             [instrument](const std::unique_ptr<ObservableCallbackRecord> &record) {
-                               return record->instrument == instrument;
-                             });
-  callbacks_.erase(iter, callbacks_.end());
+  callbacks_.erase(id);
 }
 
-void ObservableRegistry::Observe(opentelemetry::common::SystemTimestamp collection_ts)
+void ObservableRegistry::CleanupCallback(opentelemetry::metrics::ObservableInstrument *instrument)
 {
-  static DefaultAttributesProcessor default_attribute_processor;
   std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  for (auto &callback_wrap : callbacks_)
+  auto sdk_instrument = static_cast<ObservableInstrument *>(instrument);
+  for (auto it = callbacks_.begin(); it != callbacks_.end();)
   {
-    auto value_type =
-        static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(callback_wrap->instrument)
-            ->GetInstrumentDescriptor()
-            .value_type_;
-    auto storage =
-        static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(callback_wrap->instrument)
-            ->GetMetricStorage();
-    if (!storage)
+    // Remove the instrument from the multi-callback when the instrument is destroyed
+    it->second->observable_result.DeregisterInstrument(sdk_instrument);
+
+    // If the multi-callback has no instruments left, remove it from the registry
+    if (it->second->observable_result.InstrumentCount() == 0)
     {
-      OTEL_INTERNAL_LOG_ERROR("[ObservableRegistry::Observe] - Error during observe."
-                              << "The metric storage is invalid");
-      return;
+      it = callbacks_.erase(it);
     }
-    if (value_type == InstrumentValueType::kDouble)
+    else
     {
-      nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>> ob_res(
-          new opentelemetry::sdk::metrics::ObserverResultT<double>(&default_attribute_processor));
-      callback_wrap->callback(ob_res, callback_wrap->state);
-      storage->RecordDouble(
-          static_cast<opentelemetry::sdk::metrics::ObserverResultT<double> *>(ob_res.get())
-              ->GetMeasurements(),
-          collection_ts);
+      ++it;
     }
-    else
+  }
+}
+
+namespace
+{
+
+template <typename T>
+class ObserverResultTAdapter : public opentelemetry::metrics::ObserverResultT<T>
+{
+public:
+  ObserverResultTAdapter(opentelemetry::metrics::ObserverResultT<T> *inner) : inner(inner) {}
+
+  void Observe(T value) noexcept override
+  {
+    if (inner)
     {
-      nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>> ob_res(
-          new opentelemetry::sdk::metrics::ObserverResultT<int64_t>(&default_attribute_processor));
-      callback_wrap->callback(ob_res, callback_wrap->state);
-      storage->RecordLong(
-          static_cast<opentelemetry::sdk::metrics::ObserverResultT<int64_t> *>(ob_res.get())
-              ->GetMeasurements(),
-          collection_ts);
+      inner->Observe(value);
     }
   }
+  void Observe(T value, const opentelemetry::common::KeyValueIterable &attributes) noexcept override
+  {
+    if (inner)
+    {
+      inner->Observe(value, attributes);
+    }
+  }
+  opentelemetry::metrics::ObserverResultT<T> *inner;
+};
+
+struct InvokeCallbackVisitor
+{
+  void operator()(const opentelemetry::metrics::ObservableCallbackPtr &callback)
+  {
+    record->observable_result.GetInstruments(
+        [&](opentelemetry::metrics::ObservableInstrument *instrument) {
+          auto value_type =
+              static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(instrument)
+                  ->GetInstrumentDescriptor()
+                  .value_type_;
+          if (value_type == InstrumentValueType::kDouble)
+          {
+            invoke_single_instrument_callback<double>(callback, instrument);
+          }
+          else
+          {
+            invoke_single_instrument_callback<int64_t>(callback, instrument);
+          }
+        });
+  }
+  void operator()(const opentelemetry::metrics::MultiObservableCallbackPtr &callback)
+  {
+    callback(record->observable_result, record->state);
+  }
+
+  template <typename T>
+  void invoke_single_instrument_callback(
+      const opentelemetry::metrics::ObservableCallbackPtr &callback,
+      opentelemetry::metrics::ObservableInstrument *instrument)
+  {
+    // This is all a bit strangely shaped, but it's in the name of back-compat.
+    // The signature of ObservableCallbackPtr is that it takes a nostd::shared_ptr to
+    // an abstract ObserverResultT. The new implementation of ObservableRegistry doesn't
+    // actually need to box the ObserverResultT's into a shared_ptr, but we need to construct
+    // such a shared_ptr here in order to invoke the callback with the old signature.
+    // MultiObserverResult::ForInstrument returns a reference to an abstract ObserverResultT,
+    // which is allocated inside record->observable_result; thus, we need to allocate a wrapper
+    // around that which can be on the heap in the shared_ptr.
+    ObserverResultTAdapter<T> *adapter =
+        new ObserverResultTAdapter<T>(&record->observable_result.ForInstrument<T>(instrument));
+    opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<T>> result_wrapper(
+        adapter);
+    callback(result_wrapper, record->state);
+    // It's possible that callback() holds the shared_ptr after we return here. The reference to
+    // the actual ObserverResultT inside record->observable_result might not be valid for the full
+    // lifetime of that shared_ptr. So, null it out.
+    // (yes, that means the shared_ptr will now no longer _do_ anything, but it didn't in the old
+    // implementation either; the only requirement here is using the shared_ptr doesn't crash).
+    adapter->inner = nullptr;
+  }
+
+  ObservableCallbackRecord *record;
+};
+}  // namespace
+
+void ObservableRegistry::Observe(opentelemetry::common::SystemTimestamp collection_ts)
+{
+  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
+  for (const auto &pair : callbacks_)
+  {
+    auto &cb_record = pair.second;
+    cb_record->observable_result.Reset();
+    // Visitor will either invoke the single-instrument or multi-instrument form of the callback
+    nostd::visit(InvokeCallbackVisitor{cb_record.get()}, cb_record->callback);
+    cb_record->observable_result.StoreResults(collection_ts);
+  }
 }
 
 }  // namespace metrics
diff --git a/deps/opentelemetry-cpp/sdk/src/metrics/state/temporal_metric_storage.cc b/deps/opentelemetry-cpp/sdk/src/metrics/state/temporal_metric_storage.cc
index 9e991f73f94..29be34a8eaa 100644
--- a/deps/opentelemetry-cpp/sdk/src/metrics/state/temporal_metric_storage.cc
+++ b/deps/opentelemetry-cpp/sdk/src/metrics/state/temporal_metric_storage.cc
@@ -67,7 +67,7 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
     metric_data.end_ts                  = collection_ts;
 
     // Direct conversion of delta metrics to point data
-    delta_metrics->GetAllEnteries(
+    delta_metrics->GetAllEntries(
         [&metric_data](const MetricAttributes &attributes, Aggregation &aggregation) {
           PointDataAttributes point_data_attr;
           point_data_attr.point_data = aggregation.ToPoint();
@@ -102,7 +102,7 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
                                                 : kAggregationCardinalityLimit));
   for (auto &agg_hashmap : unreported_list)
   {
-    agg_hashmap->GetAllEnteries(
+    agg_hashmap->GetAllEntries(
         [&merged_metrics, this](const MetricAttributes &attributes, Aggregation &aggregation) {
           auto agg = merged_metrics->Get(attributes);
           if (agg)
@@ -135,7 +135,7 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
     if (aggregation_temporarily == AggregationTemporality::kCumulative)
     {
       // merge current delta to previous cumulative
-      last_aggr_hashmap->GetAllEnteries(
+      last_aggr_hashmap->GetAllEntries(
           [&merged_metrics, this](const MetricAttributes &attributes, Aggregation &aggregation) {
             auto agg = merged_metrics->Get(attributes);
             if (agg)
@@ -172,7 +172,7 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
   metric_data.aggregation_temporality = aggregation_temporarily;
   metric_data.start_ts                = last_collection_ts;
   metric_data.end_ts                  = collection_ts;
-  result_to_export->GetAllEnteries(
+  result_to_export->GetAllEntries(
       [&metric_data](const MetricAttributes &attributes, Aggregation &aggregation) {
         PointDataAttributes point_data_attr;
         point_data_attr.point_data = aggregation.ToPoint();
diff --git a/deps/opentelemetry-cpp/sdk/src/resource/BUILD b/deps/opentelemetry-cpp/sdk/src/resource/BUILD
index 88456299901..e73e4c059ac 100644
--- a/deps/opentelemetry-cpp/sdk/src/resource/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/resource/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/BUILD b/deps/opentelemetry-cpp/sdk/src/trace/BUILD
index 7262a1c0a03..b5ed27a1aaf 100644
--- a/deps/opentelemetry-cpp/sdk/src/trace/BUILD
+++ b/deps/opentelemetry-cpp/sdk/src/trace/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/src/trace/CMakeLists.txt
index 5d7a36dbf5e..95eb541e203 100644
--- a/deps/opentelemetry-cpp/sdk/src/trace/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/src/trace/CMakeLists.txt
@@ -13,6 +13,7 @@ add_library(
   provider.cc
   batch_span_processor.cc
   batch_span_processor_factory.cc
+  batch_span_processor_options.cc
   simple_processor_factory.cc
   samplers/always_on_factory.cc
   samplers/always_off_factory.cc
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor.cc b/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor.cc
index ad93eae7aec..7991929779b 100644
--- a/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor.cc
+++ b/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor.cc
@@ -245,7 +245,7 @@ void BatchSpanProcessor::Export()
   do
   {
     std::vector<std::unique_ptr<Recordable>> spans_arr;
-    size_t num_records_to_export;
+    size_t num_records_to_export{};
     std::uint64_t notify_force_flush =
         synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire);
     if (notify_force_flush)
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor_options.cc b/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor_options.cc
new file mode 100644
index 00000000000..e935a40350d
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/src/trace/batch_span_processor_options.cc
@@ -0,0 +1,75 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+
+#include "opentelemetry/sdk/common/env_variables.h"
+#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace trace
+{
+namespace batch_span_processor_options_env
+{
+
+// Environment variable names
+static constexpr const char *kMaxQueueSizeEnv       = "OTEL_BSP_MAX_QUEUE_SIZE";
+static constexpr const char *kScheduleDelayEnv      = "OTEL_BSP_SCHEDULE_DELAY";
+static constexpr const char *kExportTimeoutEnv      = "OTEL_BSP_EXPORT_TIMEOUT";
+static constexpr const char *kMaxExportBatchSizeEnv = "OTEL_BSP_MAX_EXPORT_BATCH_SIZE";
+
+// Default values
+static constexpr size_t kDefaultMaxQueueSize       = 2048;
+static constexpr size_t kDefaultMaxExportBatchSize = 512;
+
+size_t GetMaxQueueSizeFromEnv()
+{
+  std::uint32_t value{};
+  if (!opentelemetry::sdk::common::GetUintEnvironmentVariable(kMaxQueueSizeEnv, value))
+  {
+    return kDefaultMaxQueueSize;
+  }
+  return static_cast<size_t>(value);
+}
+
+std::chrono::milliseconds GetScheduleDelayFromEnv()
+{
+  static const std::chrono::milliseconds kDefaultScheduleDelay{5000};
+  std::chrono::system_clock::duration duration{0};
+  if (!opentelemetry::sdk::common::GetDurationEnvironmentVariable(kScheduleDelayEnv, duration))
+  {
+    return kDefaultScheduleDelay;
+  }
+  return std::chrono::duration_cast<std::chrono::milliseconds>(duration);
+}
+
+std::chrono::milliseconds GetExportTimeoutFromEnv()
+{
+  static const std::chrono::milliseconds kDefaultExportTimeout{30000};
+  std::chrono::system_clock::duration duration{0};
+  if (!opentelemetry::sdk::common::GetDurationEnvironmentVariable(kExportTimeoutEnv, duration))
+  {
+    return kDefaultExportTimeout;
+  }
+  return std::chrono::duration_cast<std::chrono::milliseconds>(duration);
+}
+
+size_t GetMaxExportBatchSizeFromEnv()
+{
+  std::uint32_t value{};
+  if (!opentelemetry::sdk::common::GetUintEnvironmentVariable(kMaxExportBatchSizeEnv, value))
+  {
+    return kDefaultMaxExportBatchSize;
+  }
+  return static_cast<size_t>(value);
+}
+
+}  // namespace batch_span_processor_options_env
+}  // namespace trace
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/samplers/trace_id_ratio.cc b/deps/opentelemetry-cpp/sdk/src/trace/samplers/trace_id_ratio.cc
index 6d7009fedff..9a9b31b9779 100644
--- a/deps/opentelemetry-cpp/sdk/src/trace/samplers/trace_id_ratio.cc
+++ b/deps/opentelemetry-cpp/sdk/src/trace/samplers/trace_id_ratio.cc
@@ -41,7 +41,8 @@ uint64_t CalculateThreshold(double ratio) noexcept
   // For probabilities >= 1-(2^-54), the product wraps to zero!
   // Instead, calculate the high and low 32 bits separately.
   const double product = UINT32_MAX * ratio;
-  double hi_bits, lo_bits = ldexp(modf(product, &hi_bits), 32) + product;
+  double hi_bits{};
+  double lo_bits = ldexp(modf(product, &hi_bits), 32) + product;
   return (static_cast<uint64_t>(hi_bits) << 32) + static_cast<uint64_t>(lo_bits);
 }
 
diff --git a/deps/opentelemetry-cpp/sdk/src/trace/tracer.cc b/deps/opentelemetry-cpp/sdk/src/trace/tracer.cc
index 263638955b5..4a689bbcd7b 100644
--- a/deps/opentelemetry-cpp/sdk/src/trace/tracer.cc
+++ b/deps/opentelemetry-cpp/sdk/src/trace/tracer.cc
@@ -116,6 +116,10 @@ nostd::shared_ptr<opentelemetry::trace::Span> Tracer::StartSpan(
   {
     flags |= opentelemetry::trace::TraceFlags::kIsSampled;
   }
+  else
+  {
+    flags &= ~opentelemetry::trace::TraceFlags::kIsSampled;
+  }
 
 #if 1
   /* https://github.com/open-telemetry/opentelemetry-specification as of v1.29.0 */
diff --git a/deps/opentelemetry-cpp/sdk/src/version/version.cc b/deps/opentelemetry-cpp/sdk/src/version/version.cc
index fb343dc0f52..9e4df5f573b 100644
--- a/deps/opentelemetry-cpp/sdk/src/version/version.cc
+++ b/deps/opentelemetry-cpp/sdk/src/version/version.cc
@@ -12,13 +12,13 @@ namespace sdk
 namespace version
 {
 const int major_version    = 1;
-const int minor_version    = 23;
+const int minor_version    = 25;
 const int patch_version    = 0;
 const char *pre_release    = "";
 const char *build_metadata = "none";
-const char *short_version  = "1.23.0";
-const char *full_version   = "1.23.0";
-const char *build_date     = "Thu Sep 25 07:47:31 PM UTC 2025";
+const char *short_version  = "1.25.0";
+const char *full_version   = "1.25.0";
+const char *build_date     = "Sat Feb  7 10:29:31 AM UTC 2026";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/test/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/test/CMakeLists.txt
index 33dd07f81af..dd957fae1f5 100644
--- a/deps/opentelemetry-cpp/sdk/test/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/test/CMakeLists.txt
@@ -7,3 +7,7 @@ add_subdirectory(metrics)
 add_subdirectory(logs)
 add_subdirectory(resource)
 add_subdirectory(instrumentationscope)
+
+if(WITH_CONFIGURATION)
+  add_subdirectory(configuration)
+endif()
diff --git a/deps/opentelemetry-cpp/sdk/test/common/BUILD b/deps/opentelemetry-cpp/sdk/test/common/BUILD
index de4c02ec560..2d792d4af68 100644
--- a/deps/opentelemetry-cpp/sdk/test/common/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/common/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 cc_test(
diff --git a/deps/opentelemetry-cpp/sdk/test/common/env_var_test.cc b/deps/opentelemetry-cpp/sdk/test/common/env_var_test.cc
index b4cc0d2e12e..dc89bb40d8b 100644
--- a/deps/opentelemetry-cpp/sdk/test/common/env_var_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/common/env_var_test.cc
@@ -34,7 +34,7 @@ TEST(EnvVarTest, BoolEnvVar)
   setenv("BOOL_ENV_VAR_F3", "FaLsE", 1);
   setenv("BOOL_ENV_VAR_BROKEN", "Maybe ?", 1);
 
-  bool exists;
+  bool exists{};
   bool value = true;
 
   exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_NONE", value);
@@ -97,7 +97,7 @@ TEST(EnvVarTest, StringEnvVar)
   setenv("STRING_ENV_VAR_EMPTY", "", 1);
   setenv("STRING_ENV_VAR", "my string", 1);
 
-  bool exists;
+  bool exists{};
   std::string value;
 
   exists = GetStringEnvironmentVariable("STRING_ENV_VAR_NONE", value);
@@ -130,7 +130,7 @@ TEST(EnvVarTest, DurationEnvVar)
   setenv("DURATION_ENV_VAR_BROKEN_1", "123 ms", 1);
   setenv("DURATION_ENV_VAR_BROKEN_2", "1mississippi", 1);
 
-  bool exists;
+  bool exists{};
   std::chrono::system_clock::duration poison;
   std::chrono::system_clock::duration value;
   std::chrono::system_clock::duration expected;
@@ -231,7 +231,7 @@ TEST(EnvVarTest, UintEnvVar)
   setenv("UINT_ENV_VAR_WITH_NOISE", "   \t \n 9.12345678.9", 1);
   setenv("UINT_ENV_VAR_ONLY_SPACES", "   ", 1);
 
-  std::uint32_t value;
+  std::uint32_t value{};
 
   ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NONE", value));
 
@@ -295,7 +295,7 @@ TEST(EnvVarTest, FloatEnvVar)
   setenv("FLOAT_ENV_VAR_WITH_NOISE", "   \t \n 9.12345678.9", 1);
   setenv("FLOAT_ENV_VAR_ONLY_SPACES", "   ", 1);
 
-  float value;
+  float value{};
 
   ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NONE", value));
 
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/BUILD b/deps/opentelemetry-cpp/sdk/test/configuration/BUILD
new file mode 100644
index 00000000000..f9cd843105c
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/BUILD
@@ -0,0 +1,144 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
+cc_test(
+    name = "yaml_logs_test",
+    srcs = [
+        "yaml_logs_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_metrics_test",
+    srcs = [
+        "yaml_metrics_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_propagator_test",
+    srcs = [
+        "yaml_propagator_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_resource_test",
+    srcs = [
+        "yaml_resource_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_test",
+    srcs = [
+        "yaml_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_trace_test",
+    srcs = [
+        "yaml_trace_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_test(
+    name = "yaml_distribution_test",
+    srcs = [
+        "yaml_distribution_test.cc",
+    ],
+    tags = [
+        "test",
+        "yaml",
+    ],
+    deps = [
+        "//api",
+        "//sdk:headers",
+        "//sdk/src/configuration",
+        "//sdk/src/logs",
+        "//sdk/src/metrics",
+        "//sdk/src/trace",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/test/configuration/CMakeLists.txt
new file mode 100644
index 00000000000..38ae21b19dc
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+foreach(
+  testname
+  yaml_logs_test
+  yaml_metrics_test
+  yaml_propagator_test
+  yaml_resource_test
+  yaml_test
+  yaml_trace_test
+  yaml_distribution_test)
+  add_executable(${testname} "${testname}.cc")
+  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
+                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_configuration)
+  gtest_add_tests(
+    TARGET ${testname}
+    TEST_PREFIX trace.
+    TEST_LIST ${testname})
+endforeach()
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_distribution_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_distribution_test.cc
new file mode 100644
index 00000000000..4b1e7ebf863
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_distribution_test.cc
@@ -0,0 +1,107 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <gtest/gtest.h>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "opentelemetry/sdk/configuration/configuration.h"
+#include "opentelemetry/sdk/configuration/distribution_configuration.h"
+#include "opentelemetry/sdk/configuration/distribution_entry_configuration.h"
+#include "opentelemetry/sdk/configuration/document_node.h"
+#include "opentelemetry/sdk/configuration/yaml_configuration_parser.h"
+
+static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(
+    const std::string &yaml)
+{
+  static const std::string source("test");
+  return opentelemetry::sdk::configuration::YamlConfigurationParser::ParseString(source, yaml);
+}
+
+TEST(YamlTrace, empty_distribution)
+{
+  std::string yaml = R"(
+file_format: "1.0-distribution"
+distribution:
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(YamlTrace, one_empty_distribution)
+{
+  std::string yaml = R"(
+file_format: "1.0-distribution"
+distribution:
+  acme_vendor:
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_NE(config, nullptr);
+  auto *distribution = config->distribution.get();
+  ASSERT_NE(distribution, nullptr);
+  ASSERT_EQ(distribution->entries.size(), 1);
+  auto *entry = distribution->entries[0].get();
+  ASSERT_NE(entry, nullptr);
+  ASSERT_EQ(entry->name, "acme_vendor");
+}
+
+TEST(YamlTrace, many_distribution)
+{
+  std::string yaml = R"(
+file_format: "1.0-distribution"
+distribution:
+  acme_vendor:
+    a: 12
+    b: 34
+    c: 56
+  other_vendor:
+    xxx: 111
+    yyy: 222
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_NE(config, nullptr);
+  auto *distribution = config->distribution.get();
+  ASSERT_NE(distribution, nullptr);
+  ASSERT_EQ(distribution->entries.size(), 2);
+  opentelemetry::sdk::configuration::DocumentNode *node;
+  std::unique_ptr<opentelemetry::sdk::configuration::DocumentNode> property;
+  std::string name;
+
+  auto *entry_1 = distribution->entries[0].get();
+  ASSERT_NE(entry_1, nullptr);
+  ASSERT_EQ(entry_1->name, "acme_vendor");
+
+  node = entry_1->node.get();
+  ASSERT_NE(node, nullptr);
+  auto it  = node->begin();
+  property = (*it);
+  ASSERT_NE(property, nullptr);
+  name = property->Key();
+  ASSERT_EQ(name, "a");
+  ASSERT_EQ(property->AsInteger(), 12);
+  ++it;
+  property = (*it);
+  ASSERT_NE(property, nullptr);
+  name = property->Key();
+  ASSERT_EQ(name, "b");
+  ASSERT_EQ(property->AsInteger(), 34);
+  ++it;
+  property = (*it);
+  ASSERT_NE(property, nullptr);
+  name = property->Key();
+  ASSERT_EQ(name, "c");
+  ASSERT_EQ(property->AsInteger(), 56);
+  ++it;
+  ASSERT_EQ(node->end(), it);
+
+  auto *entry_2 = distribution->entries[1].get();
+  ASSERT_NE(entry_2, nullptr);
+  ASSERT_EQ(entry_2->name, "other_vendor");
+
+  node = entry_2->node.get();
+  ASSERT_NE(node, nullptr);
+}
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_logs_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_logs_test.cc
index b38c7c58ed6..e3e93ee9ddf 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_logs_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_logs_test.cc
@@ -9,7 +9,9 @@
 
 #include "opentelemetry/sdk/configuration/batch_log_record_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/logger_provider_configuration.h"
@@ -30,7 +32,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlLogs, no_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
 )";
 
@@ -41,7 +43,7 @@ file_format: xx.yy
 TEST(YamlLogs, empty_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
 )";
@@ -53,7 +55,7 @@ file_format: xx.yy
 TEST(YamlLogs, many_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -73,7 +75,7 @@ file_format: xx.yy
 TEST(YamlLogs, simple_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -98,7 +100,7 @@ file_format: xx.yy
 TEST(YamlLogs, default_batch_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - batch:
@@ -127,7 +129,7 @@ file_format: xx.yy
 TEST(YamlLogs, batch_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - batch:
@@ -160,7 +162,7 @@ file_format: xx.yy
 TEST(YamlLogs, default_otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -185,9 +187,7 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpHttpLogRecordExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "");
-  ASSERT_EQ(otlp_http->client_key_file, "");
-  ASSERT_EQ(otlp_http->client_certificate_file, "");
+  ASSERT_EQ(otlp_http->tls, nullptr);
   ASSERT_EQ(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers_list, "");
   ASSERT_EQ(otlp_http->compression, "");
@@ -198,16 +198,17 @@ file_format: xx.yy
 TEST(YamlLogs, otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
         exporter:
           otlp_http:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
             headers:
               - name: foo
                 value: "123"
@@ -235,9 +236,10 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpHttpLogRecordExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_http->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_http->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_http->tls, nullptr);
+  ASSERT_EQ(otlp_http->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_http->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_http->tls->cert_file, "cert_file");
   ASSERT_NE(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_http->headers->kv_map["foo"], "123");
@@ -251,7 +253,7 @@ file_format: xx.yy
 TEST(YamlLogs, default_otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -276,29 +278,28 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpGrpcLogRecordExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "");
-  ASSERT_EQ(otlp_grpc->client_key_file, "");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "");
+  ASSERT_EQ(otlp_grpc->tls, nullptr);
   ASSERT_EQ(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers_list, "");
   ASSERT_EQ(otlp_grpc->compression, "");
   ASSERT_EQ(otlp_grpc->timeout, 10000);
-  ASSERT_EQ(otlp_grpc->insecure, false);
 }
 
 TEST(YamlLogs, otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
         exporter:
           otlp_grpc:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
+              insecure: true
             headers:
               - name: foo
                 value: "123"
@@ -307,7 +308,6 @@ file_format: xx.yy
             headers_list: "baz=789"
             compression: "compression"
             timeout: 5000
-            insecure: true
 )";
 
   auto config = DoParse(yaml);
@@ -326,9 +326,11 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpGrpcLogRecordExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_grpc->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_grpc->tls, nullptr);
+  ASSERT_EQ(otlp_grpc->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_grpc->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_grpc->tls->cert_file, "cert_file");
+  ASSERT_EQ(otlp_grpc->tls->insecure, true);
   ASSERT_NE(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_grpc->headers->kv_map["foo"], "123");
@@ -336,13 +338,12 @@ file_format: xx.yy
   ASSERT_EQ(otlp_grpc->headers_list, "baz=789");
   ASSERT_EQ(otlp_grpc->compression, "compression");
   ASSERT_EQ(otlp_grpc->timeout, 5000);
-  ASSERT_EQ(otlp_grpc->insecure, true);
 }
 
 TEST(YamlLogs, default_otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -371,7 +372,7 @@ file_format: xx.yy
 TEST(YamlLogs, otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -401,7 +402,7 @@ file_format: xx.yy
 TEST(YamlLogs, otlp_console)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -426,7 +427,7 @@ file_format: xx.yy
 TEST(YamlLogs, no_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -443,7 +444,7 @@ file_format: xx.yy
 TEST(YamlLogs, default_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -463,7 +464,7 @@ file_format: xx.yy
 TEST(YamlLogs, limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_metrics_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_metrics_test.cc
index 4b202c2cf1c..5dff4e674c1 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_metrics_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_metrics_test.cc
@@ -8,10 +8,14 @@
 #include <vector>
 
 #include "opentelemetry/sdk/configuration/base2_exponential_bucket_histogram_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/cardinality_limits_configuration.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
 #include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
+#include "opentelemetry/sdk/configuration/exemplar_filter.h"
 #include "opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
 #include "opentelemetry/sdk/configuration/instrument_type.h"
 #include "opentelemetry/sdk/configuration/meter_provider_configuration.h"
@@ -25,6 +29,7 @@
 #include "opentelemetry/sdk/configuration/pull_metric_reader_configuration.h"
 #include "opentelemetry/sdk/configuration/string_array_configuration.h"
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
+#include "opentelemetry/sdk/configuration/translation_strategy.h"
 #include "opentelemetry/sdk/configuration/view_configuration.h"
 #include "opentelemetry/sdk/configuration/view_selector_configuration.h"
 #include "opentelemetry/sdk/configuration/view_stream_configuration.h"
@@ -40,7 +45,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlMetrics, no_readers)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
 )";
 
@@ -51,7 +56,7 @@ file_format: xx.yy
 TEST(YamlMetrics, empty_readers)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
 )";
@@ -63,7 +68,7 @@ file_format: xx.yy
 TEST(YamlMetrics, many_readers)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -83,7 +88,7 @@ file_format: xx.yy
 TEST(YamlMetrics, default_periodic_reader)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -94,6 +99,8 @@ file_format: xx.yy
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
   ASSERT_NE(config->meter_provider, nullptr);
+  ASSERT_EQ(config->meter_provider->exemplar_filter,
+            opentelemetry::sdk::configuration::ExemplarFilter::trace_based);
   ASSERT_EQ(config->meter_provider->readers.size(), 1);
   auto *reader = config->meter_provider->readers[0].get();
   ASSERT_NE(reader, nullptr);
@@ -105,12 +112,14 @@ file_format: xx.yy
   ASSERT_NE(periodic->exporter, nullptr);
   auto *exporter = periodic->exporter.get();
   ASSERT_NE(exporter, nullptr);
+  auto *cardinality_limits = periodic->cardinality_limits.get();
+  ASSERT_EQ(cardinality_limits, nullptr);
 }
 
 TEST(YamlMetrics, periodic_reader)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -118,11 +127,23 @@ file_format: xx.yy
         timeout: 15000
         exporter:
           console:
+        cardinality_limits:
+          default: 100
+          counter: 200
+          gauge: 300
+          histogram: 400
+          observable_counter: 500
+          observable_gauge: 600
+          observable_up_down_counter: 700
+          up_down_counter: 800
+  exemplar_filter: always_on
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
   ASSERT_NE(config->meter_provider, nullptr);
+  ASSERT_EQ(config->meter_provider->exemplar_filter,
+            opentelemetry::sdk::configuration::ExemplarFilter::always_on);
   ASSERT_EQ(config->meter_provider->readers.size(), 1);
   auto *reader = config->meter_provider->readers[0].get();
   ASSERT_NE(reader, nullptr);
@@ -134,22 +155,73 @@ file_format: xx.yy
   ASSERT_NE(periodic->exporter, nullptr);
   auto *exporter = periodic->exporter.get();
   ASSERT_NE(exporter, nullptr);
+  auto *cardinality_limits = periodic->cardinality_limits.get();
+  ASSERT_NE(cardinality_limits, nullptr);
+  ASSERT_EQ(cardinality_limits->default_limit, 100);
+  ASSERT_EQ(cardinality_limits->counter, 200);
+  ASSERT_EQ(cardinality_limits->gauge, 300);
+  ASSERT_EQ(cardinality_limits->histogram, 400);
+  ASSERT_EQ(cardinality_limits->observable_counter, 500);
+  ASSERT_EQ(cardinality_limits->observable_gauge, 600);
+  ASSERT_EQ(cardinality_limits->observable_up_down_counter, 700);
+  ASSERT_EQ(cardinality_limits->up_down_counter, 800);
+}
+
+TEST(YamlMetrics, default_pull_reader)
+{
+  std::string yaml = R"(
+file_format: "1.0-metrics"
+meter_provider:
+  readers:
+    - pull:
+        exporter:
+          prometheus/development:
+  exemplar_filter: always_off
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_NE(config, nullptr);
+  ASSERT_NE(config->meter_provider, nullptr);
+  ASSERT_EQ(config->meter_provider->exemplar_filter,
+            opentelemetry::sdk::configuration::ExemplarFilter::always_off);
+  ASSERT_EQ(config->meter_provider->readers.size(), 1);
+  auto *reader = config->meter_provider->readers[0].get();
+  ASSERT_NE(reader, nullptr);
+  auto *pull =
+      reinterpret_cast<opentelemetry::sdk::configuration::PullMetricReaderConfiguration *>(reader);
+  ASSERT_NE(pull->exporter, nullptr);
+  auto *exporter = pull->exporter.get();
+  ASSERT_NE(exporter, nullptr);
+  auto *cardinality_limits = pull->cardinality_limits.get();
+  ASSERT_EQ(cardinality_limits, nullptr);
 }
 
 TEST(YamlMetrics, pull_reader)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - pull:
         exporter:
           prometheus/development:
+        cardinality_limits:
+          default: 100
+          counter: 200
+          gauge: 300
+          histogram: 400
+          observable_counter: 500
+          observable_gauge: 600
+          observable_up_down_counter: 700
+          up_down_counter: 800
+  exemplar_filter: trace_based
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
   ASSERT_NE(config->meter_provider, nullptr);
+  ASSERT_EQ(config->meter_provider->exemplar_filter,
+            opentelemetry::sdk::configuration::ExemplarFilter::trace_based);
   ASSERT_EQ(config->meter_provider->readers.size(), 1);
   auto *reader = config->meter_provider->readers[0].get();
   ASSERT_NE(reader, nullptr);
@@ -158,12 +230,22 @@ file_format: xx.yy
   ASSERT_NE(pull->exporter, nullptr);
   auto *exporter = pull->exporter.get();
   ASSERT_NE(exporter, nullptr);
+  auto *cardinality_limits = pull->cardinality_limits.get();
+  ASSERT_NE(cardinality_limits, nullptr);
+  ASSERT_EQ(cardinality_limits->default_limit, 100);
+  ASSERT_EQ(cardinality_limits->counter, 200);
+  ASSERT_EQ(cardinality_limits->gauge, 300);
+  ASSERT_EQ(cardinality_limits->histogram, 400);
+  ASSERT_EQ(cardinality_limits->observable_counter, 500);
+  ASSERT_EQ(cardinality_limits->observable_gauge, 600);
+  ASSERT_EQ(cardinality_limits->observable_up_down_counter, 700);
+  ASSERT_EQ(cardinality_limits->up_down_counter, 800);
 }
 
 TEST(YamlMetrics, default_otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -187,9 +269,7 @@ file_format: xx.yy
   auto *otlp_http = reinterpret_cast<
       opentelemetry::sdk::configuration::OtlpHttpPushMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "");
-  ASSERT_EQ(otlp_http->client_key_file, "");
-  ASSERT_EQ(otlp_http->client_certificate_file, "");
+  ASSERT_EQ(otlp_http->tls, nullptr);
   ASSERT_EQ(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers_list, "");
   ASSERT_EQ(otlp_http->compression, "");
@@ -205,16 +285,17 @@ file_format: xx.yy
 TEST(YamlMetrics, otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
         exporter:
           otlp_http:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
             headers:
               - name: foo
                 value: "123"
@@ -243,9 +324,10 @@ file_format: xx.yy
   auto *otlp_http = reinterpret_cast<
       opentelemetry::sdk::configuration::OtlpHttpPushMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_http->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_http->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_http->tls, nullptr);
+  ASSERT_EQ(otlp_http->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_http->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_http->tls->cert_file, "cert_file");
   ASSERT_NE(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_http->headers->kv_map["foo"], "123");
@@ -264,7 +346,7 @@ file_format: xx.yy
 TEST(YamlMetrics, default_otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -288,9 +370,7 @@ file_format: xx.yy
   auto *otlp_grpc = reinterpret_cast<
       opentelemetry::sdk::configuration::OtlpGrpcPushMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "");
-  ASSERT_EQ(otlp_grpc->client_key_file, "");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "");
+  ASSERT_EQ(otlp_grpc->tls, nullptr);
   ASSERT_EQ(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers_list, "");
   ASSERT_EQ(otlp_grpc->compression, "");
@@ -300,22 +380,23 @@ file_format: xx.yy
   ASSERT_EQ(
       otlp_grpc->default_histogram_aggregation,
       opentelemetry::sdk::configuration::DefaultHistogramAggregation::explicit_bucket_histogram);
-  ASSERT_EQ(otlp_grpc->insecure, false);
 }
 
 TEST(YamlMetrics, otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
         exporter:
           otlp_grpc:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
+              insecure: true
             headers:
               - name: foo
                 value: "123"
@@ -326,7 +407,6 @@ file_format: xx.yy
             timeout: 5000
             temporality_preference: delta
             default_histogram_aggregation: base2_exponential_bucket_histogram
-            insecure: true
 )";
 
   auto config = DoParse(yaml);
@@ -344,9 +424,11 @@ file_format: xx.yy
   auto *otlp_grpc = reinterpret_cast<
       opentelemetry::sdk::configuration::OtlpGrpcPushMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_grpc->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_grpc->tls, nullptr);
+  ASSERT_EQ(otlp_grpc->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_grpc->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_grpc->tls->cert_file, "cert_file");
+  ASSERT_EQ(otlp_grpc->tls->insecure, true);
   ASSERT_NE(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_grpc->headers->kv_map["foo"], "123");
@@ -359,13 +441,12 @@ file_format: xx.yy
   ASSERT_EQ(otlp_grpc->default_histogram_aggregation,
             opentelemetry::sdk::configuration::DefaultHistogramAggregation::
                 base2_exponential_bucket_histogram);
-  ASSERT_EQ(otlp_grpc->insecure, true);
 }
 
 TEST(YamlMetrics, default_otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -398,7 +479,7 @@ file_format: xx.yy
 TEST(YamlMetrics, otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -434,7 +515,7 @@ file_format: xx.yy
 TEST(YamlMetrics, default_console)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -473,7 +554,7 @@ file_format: xx.yy
 TEST(YamlMetrics, console)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -514,7 +595,7 @@ file_format: xx.yy
 TEST(YamlMetrics, default_prometheus)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - pull:
@@ -537,15 +618,17 @@ file_format: xx.yy
       opentelemetry::sdk::configuration::PrometheusPullMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(prometheus->host, "localhost");
   ASSERT_EQ(prometheus->port, 9464);
-  ASSERT_EQ(prometheus->without_units, false);
-  ASSERT_EQ(prometheus->without_type_suffix, false);
   ASSERT_EQ(prometheus->without_scope_info, false);
+  ASSERT_EQ(prometheus->without_target_info, false);
+  ASSERT_EQ(prometheus->translation_strategy,
+            opentelemetry::sdk::configuration::TranslationStrategy::UnderscoreEscapingWithSuffixes);
+  ASSERT_EQ(prometheus->with_resource_constant_labels, nullptr);
 }
 
 TEST(YamlMetrics, prometheus)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - pull:
@@ -553,9 +636,15 @@ file_format: xx.yy
           prometheus/development:
             host: "prometheus"
             port: 1234
-            without_units: true
-            without_type_suffix: true
             without_scope_info: true
+            without_target_info: true
+            translation_strategy: NoUTF8EscapingWithSuffixes
+            with_resource_constant_labels:
+              included:
+                - "foo.in"
+                - "bar.in"
+              excluded:
+                - "baz.ex"
 )";
 
   auto config = DoParse(yaml);
@@ -573,15 +662,24 @@ file_format: xx.yy
       opentelemetry::sdk::configuration::PrometheusPullMetricExporterConfiguration *>(exporter);
   ASSERT_EQ(prometheus->host, "prometheus");
   ASSERT_EQ(prometheus->port, 1234);
-  ASSERT_EQ(prometheus->without_units, true);
-  ASSERT_EQ(prometheus->without_type_suffix, true);
   ASSERT_EQ(prometheus->without_scope_info, true);
+  ASSERT_EQ(prometheus->without_target_info, true);
+  ASSERT_EQ(prometheus->translation_strategy,
+            opentelemetry::sdk::configuration::TranslationStrategy::NoUTF8EscapingWithSuffixes);
+  ASSERT_NE(prometheus->with_resource_constant_labels, nullptr);
+  ASSERT_NE(prometheus->with_resource_constant_labels->included, nullptr);
+  ASSERT_EQ(prometheus->with_resource_constant_labels->included->string_array.size(), 2);
+  ASSERT_EQ(prometheus->with_resource_constant_labels->included->string_array[0], "foo.in");
+  ASSERT_EQ(prometheus->with_resource_constant_labels->included->string_array[1], "bar.in");
+  ASSERT_NE(prometheus->with_resource_constant_labels->excluded, nullptr);
+  ASSERT_EQ(prometheus->with_resource_constant_labels->excluded->string_array.size(), 1);
+  ASSERT_EQ(prometheus->with_resource_constant_labels->excluded->string_array[0], "baz.ex");
 }
 
 TEST(YamlMetrics, empty_views)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -599,7 +697,7 @@ file_format: xx.yy
 TEST(YamlMetrics, default_views)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -635,7 +733,7 @@ file_format: xx.yy
 TEST(YamlMetrics, selector)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -677,7 +775,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -716,7 +814,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_default)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -744,7 +842,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_drop)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -772,7 +870,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_explicit_bucket_histogram)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -814,7 +912,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_base2_exponential_bucket_histogram)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -852,7 +950,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_last_value)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -880,7 +978,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_aggregation_sum)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
@@ -908,7 +1006,7 @@ file_format: xx.yy
 TEST(YamlMetrics, stream_attribute_keys)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-metrics"
 meter_provider:
   readers:
     - periodic:
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_propagator_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_propagator_test.cc
index cba8bde4dad..78daf6dfae2 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_propagator_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_propagator_test.cc
@@ -20,7 +20,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlPropagator, empty_propagator)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
 )";
 
@@ -34,7 +34,7 @@ file_format: xx.yy
 TEST(YamlPropagator, empty_composite)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
 )";
@@ -50,7 +50,7 @@ TEST(YamlPropagator, old_propagator_1)
 {
   // This is the old format, must fail
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
     - foo
@@ -65,7 +65,7 @@ TEST(YamlPropagator, old_propagator_2)
 {
   // This is the old format, must fail
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite: [foo, bar]
 )";
@@ -77,7 +77,7 @@ file_format: xx.yy
 TEST(YamlPropagator, propagator_array_ok)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
     - foo:
@@ -98,7 +98,7 @@ file_format: xx.yy
 TEST(YamlPropagator, propagator_array_broken)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
     - foo:
@@ -113,7 +113,7 @@ file_format: xx.yy
 TEST(YamlPropagator, propagator_composite_list)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite_list: "foo,bar,baz"
 )";
@@ -128,7 +128,7 @@ file_format: xx.yy
 TEST(YamlPropagator, propagator_both)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
     - aaa:
@@ -150,7 +150,7 @@ file_format: xx.yy
 TEST(YamlPropagator, propagator_duplicates)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-propagator"
 propagator:
   composite:
     - aaa:
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_resource_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_resource_test.cc
index 69386928e34..87685277afb 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_resource_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_resource_test.cc
@@ -26,7 +26,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlResource, empty_resource)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
 )";
 
@@ -41,7 +41,7 @@ file_format: xx.yy
 TEST(YamlResource, empty_attributes)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes:
 )";
@@ -57,7 +57,7 @@ TEST(YamlResource, some_attributes_0_10)
 {
   // This is the old 0.10 format, must fail
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes:
     foo: "1234"
@@ -72,7 +72,7 @@ TEST(YamlResource, some_attributes_0_30)
 {
   // This is the new 0.30 format, must pass
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes:
    - name: foo
@@ -111,7 +111,7 @@ file_format: xx.yy
 TEST(YamlResource, empty_attributes_list)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes_list:
 )";
@@ -125,7 +125,7 @@ file_format: xx.yy
 TEST(YamlResource, some_attributes_list)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes_list: "foo=1234,bar=5678"
 )";
@@ -140,7 +140,7 @@ TEST(YamlResource, both_0_10)
 {
   // This is the old 0.10 format, must fail
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes:
     foo: "1234"
@@ -156,7 +156,7 @@ TEST(YamlResource, both_0_30)
 {
   // This is the new 0.30 format, must pass
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   attributes:
    - name: foo
@@ -198,7 +198,7 @@ file_format: xx.yy
 TEST(YamlResource, empty_detectors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   detectors:
 )";
@@ -214,7 +214,7 @@ file_format: xx.yy
 TEST(YamlResource, empty_included_detectors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   detectors:
     included:
@@ -232,7 +232,7 @@ file_format: xx.yy
 TEST(YamlResource, some_included_detectors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   detectors:
     included:
@@ -254,7 +254,7 @@ file_format: xx.yy
 TEST(YamlResource, some_excluded_detectors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   detectors:
     excluded:
@@ -276,7 +276,7 @@ file_format: xx.yy
 TEST(YamlResource, some_detectors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-resource"
 resource:
   detectors:
     included:
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_test.cc
index 6a62f654297..9b8f2212f9c 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_test.cc
@@ -12,6 +12,12 @@
 #include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
 #include "opentelemetry/sdk/configuration/yaml_configuration_parser.h"
 
+#if defined(_MSC_VER)
+#  include "opentelemetry/sdk/common/env_variables.h"
+using opentelemetry::sdk::common::setenv;
+using opentelemetry::sdk::common::unsetenv;
+#endif
+
 static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(
     const std::string &yaml)
 {
@@ -37,59 +43,109 @@ TEST(Yaml, no_format)
   ASSERT_EQ(config, nullptr);
 }
 
+TEST(Yaml, broken_format)
+{
+  std::string yaml = R"(
+file_format: "xx.yy"
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(Yaml, broken_minor_format)
+{
+  std::string yaml = R"(
+file_format: "1.yy"
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(Yaml, unsupported_old_format)
+{
+  std::string yaml = R"(
+file_format: "0.99"
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(Yaml, unsupported_new_major_format)
+{
+  std::string yaml = R"(
+file_format: "2.0"
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(Yaml, unsupported_new_minor_format)
+{
+  std::string yaml = R"(
+file_format: "1.1"
+)";
+
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
 TEST(Yaml, just_format)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-rc.1"
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0-rc.1");
 }
 
 TEST(Yaml, disabled)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 disabled: true
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0");
   ASSERT_EQ(config->disabled, true);
 }
 
 TEST(Yaml, enabled)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 disabled: false
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0");
   ASSERT_EQ(config->disabled, false);
 }
 
 TEST(Yaml, enabled_by_default)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0");
   ASSERT_EQ(config->disabled, false);
 }
 
 TEST(Yaml, no_attribute_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 )";
 
   auto config = DoParse(yaml);
@@ -100,13 +156,13 @@ file_format: xx.yy
 TEST(Yaml, empty_attribute_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 attribute_limits:
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0");
   ASSERT_NE(config->attribute_limits, nullptr);
   ASSERT_EQ(config->attribute_limits->attribute_value_length_limit, 4096);
   ASSERT_EQ(config->attribute_limits->attribute_count_limit, 128);
@@ -115,7 +171,7 @@ file_format: xx.yy
 TEST(Yaml, attribute_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0"
 attribute_limits:
   attribute_value_length_limit: 1234
   attribute_count_limit: 5678
@@ -123,7 +179,7 @@ file_format: xx.yy
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "xx.yy");
+  ASSERT_EQ(config->file_format, "1.0");
   ASSERT_NE(config->attribute_limits, nullptr);
   ASSERT_EQ(config->attribute_limits->attribute_value_length_limit, 1234);
   ASSERT_EQ(config->attribute_limits->attribute_count_limit, 5678);
@@ -132,7 +188,7 @@ file_format: xx.yy
 TEST(Yaml, no_optional_boolean)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled:
 )";
 
@@ -144,7 +200,7 @@ file_format: 0.0
 TEST(Yaml, illegal_boolean)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: illegal
 )";
 
@@ -157,7 +213,7 @@ TEST(Yaml, no_boolean_substitution)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME}
 )";
 
@@ -171,7 +227,7 @@ TEST(Yaml, no_boolean_substitution_env)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${env:ENV_NAME}
 )";
 
@@ -185,7 +241,7 @@ TEST(Yaml, empty_boolean_substitution)
   setenv("ENV_NAME", "", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME}
 )";
 
@@ -199,7 +255,7 @@ TEST(Yaml, empty_boolean_substitution_env)
   setenv("ENV_NAME", "", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${env:ENV_NAME}
 )";
 
@@ -213,7 +269,7 @@ TEST(Yaml, true_boolean_substitution)
   setenv("ENV_NAME", "true", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME}
 )";
 
@@ -227,7 +283,7 @@ TEST(Yaml, false_boolean_substitution)
   setenv("ENV_NAME", "false", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME}
 )";
 
@@ -241,7 +297,7 @@ TEST(Yaml, illegal_boolean_substitution)
   setenv("ENV_NAME", "illegal", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME}
 )";
 
@@ -254,7 +310,7 @@ TEST(Yaml, empty_boolean_substitution_fallback)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME:-}
 )";
 
@@ -268,7 +324,7 @@ TEST(Yaml, true_boolean_substitution_fallback)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME:-true}
 )";
 
@@ -282,7 +338,7 @@ TEST(Yaml, false_boolean_substitution_fallback)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME:-false}
 )";
 
@@ -296,7 +352,7 @@ TEST(Yaml, illegal_boolean_substitution_fallback)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${ENV_NAME:-illegal}
 )";
 
@@ -309,7 +365,7 @@ TEST(Yaml, torture_boolean_substitution_fallback)
   setenv("env", "true", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 disabled: ${env:-false}
 )";
 
@@ -378,7 +434,7 @@ file_format: ${env:ENV_NAME}
 
 TEST(Yaml, with_string_substitution)
 {
-  setenv("ENV_NAME", "foo.bar", 1);
+  setenv("ENV_NAME", "1.0-substitution", 1);
 
   std::string yaml = R"(
 file_format: ${ENV_NAME}
@@ -386,12 +442,12 @@ file_format: ${ENV_NAME}
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "foo.bar");
+  ASSERT_EQ(config->file_format, "1.0-substitution");
 }
 
 TEST(Yaml, with_string_substitution_env)
 {
-  setenv("ENV_NAME", "foo.bar", 1);
+  setenv("ENV_NAME", "1.0-substitution", 1);
 
   std::string yaml = R"(
 file_format: ${env:ENV_NAME}
@@ -399,7 +455,7 @@ file_format: ${env:ENV_NAME}
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "foo.bar");
+  ASSERT_EQ(config->file_format, "1.0-substitution");
 }
 
 TEST(Yaml, with_string_substitution_fallback)
@@ -407,19 +463,19 @@ TEST(Yaml, with_string_substitution_fallback)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: ${env:ENV_NAME:-foo.bar}
+file_format: ${env:ENV_NAME:-1.0-fallback}
 )";
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "foo.bar");
+  ASSERT_EQ(config->file_format, "1.0-fallback");
 }
 
 TEST(Yaml, multiple_string_substitution)
 {
-  setenv("PREFIX", "foo", 1);
+  setenv("PREFIX", "1", 1);
   unsetenv("DOT");
-  setenv("SUFFIX", "bar", 1);
+  setenv("SUFFIX", "0", 1);
 
   std::string yaml = R"(
 file_format: ${env:PREFIX:-failed}${DOT:-.}${SUFFIX:-failed}
@@ -427,13 +483,13 @@ file_format: ${env:PREFIX:-failed}${DOT:-.}${SUFFIX:-failed}
 
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
-  ASSERT_EQ(config->file_format, "foo.bar");
+  ASSERT_EQ(config->file_format, "1.0");
 }
 
 TEST(Yaml, no_optional_integer)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit:
 )";
@@ -447,7 +503,7 @@ file_format: 0.0
 TEST(Yaml, illegal_integer)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit: "just enough"
 )";
@@ -461,7 +517,7 @@ TEST(Yaml, no_integer_substitution)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit: ${ENV_NAME}
 )";
@@ -477,7 +533,7 @@ TEST(Yaml, empty_integer_substitution)
   setenv("ENV_NAME", "", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit: ${ENV_NAME}
 )";
@@ -493,7 +549,7 @@ TEST(Yaml, with_integer_substitution)
   setenv("ENV_NAME", "7777", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit: ${ENV_NAME}
 )";
@@ -509,7 +565,7 @@ TEST(Yaml, with_illegal_integer_substitution)
   setenv("ENV_NAME", "still not enough", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 attribute_limits:
   attribute_count_limit: ${ENV_NAME}
 )";
@@ -521,7 +577,7 @@ file_format: 0.0
 TEST(Yaml, no_optional_double)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
@@ -546,7 +602,7 @@ file_format: 0.0
 TEST(Yaml, illegal_double)
 {
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
@@ -566,7 +622,7 @@ TEST(Yaml, no_double_substitution)
   unsetenv("ENV_NAME");
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
@@ -593,7 +649,7 @@ TEST(Yaml, empty_double_substitution)
   setenv("ENV_NAME", "", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
@@ -620,7 +676,7 @@ TEST(Yaml, with_double_substitution)
   setenv("ENV_NAME", "3.14", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
@@ -647,7 +703,7 @@ TEST(Yaml, with_illegal_double_substitution)
   setenv("ENV_NAME", "something else", 1);
 
   std::string yaml = R"(
-file_format: 0.0
+file_format: "1.0"
 tracer_provider:
   processors:
     - simple:
diff --git a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_trace_test.cc b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_trace_test.cc
index f5f53c74195..daa3c40d4b8 100644
--- a/deps/opentelemetry-cpp/sdk/test/configuration/yaml_trace_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/configuration/yaml_trace_test.cc
@@ -9,7 +9,9 @@
 
 #include "opentelemetry/sdk/configuration/batch_span_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/jaeger_remote_sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_file_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h"
@@ -22,7 +24,6 @@
 #include "opentelemetry/sdk/configuration/trace_id_ratio_based_sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
 #include "opentelemetry/sdk/configuration/yaml_configuration_parser.h"
-#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
 
 static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(
     const std::string &yaml)
@@ -34,7 +35,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlTrace, no_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
 )";
 
@@ -45,7 +46,7 @@ file_format: xx.yy
 TEST(YamlTrace, empty_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
 )";
@@ -57,7 +58,7 @@ file_format: xx.yy
 TEST(YamlTrace, many_processors)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -77,7 +78,7 @@ file_format: xx.yy
 TEST(YamlTrace, simple_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -102,7 +103,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_batch_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - batch:
@@ -131,7 +132,7 @@ file_format: xx.yy
 TEST(YamlTrace, batch_processor)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - batch:
@@ -164,7 +165,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -189,9 +190,7 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpHttpSpanExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "");
-  ASSERT_EQ(otlp_http->client_key_file, "");
-  ASSERT_EQ(otlp_http->client_certificate_file, "");
+  ASSERT_EQ(otlp_http->tls, nullptr);
   ASSERT_EQ(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers_list, "");
   ASSERT_EQ(otlp_http->compression, "");
@@ -202,16 +201,17 @@ file_format: xx.yy
 TEST(YamlTrace, otlp_http)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
         exporter:
           otlp_http:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
             headers:
               - name: foo
                 value: "123"
@@ -239,9 +239,10 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpHttpSpanExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_http->endpoint, "somewhere");
-  ASSERT_EQ(otlp_http->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_http->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_http->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_http->tls, nullptr);
+  ASSERT_EQ(otlp_http->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_http->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_http->tls->cert_file, "cert_file");
   ASSERT_NE(otlp_http->headers, nullptr);
   ASSERT_EQ(otlp_http->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_http->headers->kv_map["foo"], "123");
@@ -255,7 +256,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -280,29 +281,28 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpGrpcSpanExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "");
-  ASSERT_EQ(otlp_grpc->client_key_file, "");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "");
+  ASSERT_EQ(otlp_grpc->tls, nullptr);
   ASSERT_EQ(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers_list, "");
   ASSERT_EQ(otlp_grpc->compression, "");
   ASSERT_EQ(otlp_grpc->timeout, 10000);
-  ASSERT_EQ(otlp_grpc->insecure, false);
 }
 
 TEST(YamlTrace, otlp_grpc)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
         exporter:
           otlp_grpc:
             endpoint: "somewhere"
-            certificate_file: "certificate_file"
-            client_key_file: "client_key_file"
-            client_certificate_file: "client_certificate_file"
+            tls:
+              ca_file: "ca_file"
+              key_file: "key_file"
+              cert_file: "cert_file"
+              insecure: true
             headers:
               - name: foo
                 value: "123"
@@ -311,7 +311,6 @@ file_format: xx.yy
             headers_list: "baz=789"
             compression: "compression"
             timeout: 5000
-            insecure: true
 )";
 
   auto config = DoParse(yaml);
@@ -330,9 +329,11 @@ file_format: xx.yy
       reinterpret_cast<opentelemetry::sdk::configuration::OtlpGrpcSpanExporterConfiguration *>(
           exporter);
   ASSERT_EQ(otlp_grpc->endpoint, "somewhere");
-  ASSERT_EQ(otlp_grpc->certificate_file, "certificate_file");
-  ASSERT_EQ(otlp_grpc->client_key_file, "client_key_file");
-  ASSERT_EQ(otlp_grpc->client_certificate_file, "client_certificate_file");
+  ASSERT_NE(otlp_grpc->tls, nullptr);
+  ASSERT_EQ(otlp_grpc->tls->ca_file, "ca_file");
+  ASSERT_EQ(otlp_grpc->tls->key_file, "key_file");
+  ASSERT_EQ(otlp_grpc->tls->cert_file, "cert_file");
+  ASSERT_EQ(otlp_grpc->tls->insecure, true);
   ASSERT_NE(otlp_grpc->headers, nullptr);
   ASSERT_EQ(otlp_grpc->headers->kv_map.size(), 2);
   ASSERT_EQ(otlp_grpc->headers->kv_map["foo"], "123");
@@ -340,13 +341,12 @@ file_format: xx.yy
   ASSERT_EQ(otlp_grpc->headers_list, "baz=789");
   ASSERT_EQ(otlp_grpc->compression, "compression");
   ASSERT_EQ(otlp_grpc->timeout, 5000);
-  ASSERT_EQ(otlp_grpc->insecure, true);
 }
 
 TEST(YamlTrace, default_otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -375,7 +375,7 @@ file_format: xx.yy
 TEST(YamlTrace, otlp_file)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -405,7 +405,7 @@ file_format: xx.yy
 TEST(YamlTrace, otlp_console)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -427,73 +427,10 @@ file_format: xx.yy
   ASSERT_NE(exporter, nullptr);
 }
 
-TEST(YamlTrace, default_otlp_zipkin)
-{
-  std::string yaml = R"(
-file_format: xx.yy
-tracer_provider:
-  processors:
-    - simple:
-        exporter:
-          zipkin:
-            endpoint: "zipkin"
-)";
-
-  auto config = DoParse(yaml);
-  ASSERT_NE(config, nullptr);
-  ASSERT_NE(config->tracer_provider, nullptr);
-  ASSERT_EQ(config->tracer_provider->processors.size(), 1);
-  auto *processor = config->tracer_provider->processors[0].get();
-  ASSERT_NE(processor, nullptr);
-  auto *simple =
-      reinterpret_cast<opentelemetry::sdk::configuration::SimpleSpanProcessorConfiguration *>(
-          processor);
-  ASSERT_NE(simple->exporter, nullptr);
-  auto *exporter = simple->exporter.get();
-  ASSERT_NE(exporter, nullptr);
-  auto *zipkin =
-      reinterpret_cast<opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *>(
-          exporter);
-  ASSERT_EQ(zipkin->endpoint, "zipkin");
-  ASSERT_EQ(zipkin->timeout, 10000);
-}
-
-TEST(YamlTrace, otlp_zipkin)
-{
-  std::string yaml = R"(
-file_format: xx.yy
-tracer_provider:
-  processors:
-    - simple:
-        exporter:
-          zipkin:
-            endpoint: "zipkin"
-            timeout: 5000
-)";
-
-  auto config = DoParse(yaml);
-  ASSERT_NE(config, nullptr);
-  ASSERT_NE(config->tracer_provider, nullptr);
-  ASSERT_EQ(config->tracer_provider->processors.size(), 1);
-  auto *processor = config->tracer_provider->processors[0].get();
-  ASSERT_NE(processor, nullptr);
-  auto *simple =
-      reinterpret_cast<opentelemetry::sdk::configuration::SimpleSpanProcessorConfiguration *>(
-          processor);
-  ASSERT_NE(simple->exporter, nullptr);
-  auto *exporter = simple->exporter.get();
-  ASSERT_NE(exporter, nullptr);
-  auto *zipkin =
-      reinterpret_cast<opentelemetry::sdk::configuration::ZipkinSpanExporterConfiguration *>(
-          exporter);
-  ASSERT_EQ(zipkin->endpoint, "zipkin");
-  ASSERT_EQ(zipkin->timeout, 5000);
-}
-
 TEST(YamlTrace, no_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -510,7 +447,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -534,7 +471,7 @@ file_format: xx.yy
 TEST(YamlTrace, limits)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -564,7 +501,7 @@ file_format: xx.yy
 TEST(YamlTrace, no_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -581,7 +518,7 @@ file_format: xx.yy
 TEST(YamlTrace, empty_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -597,7 +534,7 @@ file_format: xx.yy
 TEST(YamlTrace, many_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -615,7 +552,7 @@ file_format: xx.yy
 TEST(YamlTrace, always_off_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -634,7 +571,7 @@ file_format: xx.yy
 TEST(YamlTrace, always_on_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -653,7 +590,7 @@ file_format: xx.yy
 TEST(YamlTrace, jaeger_remote_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -683,7 +620,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_parent_based_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -711,7 +648,7 @@ file_format: xx.yy
 TEST(YamlTrace, parent_based_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -749,7 +686,7 @@ file_format: xx.yy
 TEST(YamlTrace, default_trace_id_ratio_based_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
@@ -773,7 +710,7 @@ file_format: xx.yy
 TEST(YamlTrace, trace_id_ratio_based_sampler)
 {
   std::string yaml = R"(
-file_format: xx.yy
+file_format: "1.0-trace"
 tracer_provider:
   processors:
     - simple:
diff --git a/deps/opentelemetry-cpp/sdk/test/instrumentationscope/BUILD b/deps/opentelemetry-cpp/sdk/test/instrumentationscope/BUILD
index 39a61564a7c..34b5e0f4a00 100644
--- a/deps/opentelemetry-cpp/sdk/test/instrumentationscope/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/instrumentationscope/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "instrumentationscope_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/sdk/test/logs/BUILD b/deps/opentelemetry-cpp/sdk/test/logs/BUILD
index 26c837ea890..ccf035c1632 100644
--- a/deps/opentelemetry-cpp/sdk/test/logs/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/logs/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "logger_provider_sdk_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/sdk/test/logs/batch_log_record_processor_test.cc b/deps/opentelemetry-cpp/sdk/test/logs/batch_log_record_processor_test.cc
index 773d1283b53..ccb055fa588 100644
--- a/deps/opentelemetry-cpp/sdk/test/logs/batch_log_record_processor_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/logs/batch_log_record_processor_test.cc
@@ -3,6 +3,7 @@
 
 #include <gtest/gtest.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <atomic>
 #include <chrono>
 #include <cstddef>
@@ -21,10 +22,17 @@
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/logs/batch_log_record_processor.h"
+#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 #include "opentelemetry/sdk/logs/processor.h"
 #include "opentelemetry/sdk/logs/recordable.h"
 
+#if defined(_MSC_VER)
+#  include "opentelemetry/sdk/common/env_variables.h"
+using opentelemetry::sdk::common::setenv;
+using opentelemetry::sdk::common::unsetenv;
+#endif
+
 using namespace opentelemetry::sdk::logs;
 using namespace opentelemetry::sdk::common;
 
@@ -355,3 +363,116 @@ TEST_F(BatchLogRecordProcessorTest, TestScheduledDelayMillis)
     EXPECT_EQ("Log" + std::to_string(i), logs_received->at(i)->GetBody());
   }
 }
+
+TEST_F(BatchLogRecordProcessorTest, TestDefaultValues)
+{
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(2048));
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(1000));
+  EXPECT_EQ(options.export_timeout_millis, std::chrono::milliseconds(30000));
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(512));
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestMaxQueueSizeFromEnv)
+{
+  setenv("OTEL_BLRP_MAX_QUEUE_SIZE", "1234", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(1234));
+
+  unsetenv("OTEL_BLRP_MAX_QUEUE_SIZE");
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestScheduleDelayFromEnv)
+{
+  setenv("OTEL_BLRP_SCHEDULE_DELAY", "7s", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(7000));
+
+  unsetenv("OTEL_BLRP_SCHEDULE_DELAY");
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestScheduleDelayInvalidValueFromEnv)
+{
+  setenv("OTEL_BLRP_SCHEDULE_DELAY", "invalid_value", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(1000));
+
+  unsetenv("OTEL_BLRP_SCHEDULE_DELAY");
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestScheduleDelayInvalidEdgeCasesFromEnv)
+{
+  struct TestCase
+  {
+    const char *value;
+    const char *description;
+  };
+
+  const std::vector<TestCase> cases = {
+      {"-5ms", "negative duration"},
+      {"0ms", "zero duration"},
+      {"999999999999999999999s", "overflow"},
+      {"", "empty string"},
+  };
+
+  for (const auto &tc : cases)
+  {
+    setenv("OTEL_BLRP_SCHEDULE_DELAY", tc.value, 1);
+
+    BatchLogRecordProcessorOptions options;
+
+    EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(1000))
+        << "Failed for case: " << tc.description << " (value='" << tc.value << "')";
+
+    unsetenv("OTEL_BLRP_SCHEDULE_DELAY");
+  }
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestExportTimeoutFromEnv)
+{
+  setenv("OTEL_BLRP_EXPORT_TIMEOUT", "250ms", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.export_timeout_millis, std::chrono::milliseconds(250));
+
+  unsetenv("OTEL_BLRP_EXPORT_TIMEOUT");
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestMaxExportBatchSizeFromEnv)
+{
+  setenv("OTEL_BLRP_MAX_EXPORT_BATCH_SIZE", "42", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(42));
+
+  unsetenv("OTEL_BLRP_MAX_EXPORT_BATCH_SIZE");
+}
+
+TEST_F(BatchLogRecordProcessorTest, TestOptionsReadFromMultipleEnvVars)
+{
+  setenv("OTEL_BLRP_MAX_QUEUE_SIZE", "3000", 1);
+  setenv("OTEL_BLRP_SCHEDULE_DELAY", "2s", 1);
+  setenv("OTEL_BLRP_EXPORT_TIMEOUT", "1s", 1);
+  setenv("OTEL_BLRP_MAX_EXPORT_BATCH_SIZE", "256", 1);
+
+  BatchLogRecordProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(3000));
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(2000));
+  EXPECT_EQ(options.export_timeout_millis, std::chrono::milliseconds(1000));
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(256));
+
+  unsetenv("OTEL_BLRP_MAX_QUEUE_SIZE");
+  unsetenv("OTEL_BLRP_SCHEDULE_DELAY");
+  unsetenv("OTEL_BLRP_EXPORT_TIMEOUT");
+  unsetenv("OTEL_BLRP_MAX_EXPORT_BATCH_SIZE");
+}
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/BUILD b/deps/opentelemetry-cpp/sdk/test/metrics/BUILD
index dcd7a323f14..40ffbc8b621 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 cc_library(
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/CMakeLists.txt b/deps/opentelemetry-cpp/sdk/test/metrics/CMakeLists.txt
index 1b69d31aac9..280d9975f6e 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/CMakeLists.txt
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/CMakeLists.txt
@@ -35,7 +35,8 @@ foreach(
   periodic_exporting_metric_reader_test
   instrument_metadata_validator_test
   metric_test_stress
-  instrument_descriptor_test)
+  instrument_descriptor_test
+  multi_observer_test)
   add_executable(${testname} "${testname}.cc")
   target_link_libraries(
     ${testname} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB} ${CMAKE_THREAD_LIBS_INIT}
@@ -80,4 +81,6 @@ if(WITH_BENCHMARK)
     metrics_common_test_utils opentelemetry_common opentelemetry_resources)
 endif()
 
-add_subdirectory(exemplar)
+if(WITH_METRICS_EXEMPLAR_PREVIEW)
+  add_subdirectory(exemplar)
+endif()
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/aggregation_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/aggregation_test.cc
index 9216ce3b604..ac8999977e1 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/aggregation_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/aggregation_test.cc
@@ -451,3 +451,159 @@ TEST(Aggregation, Base2ExponentialHistogramAggregationMerge)
                expected_scale, expected_max_buckets);
   }
 }
+
+// Test that verifies the count invariant is maintained during merge operations that require
+// downscaling. The invariant is: count == zero_count + sum(positive_bucket_counts) +
+// sum(negative_bucket_counts)
+//
+TEST(Aggregation, Base2ExponentialHistogramAggregationMergeCountInvariant)
+{
+  // Helper to sum all bucket counts
+  auto sum_bucket_counts = [](const Base2ExponentialHistogramPointData &point) -> uint64_t {
+    uint64_t total = 0;
+    if (point.positive_buckets_ && !point.positive_buckets_->Empty())
+    {
+      for (int32_t i = point.positive_buckets_->StartIndex();
+           i <= point.positive_buckets_->EndIndex(); ++i)
+      {
+        total += point.positive_buckets_->Get(i);
+      }
+    }
+    if (point.negative_buckets_ && !point.negative_buckets_->Empty())
+    {
+      for (int32_t i = point.negative_buckets_->StartIndex();
+           i <= point.negative_buckets_->EndIndex(); ++i)
+      {
+        total += point.negative_buckets_->Get(i);
+      }
+    }
+    return total;
+  };
+
+  // Helper to verify the count invariant
+  auto verify_invariant = [&sum_bucket_counts](const Base2ExponentialHistogramPointData &point,
+                                               uint64_t expected_count, const std::string &phase) {
+    uint64_t bucket_sum       = sum_bucket_counts(point);
+    uint64_t calculated_count = point.zero_count_ + bucket_sum;
+
+    EXPECT_EQ(point.count_, expected_count) << "Count mismatch at " << phase << ": expected "
+                                            << expected_count << ", got " << point.count_;
+    EXPECT_EQ(point.count_, calculated_count)
+        << "Invariant violation at " << phase << ": count(" << point.count_ << ") != zero_count("
+        << point.zero_count_ << ") + bucket_sum(" << bucket_sum << ") = " << calculated_count;
+  };
+
+  // Use scale 0 for easy bucket index reasoning: value 2^N -> index N-1
+  // Use max_buckets=5 so we can trigger the bug with small powers of 2
+  Base2ExponentialHistogramAggregationConfig config;
+  config.max_scale_   = 0;
+  config.max_buckets_ = 5;
+
+  std::unique_ptr<Aggregation> cumulative =
+      std::make_unique<Base2ExponentialHistogramAggregation>(&config);
+
+  uint64_t expected_count = 0;
+
+  // === Cycle 1: values 2,4,8,16,32 -> indices 0,1,2,3,4 (5 buckets, fits in max_buckets=5) ===
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(2.0, {});   // 2^1 -> index 0
+    delta.Aggregate(4.0, {});   // 2^2 -> index 1
+    delta.Aggregate(8.0, {});   // 2^3 -> index 2
+    delta.Aggregate(16.0, {});  // 2^4 -> index 3
+    delta.Aggregate(32.0, {});  // 2^5 -> index 4
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 1: indices 0-4");
+
+    // Verify bucket positions
+    EXPECT_EQ(point.positive_buckets_->StartIndex(), 0);
+    EXPECT_EQ(point.positive_buckets_->EndIndex(), 4);
+  }
+
+  // === Cycle 2: values 4,8,16,32,64 -> indices 1,2,3,4,5 (5 buckets, fits individually) ===
+  // But combined with Cycle 1: indices 0-5 = 6 buckets = max_buckets + 1
+  // This triggers the off-by-one bug as of commit
+  // https://github.com/open-telemetry/opentelemetry-cpp/commit/5fc4707a8b7820f6bdbc782ccdffac7ccafbe80d.
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(4.0, {});   // 2^2 -> index 1
+    delta.Aggregate(8.0, {});   // 2^3 -> index 2
+    delta.Aggregate(16.0, {});  // 2^4 -> index 3
+    delta.Aggregate(32.0, {});  // 2^5 -> index 4
+    delta.Aggregate(64.0, {});  // 2^6 -> index 5
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 2: combined indices 0-5");
+  }
+
+  // === Cycle 3: values 8,16,32,64,128 -> indices 2,3,4,5,6 ===
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(8.0, {});    // 2^3 -> index 2
+    delta.Aggregate(16.0, {});   // 2^4 -> index 3
+    delta.Aggregate(32.0, {});   // 2^5 -> index 4
+    delta.Aggregate(64.0, {});   // 2^6 -> index 5
+    delta.Aggregate(128.0, {});  // 2^7 -> index 6
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 3: indices 2-6");
+  }
+
+  // === Cycle 4: values 16,32,64,128,256 -> indices 3,4,5,6,7 ===
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(16.0, {});   // 2^4 -> index 3
+    delta.Aggregate(32.0, {});   // 2^5 -> index 4
+    delta.Aggregate(64.0, {});   // 2^6 -> index 5
+    delta.Aggregate(128.0, {});  // 2^7 -> index 6
+    delta.Aggregate(256.0, {});  // 2^8 -> index 7
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 4: indices 3-7");
+  }
+
+  // === Cycle 5: values 32,64,128,256,512 -> indices 4,5,6,7,8 ===
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(32.0, {});   // 2^5 -> index 4
+    delta.Aggregate(64.0, {});   // 2^6 -> index 5
+    delta.Aggregate(128.0, {});  // 2^7 -> index 6
+    delta.Aggregate(256.0, {});  // 2^8 -> index 7
+    delta.Aggregate(512.0, {});  // 2^9 -> index 8
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 5: indices 4-8");
+  }
+
+  // === Cycle 6: values 64,128,256,512,1024 -> indices 5,6,7,8,9 ===
+  {
+    Base2ExponentialHistogramAggregation delta(&config);
+    delta.Aggregate(64.0, {});    // 2^6 -> index 5
+    delta.Aggregate(128.0, {});   // 2^7 -> index 6
+    delta.Aggregate(256.0, {});   // 2^8 -> index 7
+    delta.Aggregate(512.0, {});   // 2^9 -> index 8
+    delta.Aggregate(1024.0, {});  // 2^10 -> index 9
+    expected_count += 5;
+
+    cumulative = cumulative->Merge(delta);
+
+    auto point = nostd::get<Base2ExponentialHistogramPointData>(cumulative->ToPoint());
+    verify_invariant(point, expected_count, "Cycle 6: indices 5-9");
+  }
+}
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/attributes_hashmap_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/attributes_hashmap_test.cc
index 944bbef3b69..e65b8ebb147 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/attributes_hashmap_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/attributes_hashmap_test.cc
@@ -71,9 +71,9 @@ TEST(AttributesHashMap, BasicTests)
   MetricAttributes m6 = {{"k1", "v2"}, {"k2", "v1"}};
   EXPECT_EQ(hash_map.Has(m6), false);
 
-  // GetAllEnteries
+  // GetAllEntries
   size_t count = 0;
-  hash_map.GetAllEnteries(
+  hash_map.GetAllEntries(
       [&count](const MetricAttributes & /* attributes */, Aggregation & /* aggregation */) {
         count++;
         return true;
@@ -210,7 +210,7 @@ TEST(AttributesHashMap, OverflowCardinalityLimitBehavior)
 
   // Copy the hash map to a new map in non-determistic order and verify all entries are present
   AttributesHashMapWithCustomHash<> map_copy(limit);
-  map.GetAllEnteries([&map_copy](const MetricAttributes &attributes, Aggregation &) {
+  map.GetAllEntries([&map_copy](const MetricAttributes &attributes, Aggregation &) {
     map_copy.Set(attributes, std::unique_ptr<Aggregation>(new DropAggregation()));
     return true;
   });
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/exemplar/BUILD b/deps/opentelemetry-cpp/sdk/test/metrics/exemplar/BUILD
index 413780b7d53..9b11a64b9cc 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/exemplar/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/exemplar/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "no_exemplar_reservoir_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/meter_provider_sdk_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/meter_provider_sdk_test.cc
index 0c1f4d7de19..93d996f2043 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/meter_provider_sdk_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/meter_provider_sdk_test.cc
@@ -36,8 +36,6 @@ using namespace opentelemetry::sdk::metrics;
 TEST(MeterProvider, GetMeter)
 {
   MeterProvider mp1;
-  //   std::unique_ptr<View> view{std::unique_ptr<View>()};
-  // MeterProvider mp1(std::move(exporters), std::move(readers), std::move(views);
   auto m1 = mp1.GetMeter("test");
   auto m2 = mp1.GetMeter("test");
   auto m3 = mp1.GetMeter("different", "1.0.0");
@@ -66,7 +64,7 @@ TEST(MeterProvider, GetMeter)
   std::unique_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
   mp1.AddMetricReader(std::move(reader));
 
-  std::unique_ptr<View> view{std::unique_ptr<View>()};
+  std::unique_ptr<View> view{new View("test_view")};
   std::unique_ptr<InstrumentSelector> instrument_selector{
       new InstrumentSelector(InstrumentType::kCounter, "instru1", "unit1")};
   std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("name1", "version1", "schema1")};
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/multi_observer_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/multi_observer_test.cc
new file mode 100644
index 00000000000..a502b556adb
--- /dev/null
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/multi_observer_test.cc
@@ -0,0 +1,216 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+// Multi-observer functionality requires ABI version 2+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+#  include <gtest/gtest.h>
+#  include <cstddef>
+#  include <cstdint>
+#  include <string>
+#  include <utility>
+#  include <vector>
+
+#  include "common.h"
+#  include "opentelemetry/metrics/async_instruments.h"
+#  include "opentelemetry/metrics/meter.h"
+#  include "opentelemetry/metrics/meter_provider.h"
+#  include "opentelemetry/metrics/multi_observer_result.h"
+#  include "opentelemetry/metrics/observer_result.h"
+#  include "opentelemetry/nostd/function_ref.h"
+#  include "opentelemetry/nostd/shared_ptr.h"
+#  include "opentelemetry/nostd/span.h"
+#  include "opentelemetry/nostd/string_view.h"
+#  include "opentelemetry/sdk/metrics/data/metric_data.h"
+#  include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#  include "opentelemetry/sdk/metrics/instruments.h"
+#  include "opentelemetry/sdk/metrics/meter_provider.h"
+#  include "opentelemetry/sdk/metrics/metric_reader.h"
+
+using namespace opentelemetry;
+using namespace opentelemetry::sdk::metrics;
+
+namespace
+{
+nostd::shared_ptr<metrics::Meter> InitMeter(MetricReader **metricReaderPtr,
+                                            const std::string &meter_name = "meter_name")
+{
+  static std::shared_ptr<metrics::MeterProvider> provider(new MeterProvider());
+  std::unique_ptr<MetricReader> metric_reader(new MockMetricReader());
+  *metricReaderPtr = metric_reader.get();
+  auto p           = std::static_pointer_cast<MeterProvider>(provider);
+  p->AddMetricReader(std::move(metric_reader));
+  auto meter = provider->GetMeter(meter_name);
+  return meter;
+}
+
+void basic_multi_observable_callback(metrics::MultiObserverResult &result, void *state)
+{
+  auto *instruments = reinterpret_cast<std::vector<metrics::ObservableInstrument *> *>(state);
+
+  auto &counter_record = result.ForInstrument<int64_t>(instruments->at(0));
+  counter_record.Observe(100, {{"service", "frontend"}});
+  counter_record.Observe(200, {{"service", "backend"}});
+
+  auto &gauge_record = result.ForInstrument<double>(instruments->at(1));
+  gauge_record.Observe(95.5, {{"cpu", "core1"}});
+  gauge_record.Observe(87.2, {{"cpu", "core2"}});
+}
+}  // namespace
+
+TEST(MultiObserverTest, BasicMultiObservableCallback)
+{
+  MetricReader *metric_reader_ptr = nullptr;
+  auto meter                      = InitMeter(&metric_reader_ptr, "multi_observer_test");
+
+  auto observable_counter =
+      meter->CreateInt64ObservableCounter("test_counter", "Test counter", "1");
+  auto observable_gauge = meter->CreateDoubleObservableGauge("test_gauge", "Test gauge", "%");
+
+  // Create a vector of raw pointers for the span
+  std::vector<metrics::ObservableInstrument *> instrument_ptrs;
+  instrument_ptrs.push_back(observable_counter.get());
+  instrument_ptrs.push_back(observable_gauge.get());
+
+  // Register a single callback that observes both instruments
+  auto callback_id = meter->RegisterCallback(
+      basic_multi_observable_callback, &instrument_ptrs,
+      nostd::span<metrics::ObservableInstrument *>{instrument_ptrs.data(), instrument_ptrs.size()});
+
+  // Collect metrics and verify both instruments have data
+  size_t counter_metrics = 0;
+  size_t gauge_metrics   = 0;
+
+  metric_reader_ptr->Collect([&](ResourceMetrics &metric_data) {
+    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
+
+    for (const auto &metric : metric_data.scope_metric_data_[0].metric_data_)
+    {
+      if (metric.instrument_descriptor.name_ == "test_counter")
+      {
+        counter_metrics++;
+        EXPECT_EQ(metric.point_data_attr_.size(), 2);  // frontend and backend services
+      }
+      else if (metric.instrument_descriptor.name_ == "test_gauge")
+      {
+        gauge_metrics++;
+        EXPECT_EQ(metric.point_data_attr_.size(), 2);  // core1 and core2 CPUs
+      }
+    }
+    return true;
+  });
+
+  EXPECT_EQ(counter_metrics, 1);
+  EXPECT_EQ(gauge_metrics, 1);
+
+  // Clean up
+  meter->DeregisterCallback(callback_id);
+}
+
+namespace
+{
+void empty_multi_observable_callback(metrics::MultiObserverResult &, void *state)
+{
+  bool *was_called = static_cast<bool *>(state);
+  *was_called      = true;
+}
+}  // namespace
+
+TEST(MultiObserverTest, EmptyInstrumentsList)
+{
+  MetricReader *metric_reader_ptr = nullptr;
+  auto meter                      = InitMeter(&metric_reader_ptr, "multi_observer_empty_test");
+  std::vector<metrics::ObservableInstrument *> empty_instruments;
+
+  // Register callback with empty instruments list
+  bool was_called = false;
+  auto callback_id =
+      meter->RegisterCallback(empty_multi_observable_callback, &was_called,
+                              nostd::span<metrics::ObservableInstrument *>{empty_instruments});
+
+  metric_reader_ptr->Collect([&](ResourceMetrics &) { return true; });
+
+  EXPECT_TRUE(was_called);
+
+  // Clean up
+  meter->DeregisterCallback(callback_id);
+
+  // It won't be called again if we collect
+  was_called = false;
+  metric_reader_ptr->Collect([&](ResourceMetrics &) { return true; });
+  EXPECT_FALSE(was_called);
+}
+
+namespace
+{
+void non_registered_instrument_callback(metrics::MultiObserverResult &result, void *state)
+{
+  auto *gauge = reinterpret_cast<metrics::ObservableInstrument *>(state);
+  result.ForInstrument<double>(gauge).Observe(23.5);
+}
+}  // namespace
+
+TEST(MultiObserverTest, NonRegisteredInstrument)
+{
+  MetricReader *metric_reader_ptr = nullptr;
+  auto meter = InitMeter(&metric_reader_ptr, "multi_observer_non_registered_test");
+
+  auto observable_counter =
+      meter->CreateInt64ObservableCounter("test_counter", "Test counter", "1");
+  auto observable_counter_ptr = observable_counter.get();
+  auto observable_gauge       = meter->CreateDoubleObservableGauge("test_gauge", "Test gauge", "%");
+
+  // Register with one instrument (the counter), but the callback will try and record a metric
+  // for the other instrument (the gauge)
+  auto callback_id = meter->RegisterCallback(
+      non_registered_instrument_callback, observable_gauge.get(),
+      nostd::span<metrics::ObservableInstrument *>{&observable_counter_ptr, 1});
+
+  metric_reader_ptr->Collect([&](ResourceMetrics &metric_data) {
+    // It should not have recorded any metrics; the observation for the gauge should have been
+    // discarded.
+    EXPECT_EQ(0, metric_data.scope_metric_data_.size());
+    return true;
+  });
+  meter->DeregisterCallback(callback_id);
+}
+
+namespace
+{
+
+struct CallbackDeregisteredWhenDestroyedState
+{
+  metrics::ObservableInstrument *counter = nullptr;
+  int times_called                       = 0;
+};
+
+void callback_deregistered_when_destroyed_callback(metrics::MultiObserverResult &result,
+                                                   void *vstate)
+{
+  auto state = reinterpret_cast<CallbackDeregisteredWhenDestroyedState *>(vstate);
+  state->times_called++;
+  result.ForInstrument<int64_t>(state->counter).Observe(state->times_called);
+}
+}  // namespace
+
+TEST(MultiObserverTest, CallbackDeregisteredWhenInstrumentDestroyed)
+{
+  MetricReader *metric_reader_ptr = nullptr;
+  auto meter = InitMeter(&metric_reader_ptr, "callback_deregistered_when_destroyed_test");
+
+  CallbackDeregisteredWhenDestroyedState state{};
+  auto counter_owning = meter->CreateInt64ObservableCounter("counter", "Counter", "1");
+  state.counter       = counter_owning.get();
+  meter->RegisterCallback(callback_deregistered_when_destroyed_callback, &state,
+                          nostd::span<metrics::ObservableInstrument *>{&state.counter, 1});
+
+  // If we run a collection, the callback gets called
+  metric_reader_ptr->Collect([&](ResourceMetrics &) { return true; });
+  EXPECT_EQ(state.times_called, 1);
+
+  // If we allow the instrument to be destroyed, the callback should now _NOT_ get called anymore
+  counter_owning = nullptr;
+  metric_reader_ptr->Collect([&](ResourceMetrics &) { return true; });
+  EXPECT_EQ(state.times_called, 1);
+}
+
+#endif
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/sum_aggregation_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/sum_aggregation_test.cc
index 02421a9e260..5c29fe43e8f 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/sum_aggregation_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/sum_aggregation_test.cc
@@ -194,11 +194,7 @@ TEST(HistogramToSumFilterAttributesWithCardinalityLimit, Double)
       {
         for (const MetricData &md : smd.metric_data_)
         {
-          // Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1
-          // including overflow. Just making the logic generic here to succeed for n or n-1 total
-          // cardinality.
-          EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
-          EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
+          EXPECT_EQ(cardinality_limit, md.point_data_attr_.size());
           for (size_t i = 0; i < md.point_data_attr_.size(); i++)
           {
             EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());
@@ -380,8 +376,7 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
           // resulting in a total of cardinality_limit sets. This test checks that the number of
           // emitted attribute sets is within the expected range, accounting for the overflow
           // behavior.
-          EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
-          EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
+          EXPECT_EQ(cardinality_limit, md.point_data_attr_.size());
           for (size_t i = 0; i < md.point_data_attr_.size(); i++)
           {
             EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());
diff --git a/deps/opentelemetry-cpp/sdk/test/metrics/view_registry_test.cc b/deps/opentelemetry-cpp/sdk/test/metrics/view_registry_test.cc
index 600b843f7d8..009c67278f5 100644
--- a/deps/opentelemetry-cpp/sdk/test/metrics/view_registry_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/metrics/view_registry_test.cc
@@ -93,3 +93,46 @@ TEST(ViewRegistry, FindNonExistingView)
   EXPECT_EQ(status, true);
 #endif
 }
+
+// Tests for ViewRegistry::AddView null parameter validation
+// These should log errors and ignore the call instead of throwing or aborting
+
+TEST(ViewRegistry, AddViewWithNullInstrumentSelector)
+{
+  ViewRegistry registry;
+  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("name", "version", "schema")};
+  std::unique_ptr<View> view{new View("test_view")};
+
+  // Should not throw or abort, just log and ignore
+  registry.AddView(nullptr, std::move(meter_selector), std::move(view));
+}
+
+TEST(ViewRegistry, AddViewWithNullMeterSelector)
+{
+  ViewRegistry registry;
+  std::unique_ptr<InstrumentSelector> instrument_selector{
+      new InstrumentSelector(InstrumentType::kCounter, "instrument_name", "unit")};
+  std::unique_ptr<View> view{new View("test_view")};
+
+  // Should not throw or abort, just log and ignore
+  registry.AddView(std::move(instrument_selector), nullptr, std::move(view));
+}
+
+TEST(ViewRegistry, AddViewWithNullView)
+{
+  ViewRegistry registry;
+  std::unique_ptr<InstrumentSelector> instrument_selector{
+      new InstrumentSelector(InstrumentType::kCounter, "instrument_name", "unit")};
+  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("name", "version", "schema")};
+
+  // Should not throw or abort, just log and ignore
+  registry.AddView(std::move(instrument_selector), std::move(meter_selector), nullptr);
+}
+
+TEST(ViewRegistry, AddViewWithAllNullParameters)
+{
+  ViewRegistry registry;
+
+  // Should not throw or abort, just log and ignore
+  registry.AddView(nullptr, nullptr, nullptr);
+}
diff --git a/deps/opentelemetry-cpp/sdk/test/resource/BUILD b/deps/opentelemetry-cpp/sdk/test/resource/BUILD
index 145ecf0b562..92005f3a0a9 100644
--- a/deps/opentelemetry-cpp/sdk/test/resource/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/resource/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "resource_test",
     srcs = [
diff --git a/deps/opentelemetry-cpp/sdk/test/trace/BUILD b/deps/opentelemetry-cpp/sdk/test/trace/BUILD
index 18a750a333b..06ca5958589 100644
--- a/deps/opentelemetry-cpp/sdk/test/trace/BUILD
+++ b/deps/opentelemetry-cpp/sdk/test/trace/BUILD
@@ -1,6 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 cc_test(
diff --git a/deps/opentelemetry-cpp/sdk/test/trace/batch_span_processor_test.cc b/deps/opentelemetry-cpp/sdk/test/trace/batch_span_processor_test.cc
index af9bbeab5e7..48d91846a46 100644
--- a/deps/opentelemetry-cpp/sdk/test/trace/batch_span_processor_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/trace/batch_span_processor_test.cc
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <stdlib.h>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -25,6 +26,12 @@
 #include "opentelemetry/sdk/trace/span_data.h"
 #include "opentelemetry/version.h"
 
+#if defined(_MSC_VER)
+#  include "opentelemetry/sdk/common/env_variables.h"
+using opentelemetry::sdk::common::setenv;
+using opentelemetry::sdk::common::unsetenv;
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 
 /**
@@ -364,4 +371,134 @@ TEST_F(BatchSpanProcessorTestPeer, TestScheduleDelayMillis)
   }
 }
 
+TEST(BatchSpanProcessorOptionsEnvTest, TestDefaultValues)
+{
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(2048));
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(5000));
+  EXPECT_EQ(options.export_timeout, std::chrono::milliseconds(30000));
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(512));
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestMaxQueueSizeFromEnv)
+{
+  setenv("OTEL_BSP_MAX_QUEUE_SIZE", "1234", 1);
+
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(1234));
+
+  unsetenv("OTEL_BSP_MAX_QUEUE_SIZE");
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestScheduleDelayFromEnv)
+{
+  setenv("OTEL_BSP_SCHEDULE_DELAY", "7s", 1);
+
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(7000));
+
+  unsetenv("OTEL_BSP_SCHEDULE_DELAY");
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestExportTimeoutFromEnv)
+{
+  setenv("OTEL_BSP_EXPORT_TIMEOUT", "250ms", 1);
+
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.export_timeout, std::chrono::milliseconds(250));
+
+  unsetenv("OTEL_BSP_EXPORT_TIMEOUT");
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestMaxExportBatchSizeFromEnv)
+{
+  setenv("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "42", 1);
+
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(42));
+
+  unsetenv("OTEL_BSP_MAX_EXPORT_BATCH_SIZE");
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestOptionsReadFromMultipleEnvVars)
+{
+  setenv("OTEL_BSP_MAX_QUEUE_SIZE", "3000", 1);
+  setenv("OTEL_BSP_SCHEDULE_DELAY", "2s", 1);
+  setenv("OTEL_BSP_EXPORT_TIMEOUT", "1s", 1);
+  setenv("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "256", 1);
+
+  sdk::trace::BatchSpanProcessorOptions options;
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(3000));
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(2000));
+  EXPECT_EQ(options.export_timeout, std::chrono::milliseconds(1000));
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(256));
+
+  unsetenv("OTEL_BSP_MAX_QUEUE_SIZE");
+  unsetenv("OTEL_BSP_SCHEDULE_DELAY");
+  unsetenv("OTEL_BSP_EXPORT_TIMEOUT");
+  unsetenv("OTEL_BSP_MAX_EXPORT_BATCH_SIZE");
+}
+
+TEST(BatchSpanProcessorOptionsEnvTest, TestAggregateInitialization)
+{
+  // Test aggregate initialization (brace initialization with partial fields)
+  // This validates that BatchSpanProcessorOptions is an aggregate type,
+  // which is required for C++20 designated initializers like:
+  // BatchSpanProcessorOptions{.max_queue_size = 100, .schedule_delay_millis = ...}
+
+  // Test default initialization
+  sdk::trace::BatchSpanProcessorOptions default_options{};
+  EXPECT_EQ(default_options.max_queue_size, static_cast<size_t>(2048));
+  EXPECT_EQ(default_options.schedule_delay_millis, std::chrono::milliseconds(5000));
+  EXPECT_EQ(default_options.export_timeout, std::chrono::milliseconds(30000));
+  EXPECT_EQ(default_options.max_export_batch_size, static_cast<size_t>(512));
+
+  // Test aggregate initialization with all fields explicitly set
+  sdk::trace::BatchSpanProcessorOptions custom_options{
+      100,                             // max_queue_size
+      std::chrono::milliseconds(200),  // schedule_delay_millis
+      std::chrono::milliseconds(300),  // export_timeout
+      50                               // max_export_batch_size
+  };
+  EXPECT_EQ(custom_options.max_queue_size, static_cast<size_t>(100));
+  EXPECT_EQ(custom_options.schedule_delay_millis, std::chrono::milliseconds(200));
+  EXPECT_EQ(custom_options.export_timeout, std::chrono::milliseconds(300));
+  EXPECT_EQ(custom_options.max_export_batch_size, static_cast<size_t>(50));
+}
+
+#if __cplusplus >= 202002L
+TEST(BatchSpanProcessorOptionsEnvTest, TestDesignatedInitializers)
+{
+  // Test C++20 designated initializers
+  // This is the main use case that was broken by the constructor
+
+  sdk::trace::BatchSpanProcessorOptions options{
+      .max_queue_size        = 1000,
+      .schedule_delay_millis = std::chrono::milliseconds(2000),
+      .export_timeout        = std::chrono::milliseconds(3000),
+      .max_export_batch_size = 100};
+
+  EXPECT_EQ(options.max_queue_size, static_cast<size_t>(1000));
+  EXPECT_EQ(options.schedule_delay_millis, std::chrono::milliseconds(2000));
+  EXPECT_EQ(options.export_timeout, std::chrono::milliseconds(3000));
+  EXPECT_EQ(options.max_export_batch_size, static_cast<size_t>(100));
+
+  // Test partial designated initializers (only some fields)
+  sdk::trace::BatchSpanProcessorOptions partial_options{.max_queue_size        = 500,
+                                                        .max_export_batch_size = 50};
+
+  EXPECT_EQ(partial_options.max_queue_size, static_cast<size_t>(500));
+  // Default from env (or hardcoded default)
+  EXPECT_EQ(partial_options.schedule_delay_millis, std::chrono::milliseconds(5000));
+  EXPECT_EQ(partial_options.export_timeout, std::chrono::milliseconds(30000));
+  EXPECT_EQ(partial_options.max_export_batch_size, static_cast<size_t>(50));
+}
+#endif
+
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/test/trace/tracer_test.cc b/deps/opentelemetry-cpp/sdk/test/trace/tracer_test.cc
index 6e70c0130e6..cec1bf496de 100644
--- a/deps/opentelemetry-cpp/sdk/test/trace/tracer_test.cc
+++ b/deps/opentelemetry-cpp/sdk/test/trace/tracer_test.cc
@@ -107,6 +107,48 @@ class MockSampler final : public Sampler
   nostd::string_view GetDescription() const noexcept override { return "MockSampler"; }
 };
 
+/**
+ * A mock sampler with ShouldSample returning
+ * a decision based on the span name.
+ */
+class MockDecisionSampler final : public Sampler
+{
+public:
+  SamplingResult ShouldSample(
+      const SpanContext & /*parent_context*/,
+      trace_api::TraceId /*trace_id*/,
+      nostd::string_view name,
+      trace_api::SpanKind /*span_kind*/,
+      const opentelemetry::common::KeyValueIterable & /*attributes*/,
+      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/) noexcept override
+  {
+    std::string span_name{name};
+
+    if (span_name.find("DROP-") != std::string::npos)
+    {
+      return {Decision::DROP,
+              nostd::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>>(
+                  nullptr),
+              nostd::shared_ptr<opentelemetry::trace::TraceState>(nullptr)};
+    }
+
+    if (span_name.find("RECORD_ONLY-") != std::string::npos)
+    {
+      return {Decision::RECORD_ONLY,
+              nostd::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>>(
+                  nullptr),
+              nostd::shared_ptr<opentelemetry::trace::TraceState>(nullptr)};
+    }
+
+    return {Decision::RECORD_AND_SAMPLE,
+            nostd::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>>(
+                nullptr),
+            nostd::shared_ptr<opentelemetry::trace::TraceState>(nullptr)};
+  }
+
+  nostd::string_view GetDescription() const noexcept override { return "MockDecisionSampler"; }
+};
+
 /**
  * A Mock Custom ID Generator
  */
@@ -1331,3 +1373,32 @@ TEST(Tracer, SpanCleanupWithScope)
   }
   EXPECT_EQ(4, span_data->GetSpans().size());
 }
+
+TEST(Tracer, SpanSamplerDecision)
+{
+  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
+  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
+  auto tracer = initTracer(std::unique_ptr<SpanExporter>{exporter}, new MockDecisionSampler());
+  {
+    auto span0    = tracer->StartSpan("Span0");
+    auto span1    = tracer->StartSpan("span1");
+    auto context1 = span1->GetContext();
+    EXPECT_TRUE(context1.IsValid());
+    EXPECT_TRUE(context1.IsSampled());
+    {
+      trace_api::Scope scope1(span1);
+      auto span2    = tracer->StartSpan("RECORD_ONLY-span2");
+      auto context2 = span2->GetContext();
+      EXPECT_TRUE(context2.IsValid());
+      EXPECT_FALSE(context2.IsSampled());
+      {
+        trace_api::Scope scope2(span2);
+        auto span3    = tracer->StartSpan("DROP-span3");
+        auto context3 = span3->GetContext();
+        EXPECT_TRUE(context3.IsValid());
+        EXPECT_FALSE(context3.IsSampled());
+      }
+    }
+  }
+  EXPECT_EQ(3, span_data->GetSpans().size());
+}
diff --git a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
index a42e51a6077..8915e3c16b6 100644
--- a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
+++ b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto
@@ -377,6 +377,16 @@ message NumberDataPoint {
   // where this point belongs. The list may be empty (may contain 0 elements).
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
 
   // StartTimeUnixNano is optional but strongly encouraged, see the
@@ -425,6 +435,16 @@ message HistogramDataPoint {
   // where this point belongs. The list may be empty (may contain 0 elements).
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
 
   // StartTimeUnixNano is optional but strongly encouraged, see the
@@ -509,6 +529,16 @@ message ExponentialHistogramDataPoint {
   // where this point belongs. The list may be empty (may contain 0 elements).
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
 
   // StartTimeUnixNano is optional but strongly encouraged, see the
@@ -625,6 +655,16 @@ message SummaryDataPoint {
   // where this point belongs. The list may be empty (may contain 0 elements).
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
 
   // StartTimeUnixNano is optional but strongly encouraged, see the
diff --git a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
index ff03815f6a0..dc101770dc3 100644
--- a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
+++ b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/profiles/v1development/profiles.proto
@@ -59,7 +59,7 @@ option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1development";
 // │  ScopeProfiles   │
 // └──────────────────┘
 //   │
-//   │ 1-1
+//   │ 1-n
 //   ▼
 // ┌──────────────────┐
 // │      Profile     │
@@ -67,15 +67,21 @@ option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1development";
 //   │                                n-1
 //   │ 1-n         ┌───────────────────────────────────────┐
 //   ▼             │                                       ▽
-// ┌──────────────────┐   1-n   ┌──────────────┐      ┌──────────┐
-// │      Sample      │ ──────▷ │   KeyValue   │      │   Link   │
-// └──────────────────┘         └──────────────┘      └──────────┘
-//   │                    1-n       △      △
-//   │ 1-n        ┌─────────────────┘      │ 1-n
-//   ▽            │                        │
-// ┌──────────────────┐   n-1   ┌──────────────┐
-// │     Location     │ ──────▷ │   Mapping    │
-// └──────────────────┘         └──────────────┘
+// ┌──────────────────┐   1-n   ┌─────────────────┐   ┌──────────┐
+// │      Sample      │ ──────▷ │ KeyValueAndUnit │   │   Link   │
+// └──────────────────┘         └─────────────────┘   └──────────┘
+//   │                              △      △
+//   │ n-1                          │      │ 1-n
+//   ▽                              │      │
+// ┌──────────────────┐             │      │
+// │      Stack       │             │      │
+// └──────────────────┘             │      │
+//   │                     1-n      │      │
+//   │ 1-n         ┌────────────────┘      │
+//   ▽             │                       │
+// ┌──────────────────┐   n-1   ┌─────────────┐
+// │     Location     │ ──────▷ │   Mapping   │
+// └──────────────────┘         └─────────────┘
 //   │
 //   │ 1-n
 //   ▼
@@ -92,12 +98,17 @@ option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1development";
 
 // ProfilesDictionary represents the profiles data shared across the
 // entire message being sent.
+//
+// Note that all fields in this message MUST have a zero value encoded as the first element.
+// This allows for _index fields pointing into the dictionary to use a 0 pointer value
+// to indicate 'null' / 'not set'. Unless otherwise defined, a 'zero value' message value
+// is one with all default field values, so as to minimize wire encoded size.
 message ProfilesDictionary {
   // Mappings from address ranges to the image/binary/library mapped
   // into that address range referenced by locations via Location.mapping_index.
   repeated Mapping mapping_table = 1;
 
-  // Locations referenced by samples via Profile.location_indices.
+  // Locations referenced by samples via Stack.location_indices.
   repeated Location location_table = 2;
 
   // Functions referenced by locations via Line.function_index.
@@ -111,10 +122,27 @@ message ProfilesDictionary {
   repeated string string_table = 5;
 
   // A common table for attributes referenced by various messages.
-  repeated opentelemetry.proto.common.v1.KeyValue attribute_table = 6;
-
-  // Represents a mapping between Attribute Keys and Units.
-  repeated AttributeUnit attribute_units = 7;
+  // It is a collection of key/value pairs. Note, global attributes
+  // like server name can be set using the resource API. Examples of attributes:
+  //
+  //     "/http/user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
+  //     "/http/server_latency": 300
+  //     "abc.com/myattribute": true
+  //     "abc.com/score": 10.239
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
+  repeated KeyValueAndUnit attribute_table = 6;
+
+  // Stacks referenced by samples via Sample.stack_index.
+  repeated Stack stack_table = 7;
 }
 
 // ProfilesData represents the profiles data that can be stored in persistent storage,
@@ -135,6 +163,8 @@ message ProfilesData {
   // from non-containerized processes.
   // Other resource groupings are possible as well and clarified via
   // Resource.attributes and semantic conventions.
+  // Tools that visualize profiles should prefer displaying
+  // resources_profiles[0].scope_profiles[0].profiles[0] by default.
   repeated ResourceProfiles resource_profiles = 1;
 
   // One instance of ProfilesDictionary
@@ -192,75 +222,68 @@ message ScopeProfiles {
 //   that is most useful to humans.  There should be enough
 //   information present to determine the original sampled values.
 //
-// - On-disk, the serialized proto must be gzip-compressed.
-//
 // - The profile is represented as a set of samples, where each sample
-//   references a sequence of locations, and where each location belongs
+//   references a stack trace which is a list of locations, each belonging
 //   to a mapping.
-// - There is a N->1 relationship from sample.location_id entries to
-//   locations. For every sample.location_id entry there must be a
+// - There is a N->1 relationship from Stack.location_indices entries to
+//   locations. For every Stack.location_indices entry there must be a
 //   unique Location with that index.
 // - There is an optional N->1 relationship from locations to
 //   mappings. For every nonzero Location.mapping_id there must be a
 //   unique Mapping with that index.
 
-// Represents a complete profile, including sample types, samples,
-// mappings to binaries, locations, functions, string table, and additional metadata.
-// It modifies and annotates pprof Profile with OpenTelemetry specific fields.
+// Represents a complete profile, including sample types, samples, mappings to
+// binaries, stacks, locations, functions, string table, and additional
+// metadata. It modifies and annotates pprof Profile with OpenTelemetry
+// specific fields.
 //
 // Note that whilst fields in this message retain the name and field id from pprof in most cases
 // for ease of understanding data migration, it is not intended that pprof:Profile and
 // OpenTelemetry:Profile encoding be wire compatible.
 message Profile {
-  // A description of the samples associated with each Sample.value.
-  // For a cpu profile this might be:
-  //   [["cpu","nanoseconds"]] or [["wall","seconds"]] or [["syscall","count"]]
+  // The type and unit of all Sample.values in this profile.
+  // For a cpu or off-cpu profile this might be:
+  //   ["cpu","nanoseconds"] or ["off_cpu","nanoseconds"]
   // For a heap profile, this might be:
-  //   [["allocations","count"], ["space","bytes"]],
-  // If one of the values represents the number of events represented
-  // by the sample, by convention it should be at index 0 and use
-  // sample_type.unit == "count".
-  repeated ValueType sample_type = 1;
+  //   ["allocated_objects","count"] or ["allocated_space","bytes"],
+  ValueType sample_type = 1;
   // The set of samples recorded in this profile.
   repeated Sample sample = 2;
 
-  // References to locations in ProfilesDictionary.location_table.
-  repeated int32 location_indices = 3;
-
-  // The following fields 4-14 are informational, do not affect
+  // The following fields 3-12 are informational, do not affect
   // interpretation of results.
 
   // Time of collection (UTC) represented as nanoseconds past the epoch.
-  int64 time_nanos = 4;
+  fixed64 time_unix_nano = 3;
   // Duration of the profile, if a duration makes sense.
-  int64 duration_nanos = 5;
+  uint64 duration_nano = 4;
   // The kind of events between sampled occurrences.
   // e.g [ "cpu","cycles" ] or [ "heap","bytes" ]
-  ValueType period_type = 6;
+  ValueType period_type = 5;
   // The number of events between sampled occurrences.
-  int64 period = 7;
+  int64 period = 6;
   // Free-form text associated with the profile. The text is displayed as is
   // to the user by the tools that read profiles (e.g. by pprof). This field
   // should not be used to store any machine-readable information, it is only
   // for human-friendly content. The profile must stay functional if this field
   // is cleaned.
-  repeated int32 comment_strindices = 8; // Indices into ProfilesDictionary.string_table.
-  // Index into the sample_type array to the default sample type.
-  int32 default_sample_type_index = 9;
+  repeated int32 comment_strindices = 7; // Indices into ProfilesDictionary.string_table.
 
   // A globally unique identifier for a profile. The ID is a 16-byte array. An ID with
-  // all zeroes is considered invalid.
-  //
-  // This field is required.
-  bytes profile_id = 10;
+  // all zeroes is considered invalid. It may be used for deduplication and signal
+  // correlation purposes. It is acceptable to treat two profiles with different values
+  // in this field as not equal, even if they represented the same object at an earlier
+  // time.
+  // This field is optional; an ID may be assigned to an ID-less profile in a later step.
+  bytes profile_id = 8;
 
   // dropped_attributes_count is the number of attributes that were discarded. Attributes
   // can be discarded because their keys are too long or because there are too many
   // attributes. If this value is 0, then no attributes were dropped.
-  uint32 dropped_attributes_count = 11;
+  uint32 dropped_attributes_count = 9;
 
   // Specifies format of the original payload. Common values are defined in semantic conventions. [required if original_payload is present]
-  string original_payload_format = 12;
+  string original_payload_format = 10;
 
   // Original payload can be stored in this field. This can be useful for users who want to get the original payload.
   // Formats such as JFR are highly extensible and can contain more information than what is defined in this spec.
@@ -268,30 +291,10 @@ message Profile {
   // If the original payload is in pprof format, it SHOULD not be included in this field.
   // The field is optional, however if it is present then equivalent converted data should be populated in other fields
   // of this message as far as is practicable.
-  bytes original_payload = 13;
+  bytes original_payload = 11;
 
   // References to attributes in attribute_table. [optional]
-  // It is a collection of key/value pairs. Note, global attributes
-  // like server name can be set using the resource API. Examples of attributes:
-  //
-  //     "/http/user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
-  //     "/http/server_latency": 300
-  //     "abc.com/myattribute": true
-  //     "abc.com/score": 10.239
-  //
-  // The OpenTelemetry API specification further restricts the allowed value types:
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  repeated int32 attribute_indices = 14;
-}
-
-// Represents a mapping between Attribute Keys and Units.
-message AttributeUnit {
-  // Index into string table.
-  int32 attribute_key_strindex = 1;
-  // Index into string table.
-  int32 unit_strindex = 2;
+  repeated int32 attribute_indices = 12;
 }
 
 // A pointer from a profile Sample to a trace Span.
@@ -381,32 +384,43 @@ message ValueType {
   AggregationTemporality aggregation_temporality = 3;
 }
 
-// Each Sample records values encountered in some program
-// context. The program context is typically a stack trace, perhaps
-// augmented with auxiliary information like the thread-id, some
-// indicator of a higher level request being handled etc.
+// Each Sample records values encountered in some program context. The program
+// context is typically a stack trace, perhaps augmented with auxiliary
+// information like the thread-id, some indicator of a higher level request
+// being handled etc.
+//
+// A Sample MUST have have at least one values or timestamps_unix_nano entry. If
+// both fields are populated, they MUST contain the same number of elements, and
+// the elements at the same index MUST refer to the same event.
+//
+// Examples of different ways of representing a sample with the total value of 10:
+//
+// Report of a stacktrace at 10 timestamps (consumers must assume the value is 1 for each point):
+//    values: []
+//    timestamps_unix_nano: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+//
+// Report of a stacktrace with an aggregated value without timestamps:
+//   values: [10]
+//    timestamps_unix_nano: []
+//
+// Report of a stacktrace at 4 timestamps where each point records a specific value:
+//    values: [2, 2, 3, 3]
+//    timestamps_unix_nano: [1, 2, 3, 4]
 message Sample {
-  // locations_start_index along with locations_length refers to to a slice of locations in Profile.location_indices.
-  int32 locations_start_index = 1;
-  // locations_length along with locations_start_index refers to a slice of locations in Profile.location_indices.
-  // Supersedes location_index.
-  int32 locations_length = 2;
-  // The type and unit of each value is defined by the corresponding
-  // entry in Profile.sample_type. All samples must have the same
-  // number of values, the same as the length of Profile.sample_type.
-  // When aggregating multiple samples into a single sample, the
-  // result has a list of values that is the element-wise sum of the
-  // lists of the originals.
-  repeated int64 value = 3;
+  // Reference to stack in ProfilesDictionary.stack_table.
+  int32 stack_index = 1;
+  // The type and unit of each value is defined by Profile.sample_type.
+  repeated int64 values = 2;
   // References to attributes in ProfilesDictionary.attribute_table. [optional]
-  repeated int32 attribute_indices = 4;
+  repeated int32 attribute_indices = 3;
 
   // Reference to link in ProfilesDictionary.link_table. [optional]
-  optional int32 link_index = 5;
+  // It can be unset / set to 0 if no link exists, as link_table[0] is always a 'null' default value.
+  int32 link_index = 4;
 
-  // Timestamps associated with Sample represented in nanoseconds. These timestamps are expected
-  // to fall within the Profile's time range. [optional]
-  repeated uint64 timestamps_unix_nano = 6;
+  // Timestamps associated with Sample represented in nanoseconds. These
+  // timestamps should fall within the Profile's time range.
+  repeated fixed64 timestamps_unix_nano = 5;
 }
 
 // Describes the mapping of a binary in memory, including its address range,
@@ -424,19 +438,21 @@ message Mapping {
   int32 filename_strindex = 4;  // Index into ProfilesDictionary.string_table.
   // References to attributes in ProfilesDictionary.attribute_table. [optional]
   repeated int32 attribute_indices = 5;
-  // The following fields indicate the resolution of symbolic info.
-  bool has_functions = 6;
-  bool has_filenames = 7;
-  bool has_line_numbers = 8;
-  bool has_inline_frames = 9;
+}
+
+// A Stack represents a stack trace as a list of locations.
+message Stack {
+  // References to locations in ProfilesDictionary.location_table.
+  // The first location is the leaf frame.
+  repeated int32 location_indices = 1;
 }
 
 // Describes function and line table debug information.
 message Location {
   // Reference to mapping in ProfilesDictionary.mapping_table.
-  // It can be unset if the mapping is unknown or not applicable for
-  // this profile type.
-  optional int32 mapping_index = 1;
+  // It can be unset / set to 0 if the mapping is unknown or not applicable for
+  // this profile type, as mapping_table[0] is always a 'null' default mapping.
+  int32 mapping_index = 1;
   // The instruction address for this location, if available.  It
   // should be within [Mapping.memory_start...Mapping.memory_limit]
   // for the corresponding mapping. A non-leaf address may be in the
@@ -451,15 +467,8 @@ message Location {
   //    line[0].function_name == "memcpy"
   //    line[1].function_name == "printf"
   repeated Line line = 3;
-  // Provides an indication that multiple symbols map to this location's
-  // address, for example due to identical code folding by the linker. In that
-  // case the line information above represents one of the multiple
-  // symbols. This field must be recomputed when the symbolization state of the
-  // profile changes.
-  bool is_folded = 4;
-
   // References to attributes in ProfilesDictionary.attribute_table. [optional]
-  repeated int32 attribute_indices = 5;
+  repeated int32 attribute_indices = 4;
 }
 
 // Details a specific line in a source code, linked to a function.
@@ -485,3 +494,12 @@ message Function {
   // Line number in source file. 0 means unset.
   int64 start_line = 4;
 }
+
+// A custom 'dictionary native' style of encoding attributes which is more convenient
+// for profiles than opentelemetry.proto.common.v1.KeyValue
+// Specifically, uses the string table for keys and allows optional unit information.
+message KeyValueAndUnit {
+  int32 key_strindex  = 1;
+  opentelemetry.proto.common.v1.AnyValue value = 2;
+  int32 unit_strindex = 3; // zero indicates implicit (by semconv) or non-defined unit.
+}
diff --git a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
index 05d4456840f..8affbe3326d 100644
--- a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
+++ b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto
@@ -29,6 +29,16 @@ message Resource {
   // Set of attributes that describe the resource.
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
 
   // dropped_attributes_count is the number of dropped attributes. If the value is 0, then
diff --git a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
index 24442853edc..fec6f9e3a9d 100644
--- a/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
+++ b/deps/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto
@@ -206,10 +206,18 @@ message Span {
   //     "example.com/myattribute": true
   //     "example.com/score": 10.239
   //
-  // The OpenTelemetry API specification further restricts the allowed value types:
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute
   // Attribute keys MUST be unique (it is not allowed to have more than one
   // attribute with the same key).
+  //
+  // The attribute values SHOULD NOT contain empty values.
+  // The attribute values SHOULD NOT contain bytes values.
+  // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+  // double values.
+  // The attribute values SHOULD NOT contain kvlist values.
+  // The behavior of software that receives attributes containing such values can be unpredictable.
+  // These restrictions can change in a minor release.
+  // The restrictions take origin from the OpenTelemetry specification:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
   repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
 
   // dropped_attributes_count is the number of attributes that were discarded. Attributes
@@ -230,6 +238,16 @@ message Span {
     // attributes is a collection of attribute key/value pairs on the event.
     // Attribute keys MUST be unique (it is not allowed to have more than one
     // attribute with the same key).
+    //
+    // The attribute values SHOULD NOT contain empty values.
+    // The attribute values SHOULD NOT contain bytes values.
+    // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+    // double values.
+    // The attribute values SHOULD NOT contain kvlist values.
+    // The behavior of software that receives attributes containing such values can be unpredictable.
+    // These restrictions can change in a minor release.
+    // The restrictions take origin from the OpenTelemetry specification:
+    // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
     repeated opentelemetry.proto.common.v1.KeyValue attributes = 3;
 
     // dropped_attributes_count is the number of dropped attributes. If the value is 0,
@@ -262,6 +280,16 @@ message Span {
     // attributes is a collection of attribute key/value pairs on the link.
     // Attribute keys MUST be unique (it is not allowed to have more than one
     // attribute with the same key).
+    //
+    // The attribute values SHOULD NOT contain empty values.
+    // The attribute values SHOULD NOT contain bytes values.
+    // The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
+    // double values.
+    // The attribute values SHOULD NOT contain kvlist values.
+    // The behavior of software that receives attributes containing such values can be unpredictable.
+    // These restrictions can change in a minor release.
+    // The restrictions take origin from the OpenTelemetry specification:
+    // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.
     repeated opentelemetry.proto.common.v1.KeyValue attributes = 4;
 
     // dropped_attributes_count is the number of dropped attributes. If the value is 0,
diff --git a/deps/opentelemetry-cpp/third_party_release b/deps/opentelemetry-cpp/third_party_release
index 93b6ce47a57..76b8d189c59 100644
--- a/deps/opentelemetry-cpp/third_party_release
+++ b/deps/opentelemetry-cpp/third_party_release
@@ -12,18 +12,18 @@
 #  - update the matching git submodule to the new tag.
 #  - update the Bazel build files
 #     - opentelemetry-cpp/MODULE.bazel
-#     - opentelemetry-cpp/bazel/repository.bzl
 
-abseil=20220623.2
+abseil=20250127.0
 zlib=v1.3.1
-curl=curl-8_12_0
-protobuf=v3.21.6
-grpc=v1.49.2
-benchmark=v1.8.3
-googletest=v1.14.0
-ms-gsl=v3.1.0
+curl=curl-8_16_0
+protobuf=v6.31.1
+grpc=v1.75.1
+benchmark=v1.9.4
+googletest=v1.17.0
+ms-gsl=v4.2.0
 nlohmann-json=v3.12.0
-opentelemetry-proto=v1.7.0
+opentelemetry-proto=v1.8.0
 opentracing-cpp=v1.6.0
 prometheus-cpp=v1.3.0
+ryml=v0.9.0
 vcpkg=2024.02.14

From b038d0626068b15442fca85a61a3d3379368ffd1 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Thu, 12 Sep 2024 17:30:16 +0200
Subject: [PATCH 2/2] deps: add support for exporting Summary via OTLP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodesource/nsolid/pull/180
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
PR-URL: https://github.com/nodesource/nsolid/pull/371
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
---
 .../exporters/otlp/otlp_metric_utils.h        |  3 +
 .../exporters/otlp/src/otlp_metric_utils.cc   | 63 +++++++++++++++++++
 .../metrics/aggregation/default_aggregation.h |  2 +
 .../sdk/metrics/data/metric_data.h            |  3 +-
 .../sdk/metrics/data/point_data.h             | 14 +++++
 .../opentelemetry/sdk/metrics/instruments.h   |  6 +-
 6 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
index ba9b11e37d0..a9836645a9e 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
+++ b/deps/opentelemetry-cpp/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
@@ -62,6 +62,9 @@ class OtlpMetricUtils
   static void ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
                                  proto::metrics::v1::Gauge *const gauge) noexcept;
 
+  static void ConvertSummaryMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
+                                   proto::metrics::v1::Summary *const summary) noexcept;
+
   static void PopulateInstrumentInfoMetrics(
       const opentelemetry::sdk::metrics::MetricData &metric_data,
       proto::metrics::v1::Metric *metric) noexcept;
diff --git a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
index 0409037b0ad..fca11a68733 100644
--- a/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
+++ b/deps/opentelemetry-cpp/exporters/otlp/src/otlp_metric_utils.cc
@@ -76,6 +76,11 @@ metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType(
   {
     return metric_sdk::AggregationType::kLastValue;
   }
+  else if (nostd::holds_alternative<sdk::metrics::SummaryPointData>(
+               point_data_with_attributes.point_data))
+  {
+    return metric_sdk::AggregationType::kSummary;
+  }
   return metric_sdk::AggregationType::kDrop;
 }
 
@@ -279,6 +284,56 @@ void OtlpMetricUtils::ConvertGaugeMetric(const opentelemetry::sdk::metrics::Metr
   }
 }
 
+void OtlpMetricUtils::ConvertSummaryMetric(const metric_sdk::MetricData &metric_data,
+                                           proto::metrics::v1::Summary *const summary) noexcept
+{
+  auto start_ts = metric_data.start_ts.time_since_epoch().count();
+  auto ts       = metric_data.end_ts.time_since_epoch().count();
+  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
+  {
+    proto::metrics::v1::SummaryDataPoint *proto_summary_point_data = summary->add_data_points();
+    proto_summary_point_data->set_start_time_unix_nano(start_ts);
+    proto_summary_point_data->set_time_unix_nano(ts);
+    auto summary_data = nostd::get<sdk::metrics::SummaryPointData>(point_data_with_attributes.point_data);
+
+    // sum
+    if ((nostd::holds_alternative<int64_t>(summary_data.sum_)))
+    {
+      // Use static_cast to avoid C4244 in MSVC
+      proto_summary_point_data->set_sum(
+          static_cast<double>(nostd::get<int64_t>(summary_data.sum_)));
+    }
+    else
+    {
+      proto_summary_point_data->set_sum(nostd::get<double>(summary_data.sum_));
+    }
+    // count
+    proto_summary_point_data->set_count(summary_data.count_);
+    // quantile values
+    for (auto &kv : summary_data.quantile_values_)
+    {
+      proto::metrics::v1::SummaryDataPoint::ValueAtQuantile *quantile =
+          proto_summary_point_data->add_quantile_values();
+      quantile->set_quantile(kv.first);
+      if ((nostd::holds_alternative<int64_t>(kv.second)))
+      {
+        // Use static_cast to avoid C4244 in MSVC
+        quantile->set_value(static_cast<double>(nostd::get<int64_t>(kv.second)));
+      }
+      else
+      {
+        quantile->set_value(nostd::get<double>(kv.second));
+      }
+    }
+    // set attributes
+    for (auto &kv_attr : point_data_with_attributes.attributes)
+    {
+      OtlpPopulateAttributeUtils::PopulateAttribute(proto_summary_point_data->add_attributes(),
+                                                    kv_attr.first, kv_attr.second, false);
+    }
+  }
+}
+
 void OtlpMetricUtils::PopulateInstrumentInfoMetrics(
     const opentelemetry::sdk::metrics::MetricData &metric_data,
     proto::metrics::v1::Metric *metric) noexcept
@@ -305,6 +360,10 @@ void OtlpMetricUtils::PopulateInstrumentInfoMetrics(
       ConvertGaugeMetric(metric_data, metric->mutable_gauge());
       break;
     }
+    case metric_sdk::AggregationType::kSummary: {
+      ConvertSummaryMetric(metric_data, metric->mutable_summary());
+      break;
+    }
     default:
       break;
   }
@@ -381,6 +440,8 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::DeltaTemporalitySelector(
     case sdk::metrics::InstrumentType::kUpDownCounter:
     case sdk::metrics::InstrumentType::kObservableUpDownCounter:
       return sdk::metrics::AggregationTemporality::kCumulative;
+    case sdk::metrics::InstrumentType::kSummary:
+      return sdk::metrics::AggregationTemporality::kUnspecified;
   }
   return sdk::metrics::AggregationTemporality::kUnspecified;
 }
@@ -405,6 +466,8 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::LowMemoryTemporalitySelect
     case sdk::metrics::InstrumentType::kUpDownCounter:
     case sdk::metrics::InstrumentType::kObservableUpDownCounter:
       return sdk::metrics::AggregationTemporality::kCumulative;
+    case sdk::metrics::InstrumentType::kSummary:
+      return sdk::metrics::AggregationTemporality::kUnspecified;
   }
   return sdk::metrics::AggregationTemporality::kUnspecified;
 }
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
index 70f6f8ee74f..abc4070010b 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
@@ -192,6 +192,8 @@ class DefaultAggregation
       case InstrumentType::kGauge:
       case InstrumentType::kObservableGauge:
         return AggregationType::kLastValue;
+      case InstrumentType::kSummary:
+        return AggregationType::kSummary;
       default:
         return AggregationType::kDrop;
     }
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
index 30fa04e47fd..6650ced1aee 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
@@ -22,7 +22,8 @@ using PointType       = opentelemetry::nostd::variant<SumPointData,
                                                       HistogramPointData,
                                                       Base2ExponentialHistogramPointData,
                                                       LastValuePointData,
-                                                      DropPointData>;
+                                                      DropPointData,
+                                                      SummaryPointData>;
 
 struct PointDataAttributes
 {
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
index a88bf25a764..fa10997ef6a 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
@@ -167,6 +167,20 @@ class DropPointData
   DropPointData &operator=(DropPointData &&) = default;
 };
 
+class SummaryPointData
+{
+public:
+// TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
+  SummaryPointData(SummaryPointData &&)            = default;
+  SummaryPointData(const SummaryPointData &)       = default;
+  SummaryPointData &operator=(SummaryPointData &&) = default;
+  SummaryPointData()                               = default;
+
+  uint64_t count_                 = {};
+  ValueType sum_                  = {};
+  std::unordered_map<double, ValueType> quantile_values_ = {};
+};
+
 }  // namespace metrics
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
index 620fddedb50..86225918b66 100644
--- a/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
+++ b/deps/opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/instruments.h
@@ -24,7 +24,8 @@ enum class InstrumentType
   kObservableCounter,
   kObservableGauge,
   kObservableUpDownCounter,
-  kGauge
+  kGauge,
+  kSummary
 };
 
 enum class InstrumentClass
@@ -48,7 +49,8 @@ enum class AggregationType
   kLastValue,
   kSum,
   kDefault,
-  kBase2ExponentialHistogram
+  kBase2ExponentialHistogram,
+  kSummary
 };
 
 enum class AggregationTemporality