Mac support

Author: duncanpo

CMakeLists.txt

@@ -120,15 +120,15 @@ if(WITH_OTLP_HTTP)
     if(WIN32)
 	set(OTLP_MACROS /DWITH_OTLP_HTTP)
     else()
-	set(OTLP_MACROS -D WITH_OTLP_HTTP)
+	set(OTLP_MACROS "-D WITH_OTLP_HTTP ")
     endif()
 endif()
 
 if(WITH_OTLP_GRPC)
     if(WIN32)
 	set(OTLP_MACROS ${OTLP_MACROS} /DWITH_OTLP_GRPC)
     else()
-	set(OTLP_MACROS ${OTLP_MACROS} -D WITH_OTLP_GRPC)
+	set(OTLP_MACROS ${OTLP_MACROS} "-D WITH_OTLP_GRPC ")
     endif()
 endif()
 
@@ -145,6 +145,8 @@ if(UNIX AND NOT APPLE AND NOT CYGWIN)
         ${ABSL_LIBRARIES}
         ${UPB_LIBRARIES} -Wl,--no-whole-archive)
     target_link_options(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OPENTELEMETRY_PROXY_LINK_OPTIONS})
+elseif(APPLE)
+    set_target_properties(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@executable_path")
 endif()
 
 # Use C++17 
@@ -179,6 +181,9 @@ if(WIN32)
 elseif(UNIX AND NOT APPLE AND NOT CYGWIN)
     FILE(GLOB OTEL_CPP_RUNTIME ${OPENTELEMETRY_CPP_LIBRARY_DIRS}/*.so)
     set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
+elseif(APPLE)
+    FILE(GLOB OTEL_CPP_RUNTIME ${OPENTELEMETRY_CPP_LIBRARY_DIRS}/*.dylib)
+    set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
 endif()
 
 # ##############################

test/commonSetupOnce.m

@@ -5,19 +5,23 @@ function commonSetupOnce(testCase)
 
 % file definitions
 otelcolroot = getenv("OPENTELEMETRY_COLLECTOR_INSTALL");
+assert(~isempty(otelcolroot), "OPENTELEMETRY_COLLECTOR_INSTALL environment must be defined.")
 testCase.OtelConfigFile = fullfile(fileparts(mfilename("fullpath")), ...
     "otelcol_config.yml");
-testCase.OtelRoot = getenv("OPENTELEMETRY_MATLAB_INSTALL");
+otelroot = getenv("OPENTELEMETRY_MATLAB_INSTALL");
+assert(~isempty(otelroot), "OPENTELEMETRY_MATLAB_INSTALL environment must be defined.")
+testCase.OtelRoot = otelroot;
 testCase.JsonFile = "myoutput.json";
 testCase.PidFile = "testoutput.txt";
 
 % process definitions
-testCase.Otelcol = fullfile(otelcolroot, "otelcol");
+testCase.OtelcolName = "otelcol";
 if ispc
    testCase.ListPid = @(name)"tasklist /fi ""IMAGENAME eq " + name + ".exe""";
    testCase.ReadPidList = @(file)readtable(file, "VariableNamingRule", "preserve", "NumHeaderLines", 3, "MultipleDelimsAsOne", true, "Delimiter", " ");
    testCase.ExtractPid = @(table)table.Var2;
    windows_killroot = string(getenv("WINDOWS_KILL_INSTALL"));
+   assert(~isempty(windows_killroot), "WINDOWS_KILL_INSTALL environment must be defined.")
    testCase.Sigint = @(id)fullfile(windows_killroot,"windows-kill") + " -SIGINT " + id;
    testCase.Sigterm = @(id)"taskkill /pid " + id;
 elseif isunix && ~ismac
@@ -26,7 +30,19 @@ function commonSetupOnce(testCase)
    testCase.ExtractPid = @(table)table.PID;
    testCase.Sigint = @(id)"kill " + id;  % kill sends a SIGTERM instead of SIGINT but turns out this is sufficient to terminate OTEL collector on Linux
    testCase.Sigterm = @(id)"kill " + id;
+elseif ismac
+   testCase.ListPid = @(name)"pgrep -x " + name;
+   testCase.ReadPidList = @readmatrix;
+   testCase.ExtractPid = @(x)x;  % no-op that returns itself
+   testCase.Sigint = @(id)"kill -s INT " + id;  
+   testCase.Sigterm = @(id)"kill -s TERM " + id;
+   if computer == "MACA64"
+      % only the contrib version of OpenTelemetry Collector is available on Apple silicon
+      testCase.OtelcolName = "otelcol-contrib";
+   end
+
 end
+testCase.Otelcol = fullfile(otelcolroot, testCase.OtelcolName);
 
 % set up path
 testCase.applyFixture(matlab.unittest.fixtures.PathFixture(testCase.OtelRoot));

test/terminateCollector.m

@@ -4,7 +4,7 @@ function terminateCollector(testCase)
 %
 % Copyright 2023 The MathWorks, Inc.
 
-system(testCase.ListPid("otelcol") + " > " + testCase.PidFile);
+system(testCase.ListPid(testCase.OtelcolName) + " > " + testCase.PidFile);
 tbl = testCase.ReadPidList(testCase.PidFile);
 pid = testCase.ExtractPid(tbl);
 retry = 0;
@@ -13,8 +13,8 @@ function terminateCollector(testCase)
 while ~isempty(pid) && retry < 4
     system(testCase.Sigint(pid));
     pause(2);  % give a little time for the collector to shut down
-    system(testCase.ListPid("otelcol") + " > " + testCase.PidFile);
+    system(testCase.ListPid(testCase.OtelcolName) + " > " + testCase.PidFile);
     tbl = testCase.ReadPidList(testCase.PidFile);
     pid = testCase.ExtractPid(tbl);
     retry = retry + 1;
-end
+end