Merge branch 'otel-clean' into otel-clean-gabor

avahahn · Aug 13, 2024 · d978c09 · d978c09
2 parents 74da537 + 3489cd8
commit d978c09
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/auto/otel b/auto/otel
@@ -13,6 +13,7 @@ cd src/otel
 cargo build
 cd ../../
 
+
 nxt_feature="otel"
 nxt_feature_name=NXT_HAVE_OTEL
 nxt_feature_run=no

diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c
@@ -1837,12 +1837,6 @@ 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;
-    nxt_otel_test_and_call_state(task, r);
-#endif
-
 #if (NXT_HAVE_OTEL)
     nxt_http_request_t  *r;
     r = ((nxt_h1proto_t *) data)->request;

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