Move CString init out of log_callback arg

Author: javorszky

auto/make

@@ -362,7 +362,7 @@ $NXT_BUILD_DIR/sbin/$NXT_DAEMON:	$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 				\$(NXT_OBJS)
 	\$(PP_LD) \$@
 	\$(v)\$(NXT_EXEC_LINK) -o \$@ \$(CFLAGS) \\
-		\$(NXT_OBJS) $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC src/otel/target/debug/libotel.a \\
+		\$(NXT_OBJS) $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 END

auto/otel

@@ -16,7 +16,7 @@ cd ../../
 nxt_feature="otel"
 nxt_feature_name=NXT_HAVE_OTEL
 nxt_feature_run=no
-nxt_feature_libs=
+nxt_feature_libs=""
 nxt_feature_test="int main(void){return 0;}"
 
 . auto/feature
@@ -27,3 +27,5 @@ if [ $nxt_found = no ]; then
     $echo
     exit 1;
 fi
+
+NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS -lssl -lcrypto src/otel/target/debug/libotel.a"

src/nxt_h1proto.c

@@ -1837,10 +1837,9 @@ nxt_h1p_conn_sent(nxt_task_t *task, void *obj, void *data)
 {
     nxt_conn_t          *c;
     nxt_event_engine_t  *engine;
+#if (NXT_HAVE_OTEL)
     nxt_http_request_t  *r;
     r = ((nxt_h1proto_t *) data)->request;
-
-#if (NXT_HAVE_OTEL)
     nxt_otel_test_and_call_state(task, r);
 #endif
 

src/nxt_main.c

@@ -29,7 +29,9 @@ main(int argc, char **argv)
 
     nxt_main_log.handler = nxt_log_time_handler;
 
-    nxt_otel_init(otel_phase1_log_callback);
+#if (NXT_HAVE_OTEL)
+    nxt_otel_init(&otel_phase1_log_callback);
+#endif
     ret = nxt_runtime_create(&nxt_main_task);
 
     if (ret != NXT_OK) {

src/otel/src/lib.rs

@@ -38,18 +38,14 @@ unsafe fn nxt_otel_init(log_callback: unsafe extern "C" fn(*mut i8)) {
 
     // unwrap
     match res {
-        Err(e) => log_callback(
-            CString::from_vec_unchecked(e.to_string().as_bytes().to_vec())
-                .into_raw() as _,
-        ),
+        Err(e) => {
+            let msg =CString::from_vec_unchecked(e.to_string().as_bytes().to_vec());
+            log_callback(msg.into_raw() as _)
+        },
         Ok(t) => {
             GLOBAL_TRACER_PROVIDER.get_or_init(move || t);
-            log_callback(
-                CString::from_vec_unchecked(
-                    "otel exporter has been initialised".as_bytes().to_vec(),
-                )
-                .into_raw() as _,
-            );
+            let msg = CString::from_vec_unchecked("otel exporter has been initialised".as_bytes().to_vec());
+            log_callback(msg.into_raw() as _);
         }
     }
 }