Skip to content

Commit 853140c

Browse files
duncanpoduncanpo
authored
Merge pull request #114 from mathworks/logs
merge from logs branch
2 parents cf0a66b + 6b2ea54 commit 853140c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2650
-233
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Build OpenTelemetry-Matlab
8383
working-directory: opentelemetry-matlab
8484
run: |
85-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
85+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
8686
cmake --build build --config Release --target install
8787
- name: Run tests
8888
env:

‎.github/workflows/publish_mltbx.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
- name: Build OpenTelemetry-Matlab
2525
working-directory: opentelemetry-matlab
2626
run: |
27-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
27+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
2828
cmake --build build --config Release --target install
2929
- name: Compress into single artifact
3030
working-directory: ${{ github.workspace }}
31-
run: tar -czf otel-matlab-ubuntu.tar.gz otel_matlab_install
31+
run: tar -czf otel-matlab-ubuntu.tar.gz ${{ env.OPENTELEMETRY_MATLAB_INSTALL}}
3232
- name: Upload artifacts
3333
uses: actions/upload-artifact@v2
3434
with:
@@ -54,11 +54,11 @@ jobs:
5454
shell: cmd
5555
run: |
5656
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
57-
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
57+
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5858
cmake --build build --config Release --target install
5959
- name: Compress into single artifact
6060
working-directory: ${{ github.workspace }}
61-
run: tar -czf otel-matlab-windows.tar.gz otel_matlab_install
61+
run: tar -czf otel-matlab-windows.tar.gz ${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
6262
- name: Upload artifacts
6363
uses: actions/upload-artifact@v2
6464
with:
@@ -82,11 +82,11 @@ jobs:
8282
- name: Build OpenTelemetry-Matlab
8383
working-directory: opentelemetry-matlab
8484
run: |
85-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
85+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_GRPC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
8686
cmake --build build --config Release --target install
8787
- name: Compress into single artifact
8888
working-directory: ${{ github.workspace }}
89-
run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install
89+
run: tar -czf otel-matlab-macos.tar.gz ${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
9090
- name: Upload artifacts
9191
uses: actions/upload-artifact@v2
9292
with:
@@ -133,14 +133,12 @@ jobs:
133133
uses: matlab-actions/run-command@v1
134134
with:
135135
command: packageMatlabInterface
136-
- name: Compress Asset
137-
run: zip otel-matlab-${{ github.event.release.tag_name }}.mltbx.zip otel-matlab.mltbx
138136
- name: Upload Release Asset
139137
uses: actions/upload-release-asset@v1
140138
env:
141139
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
142140
with:
143141
upload_url: ${{ github.event.release.upload_url }}
144-
asset_path: ./otel-matlab-${{ github.event.release.tag_name }}.mltbx.zip
145-
asset_name: otel-matlab-${{ github.event.release.tag_name }}.mltbx.zip
146-
asset_content_type: application/zip
142+
asset_path: ./otel-matlab.mltbx
143+
asset_name: otel-matlab.mltbx
144+
asset_content_type: application/octet-stream

‎CMakeLists.txt‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.7.0)
1+
cmake_minimum_required(VERSION 3.9.0)
22

33
cmake_policy(SET CMP0074 NEW)
44

@@ -37,7 +37,7 @@ else()
3737

3838
set(VCPKG_FETCH_CONTENT_NAME vcpkg)
3939
set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git")
40-
set(VCPKG_GIT_TAG "9edb1b8")
40+
set(VCPKG_GIT_TAG "fba75d0")
4141
FetchContent_Declare(
4242
${VCPKG_FETCH_CONTENT_NAME}
4343
GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY}
@@ -155,12 +155,14 @@ if(WITH_OTLP_HTTP)
155155
set(OTEL_CPP_LIBRARIES ${OTEL_CPP_LIBRARIES} ${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http${CMAKE_STATIC_LIBRARY_SUFFIX}
156156
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_client${CMAKE_STATIC_LIBRARY_SUFFIX}
157157
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_metric${CMAKE_STATIC_LIBRARY_SUFFIX}
158+
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_log${CMAKE_STATIC_LIBRARY_SUFFIX}
158159
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_http_client_curl${CMAKE_STATIC_LIBRARY_SUFFIX})
159160
endif()
160161
if(WITH_OTLP_GRPC)
161162
set(OTEL_CPP_LIBRARIES ${OTEL_CPP_LIBRARIES} ${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_grpc${CMAKE_STATIC_LIBRARY_SUFFIX}
162163
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_grpc_client${CMAKE_STATIC_LIBRARY_SUFFIX}
163164
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_grpc_metrics${CMAKE_STATIC_LIBRARY_SUFFIX}
165+
${OTEL_CPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_grpc_log${CMAKE_STATIC_LIBRARY_SUFFIX}
164166
${OTEL_CPP_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}opentelemetry_proto_grpc${OTEL_PROTO_LIBRARY_SUFFIX})
165167
endif()
166168

@@ -169,7 +171,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
169171
include(ExternalProject)
170172
set(OTEL_CPP_PROJECT_NAME opentelemetry-cpp)
171173
set(OTEL_CPP_GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp.git")
172-
set(OTEL_CPP_GIT_TAG "a799f4a")
174+
set(OTEL_CPP_GIT_TAG "054b0dc")
173175

174176
set(OTEL_CPP_CXX_STANDARD 14)
175177

@@ -225,24 +227,28 @@ endif()
225227

226228
set(TRACE_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/trace/include)
227229
set(METRICS_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/metrics/include)
230+
set(LOGS_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/logs/include)
228231
set(CONTEXT_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/context/include)
229232
set(BAGGAGE_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/baggage/include)
230233
set(COMMON_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/common/include)
231234
set(TRACE_SDK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/trace/include)
232235
set(METRICS_SDK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/metrics/include)
236+
set(LOGS_SDK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/logs/include)
233237
set(COMMON_SDK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/common/include)
234238
set(OTLP_EXPORTER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/include)
235-
set(OPENTELEMETRY_PROXY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${TRACE_API_INCLUDE_DIR} ${METRICS_API_INCLUDE_DIR} ${CONTEXT_API_INCLUDE_DIR} ${BAGGAGE_API_INCLUDE_DIR} ${COMMON_API_INCLUDE_DIR} ${TRACE_SDK_INCLUDE_DIR} ${METRICS_SDK_INCLUDE_DIR} ${COMMON_SDK_INCLUDE_DIR} ${OTLP_EXPORTER_INCLUDE_DIR} ${OTEL_CPP_PREFIX}/include ${Matlab_INCLUDE_DIRS})
239+
set(OPENTELEMETRY_PROXY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${TRACE_API_INCLUDE_DIR} ${METRICS_API_INCLUDE_DIR} ${LOGS_API_INCLUDE_DIR} ${CONTEXT_API_INCLUDE_DIR} ${BAGGAGE_API_INCLUDE_DIR} ${COMMON_API_INCLUDE_DIR} ${TRACE_SDK_INCLUDE_DIR} ${METRICS_SDK_INCLUDE_DIR} ${LOGS_SDK_INCLUDE_DIR} ${COMMON_SDK_INCLUDE_DIR} ${OTLP_EXPORTER_INCLUDE_DIR} ${OTEL_CPP_PREFIX}/include ${Matlab_INCLUDE_DIRS})
236240

237241
set(OPENTELEMETRY_PROXY_FACTORY_CLASS_NAME OtelMatlabProxyFactory)
238242
set(OPENTELEMETRY_PROXY_FACTORY_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR})
239243
set(TRACE_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/trace/src)
240244
set(METRICS_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/metrics/src)
245+
set(LOGS_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/logs/src)
241246
set(CONTEXT_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/context/src)
242247
set(BAGGAGE_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/baggage/src)
243248
set(COMMON_API_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/common/src)
244249
set(TRACE_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/trace/src)
245250
set(METRICS_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/metrics/src)
251+
set(LOGS_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/logs/src)
246252
set(COMMON_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sdk/common/src)
247253
set(OTLP_EXPORTER_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/src)
248254
set(OPENTELEMETRY_PROXY_SOURCES
@@ -261,6 +267,8 @@ set(OPENTELEMETRY_PROXY_SOURCES
261267
${METRICS_API_SOURCE_DIR}/MeasurementFetcher.cpp
262268
${METRICS_API_SOURCE_DIR}/AsynchronousInstrumentProxy.cpp
263269
${METRICS_API_SOURCE_DIR}/AsynchronousInstrumentProxyFactory.cpp
270+
${LOGS_API_SOURCE_DIR}/LoggerProviderProxy.cpp
271+
${LOGS_API_SOURCE_DIR}/LoggerProxy.cpp
264272
${CONTEXT_API_SOURCE_DIR}/TextMapPropagatorProxy.cpp
265273
${CONTEXT_API_SOURCE_DIR}/CompositePropagatorProxy.cpp
266274
${CONTEXT_API_SOURCE_DIR}/TextMapCarrierProxy.cpp
@@ -273,18 +281,23 @@ set(OPENTELEMETRY_PROXY_SOURCES
273281
${METRICS_SDK_SOURCE_DIR}/MeterProviderProxy.cpp
274282
${METRICS_SDK_SOURCE_DIR}/ViewProxy.cpp
275283
${METRICS_SDK_SOURCE_DIR}/PeriodicExportingMetricReaderProxy.cpp
284+
${LOGS_SDK_SOURCE_DIR}/LoggerProviderProxy.cpp
285+
${LOGS_SDK_SOURCE_DIR}/SimpleLogRecordProcessorProxy.cpp
286+
${LOGS_SDK_SOURCE_DIR}/BatchLogRecordProcessorProxy.cpp
276287
${COMMON_SDK_SOURCE_DIR}/resource.cpp)
277288
if(WITH_OTLP_HTTP)
278289
set(OPENTELEMETRY_PROXY_SOURCES
279290
${OPENTELEMETRY_PROXY_SOURCES}
280291
${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpSpanExporterProxy.cpp
281-
${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpMetricExporterProxy.cpp)
292+
${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpMetricExporterProxy.cpp
293+
${OTLP_EXPORTER_SOURCE_DIR}/OtlpHttpLogRecordExporterProxy.cpp)
282294
endif()
283295
if(WITH_OTLP_GRPC)
284296
set(OPENTELEMETRY_PROXY_SOURCES
285297
${OPENTELEMETRY_PROXY_SOURCES}
286298
${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcSpanExporterProxy.cpp
287-
${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcMetricExporterProxy.cpp)
299+
${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcMetricExporterProxy.cpp
300+
${OTLP_EXPORTER_SOURCE_DIR}/OtlpGrpcLogRecordExporterProxy.cpp)
288301
endif()
289302

290303
libmexclass_client_add_proxy_library(
@@ -341,6 +354,7 @@ target_link_libraries(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OPENTELEMETR
341354
if(UNIX AND NOT APPLE AND NOT CYGWIN)
342355
set(OPENTELEMETRY_PROXY_LINK_OPTIONS -Wl,--whole-archive
343356
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_trace.a"
357+
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_logs.a"
344358
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_common.a"
345359
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_otlp_recordable.a"
346360
${ABSL_LIBRARIES}
@@ -417,35 +431,42 @@ libmexclass_client_install(
417431
# Install M files
418432
set(TRACE_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/trace/+opentelemetry)
419433
set(METRICS_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/metrics/+opentelemetry)
434+
set(LOGS_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/logs/+opentelemetry)
420435
set(CONTEXT_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/context/+opentelemetry)
421436
set(BAGGAGE_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/baggage/+opentelemetry)
422437
set(COMMON_API_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/api/common/+opentelemetry)
423438
set(TRACE_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/trace/+opentelemetry)
424439
set(METRICS_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/metrics/+opentelemetry)
440+
set(LOGS_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/logs/+opentelemetry)
425441
set(COMMON_SDK_MATLAB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sdk/common/+opentelemetry)
426442
set(EXPORTER_MATLAB_SOURCES
427443
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultSpanExporter.m
428444
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultMetricExporter.m
445+
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/defaultLogRecordExporter.m
429446
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpValidator.m)
430447
set(OTLP_HTTP_EXPORTER_MATLAB_SOURCES
431448
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpSpanExporter.m
432449
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpMetricExporter.m
450+
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpLogRecordExporter.m
433451
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpHttpValidator.m)
434452
set(OTLP_GRPC_EXPORTER_MATLAB_SOURCES
435453
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcSpanExporter.m
436454
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcMetricExporter.m
455+
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcLogRecordExporter.m
437456
${CMAKE_CURRENT_SOURCE_DIR}/exporters/otlp/+opentelemetry/+exporters/+otlp/OtlpGrpcValidator.m)
438457
set(OTLP_MISC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt)
439458

440459
set(OTLP_EXPORTERS_DIR +opentelemetry/+exporters/+otlp)
441460

442461
install(DIRECTORY ${TRACE_API_MATLAB_SOURCES} DESTINATION .)
443462
install(DIRECTORY ${METRICS_API_MATLAB_SOURCES} DESTINATION .)
463+
install(DIRECTORY ${LOGS_API_MATLAB_SOURCES} DESTINATION .)
444464
install(DIRECTORY ${CONTEXT_API_MATLAB_SOURCES} DESTINATION .)
445465
install(DIRECTORY ${BAGGAGE_API_MATLAB_SOURCES} DESTINATION .)
446466
install(DIRECTORY ${COMMON_API_MATLAB_SOURCES} DESTINATION .)
447467
install(DIRECTORY ${TRACE_SDK_MATLAB_SOURCES} DESTINATION .)
448468
install(DIRECTORY ${METRICS_SDK_MATLAB_SOURCES} DESTINATION .)
469+
install(DIRECTORY ${LOGS_SDK_MATLAB_SOURCES} DESTINATION .)
449470
install(DIRECTORY ${COMMON_SDK_MATLAB_SOURCES} DESTINATION .)
450471
install(FILES ${EXPORTER_MATLAB_SOURCES} DESTINATION ${OTLP_EXPORTERS_DIR})
451472
if(WITH_OTLP_HTTP)

‎OtelMatlabProxyFactory.cpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 The MathWorks, Inc.
1+
// Copyright 2023-2024 The MathWorks, Inc.
22

33
#include "OtelMatlabProxyFactory.h"
44

@@ -8,6 +8,7 @@
88
//#include "opentelemetry-matlab/trace/ScopeProxy.h"
99
#include "opentelemetry-matlab/trace/SpanContextProxy.h"
1010
#include "opentelemetry-matlab/trace/TraceContextPropagatorProxy.h"
11+
#include "opentelemetry-matlab/logs/LoggerProviderProxy.h"
1112
#include "opentelemetry-matlab/context/propagation/TextMapCarrierProxy.h"
1213
#include "opentelemetry-matlab/context/propagation/TextMapPropagatorProxy.h"
1314
#include "opentelemetry-matlab/context/propagation/CompositePropagatorProxy.h"
@@ -25,19 +26,25 @@
2526
#include "opentelemetry-matlab/sdk/metrics/MeterProviderProxy.h"
2627
#include "opentelemetry-matlab/sdk/metrics/ViewProxy.h"
2728
#include "opentelemetry-matlab/sdk/metrics/PeriodicExportingMetricReaderProxy.h"
29+
#include "opentelemetry-matlab/sdk/logs/LoggerProviderProxy.h"
30+
#include "opentelemetry-matlab/sdk/logs/SimpleLogRecordProcessorProxy.h"
31+
#include "opentelemetry-matlab/sdk/logs/BatchLogRecordProcessorProxy.h"
2832
#ifdef WITH_OTLP_HTTP
2933
#include "opentelemetry-matlab/exporters/otlp/OtlpHttpSpanExporterProxy.h"
3034
#include "opentelemetry-matlab/exporters/otlp/OtlpHttpMetricExporterProxy.h"
35+
#include "opentelemetry-matlab/exporters/otlp/OtlpHttpLogRecordExporterProxy.h"
3136
#endif
3237
#ifdef WITH_OTLP_GRPC
3338
#include "opentelemetry-matlab/exporters/otlp/OtlpGrpcSpanExporterProxy.h"
3439
#include "opentelemetry-matlab/exporters/otlp/OtlpGrpcMetricExporterProxy.h"
40+
#include "opentelemetry-matlab/exporters/otlp/OtlpGrpcLogRecordExporterProxy.h"
3541
#endif
3642

3743
libmexclass::proxy::MakeResult
3844
OtelMatlabProxyFactory::make_proxy(const libmexclass::proxy::ClassName& class_name,
3945
const libmexclass::proxy::FunctionArguments& constructor_arguments) {
4046

47+
REGISTER_PROXY(libmexclass.opentelemetry.LoggerProviderProxy, libmexclass::opentelemetry::LoggerProviderProxy);
4148
REGISTER_PROXY(libmexclass.opentelemetry.MeterProviderProxy, libmexclass::opentelemetry::MeterProviderProxy);
4249
REGISTER_PROXY(libmexclass.opentelemetry.TracerProviderProxy, libmexclass::opentelemetry::TracerProviderProxy);
4350
//REGISTER_PROXY(libmexclass.opentelemetry.TracerProxy, libmexclass::opentelemetry::TracerProxy);
@@ -65,13 +72,19 @@ OtelMatlabProxyFactory::make_proxy(const libmexclass::proxy::ClassName& class_na
6572
REGISTER_PROXY(libmexclass.opentelemetry.sdk.ViewProxy, libmexclass::opentelemetry::sdk::ViewProxy);
6673
REGISTER_PROXY(libmexclass.opentelemetry.sdk.PeriodicExportingMetricReaderProxy, libmexclass::opentelemetry::sdk::PeriodicExportingMetricReaderProxy);
6774

75+
REGISTER_PROXY(libmexclass.opentelemetry.sdk.LoggerProviderProxy, libmexclass::opentelemetry::sdk::LoggerProviderProxy);
76+
REGISTER_PROXY(libmexclass.opentelemetry.sdk.SimpleLogRecordProcessorProxy, libmexclass::opentelemetry::sdk::SimpleLogRecordProcessorProxy);
77+
REGISTER_PROXY(libmexclass.opentelemetry.sdk.BatchLogRecordProcessorProxy, libmexclass::opentelemetry::sdk::BatchLogRecordProcessorProxy);
78+
6879
#ifdef WITH_OTLP_HTTP
6980
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpHttpSpanExporterProxy, libmexclass::opentelemetry::exporters::OtlpHttpSpanExporterProxy);
7081
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpHttpMetricExporterProxy, libmexclass::opentelemetry::exporters::OtlpHttpMetricExporterProxy);
82+
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpHttpLogRecordExporterProxy, libmexclass::opentelemetry::exporters::OtlpHttpLogRecordExporterProxy);
7183
#endif
7284
#ifdef WITH_OTLP_GRPC
7385
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpGrpcSpanExporterProxy, libmexclass::opentelemetry::exporters::OtlpGrpcSpanExporterProxy);
7486
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpGrpcMetricExporterProxy, libmexclass::opentelemetry::exporters::OtlpGrpcMetricExporterProxy);
87+
REGISTER_PROXY(libmexclass.opentelemetry.exporters.OtlpGrpcLogRecordExporterProxy, libmexclass::opentelemetry::exporters::OtlpGrpcLogRecordExporterProxy);
7588
#endif
7689
return nullptr;
7790
}

0 commit comments

Comments
 (0)