otel-cpp 1.24

Author: duncanpo

CMakeLists.txt

@@ -282,7 +282,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
    include(ExternalProject)
    set(OTEL_CPP_PROJECT_NAME opentelemetry-cpp)
    set(OTEL_CPP_GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp.git")
-   set(OTEL_CPP_GIT_TAG "955a807")
+   set(OTEL_CPP_GIT_TAG "a7b1008")
 
    set(OTEL_CPP_CXX_STANDARD 14)
 

examples/context_propagation/cpp/client.cc

@@ -1,8 +1,9 @@
-// Copyright 2023-2024 The MathWorks, Inc.
+// Copyright 2023-2026 The MathWorks, Inc.
 
 #include "opentelemetry/ext/http/client/http_client_factory.h"
 #include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/trace/semantic_conventions.h"
+#include "opentelemetry/semconv/url_attributes.h"
+#include "opentelemetry/semconv/http_attributes.h"
 #include "HttpTextMapCarrier.h"
 
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
@@ -26,6 +27,7 @@ using namespace opentelemetry::trace;
 namespace http_client = opentelemetry::ext::http::client;
 namespace context     = opentelemetry::context;
 namespace nostd       = opentelemetry::nostd;
+namespace semconv     = opentelemetry::semconv;
 
 void InitTracer()
 {
@@ -71,9 +73,9 @@ void sendRequest(const std::string &url)
   std::string span_name = url_parser.path_;
   auto span             = get_tracer("http-client")
                   ->StartSpan(span_name,
-                              {{SemanticConventions::kUrlFull, url_parser.url_},
-                               {SemanticConventions::kUrlScheme, url_parser.scheme_},
-                               {SemanticConventions::kHttpRequestMethod, "POST"}},
+                              {{semconv::url::kUrlFull, url_parser.url_},
+                               {semconv::url::kUrlScheme, url_parser.scheme_},
+                               {semconv::http::kHttpRequestMethod, "POST"}},
                               options);
   auto scope = get_tracer("http-client")->WithActiveSpan(span);
 
@@ -89,7 +91,7 @@ void sendRequest(const std::string &url)
   {
     // set span attributes
     auto status_code = result.GetResponse().GetStatusCode();
-    span->SetAttribute(SemanticConventions::kHttpResponseStatusCode, status_code);
+    span->SetAttribute(semconv::http::kHttpResponseStatusCode, status_code);
     result.GetResponse().ForEachHeader(
         [&span](nostd::string_view header_name, nostd::string_view header_value) {
           span->SetAttribute("http.header." + std::string(header_name.data()), header_value);

examples/webread/cpp/server.cc

@@ -1,8 +1,11 @@
-// Copyright 2023-2024 The MathWorks, Inc.
+// Copyright 2023-2026 The MathWorks, Inc.
 
 #include "server.h"
 #include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/semantic_conventions.h"
+#include "opentelemetry/semconv/url_attributes.h"
+#include "opentelemetry/semconv/server_attributes.h"
+#include "opentelemetry/semconv/client_attributes.h"
+#include "opentelemetry/semconv/incubating/http_attributes.h"
 #include "HttpTextMapCarrier.h"
 
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
@@ -25,6 +28,7 @@ namespace
 using namespace opentelemetry::trace;
 namespace context = opentelemetry::context;
 namespace common = opentelemetry::common;
+namespace semconv= opentelemetry::semconv;
 
 uint16_t server_port              = 8800;
 constexpr const char *server_name = "localhost";
@@ -79,13 +83,13 @@ class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
     // start span with parent context extracted from http header
     auto span = get_tracer("http_server")
                     ->StartSpan(span_name,
-                                {{SemanticConventions::kServerAddress, server_name},
-                                 {SemanticConventions::kServerPort, server_port},
-                                 {SemanticConventions::kHttpRequestMethod, request.method},
-                                 {SemanticConventions::kUrlScheme, "http"},
-                                 {SemanticConventions::kHttpRequestBodySize,
+                                {{semconv::server::kServerAddress, server_name},
+                                 {semconv::server::kServerPort, server_port},
+                                 {semconv::http::kHttpRequestMethod, request.method},
+                                 {semconv::url::kUrlScheme, "http"},
+                                 {semconv::http::kHttpRequestBodySize,
                                   static_cast<uint64_t>(request.content.length())},
-                                 {SemanticConventions::kClientAddress, request.client}},
+                                 {semconv::client::kClientAddress, request.client}},
                                 options);
 
     auto scope = get_tracer("http_server")->WithActiveSpan(span);

patches/otel-cpp-windows.patch

@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc085b1a..6c4dc0ae 100644
+index 6da525dc..07592866 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -15,6 +15,12 @@ endif()
- 
- project(opentelemetry-cpp)
+@@ -21,6 +21,12 @@ project(
+   VERSION "${OPENTELEMETRY_VERSION_NUMBER}"
+   LANGUAGES CXX)
 
 +if(WIN32)
 +  # Add a preprocessor macro _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR to work around an invalid MEX file issue

sdk/metrics/include/opentelemetry-matlab/sdk/metrics/ViewProxy.h

@@ -1,4 +1,4 @@
-// Copyright 2023-2024 The MathWorks, Inc.
+// Copyright 2023-2026 The MathWorks, Inc.
 
 #pragma once
 
@@ -19,9 +19,6 @@
 #include "opentelemetry/sdk/metrics/view/meter_selector.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 
-
-#include "opentelemetry-matlab/sdk/metrics/ViewProxy.h"
-
 namespace metrics_sdk = opentelemetry::sdk::metrics;
 namespace nostd = opentelemetry::nostd;
 
@@ -87,7 +84,7 @@ class ViewProxy : public libmexclass::proxy::Proxy {
     std::string Description;
     metrics_sdk::AggregationType Aggregation;
     std::vector<double> HistogramBinEdges;
-    std::unordered_map<std::string, bool> AllowedAttributes;
+    metrics_sdk::FilterAttributeMap AllowedAttributes;
     bool FilterAttributes;
 };
 }

sdk/metrics/src/ViewProxy.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023-2025 The MathWorks, Inc.
+// Copyright 2023-2026 The MathWorks, Inc.
 
 #include "opentelemetry-matlab/sdk/metrics/ViewProxy.h"
 
@@ -117,14 +117,18 @@ std::unique_ptr<metrics_sdk::View> ViewProxy::getView(){
     }
 
     // HistogramAggregationConfig
-    auto aggregation_config = std::shared_ptr<metrics_sdk::HistogramAggregationConfig>(new metrics_sdk::HistogramAggregationConfig());
+    std::shared_ptr<metrics_sdk::AggregationConfig> aggregation_config;
     if(Aggregation == metrics_sdk::AggregationType::kHistogram ||
 		    (Aggregation == metrics_sdk::AggregationType::kDefault && InstrumentType == metrics_sdk::InstrumentType::kHistogram)){
-        aggregation_config->boundaries_ = HistogramBinEdges;
+	auto histogram_aggregation_config = std::make_shared<metrics_sdk::HistogramAggregationConfig>();
+        histogram_aggregation_config->boundaries_ = HistogramBinEdges;
+	aggregation_config = histogram_aggregation_config;
+    } else {
+	aggregation_config = std::make_shared<metrics_sdk::AggregationConfig>();
     }
 
     // View
-    return metrics_sdk::ViewFactory::Create(Name, Description, "", Aggregation, aggregation_config, std::move(attributes_processor));
+    return metrics_sdk::ViewFactory::Create(Name, Description, Aggregation, aggregation_config, std::move(attributes_processor));
 }
 
 std::unique_ptr<metrics_sdk::InstrumentSelector> ViewProxy::getInstrumentSelector(){