Skip to content

Commit 189f9d8

Browse files
avsejavsej
committed
Remove conditional compilation of tracing code
Change-Id: If4b4f556016bf25ed46d126bfaf5f51bf02c101f Reviewed-on: http://review.couchbase.org/107211 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent bb4511d commit 189f9d8

File tree

11 files changed

+0
-158
lines changed

11 files changed

+0
-158
lines changed

‎couchbase.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,9 +791,7 @@ typedef struct {
791791
int json_options;
792792
int is_cbas; // FIXME: convert to bit-flags
793793
zval exc;
794-
#ifdef LCB_TRACING
795794
lcbtrace_SPAN *span;
796-
#endif
797795
} opcookie;
798796

799797
opcookie *opcookie_init();

‎src/couchbase/bucket/cbft.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,31 +144,25 @@ void pcbc_bucket_cbft_request(pcbc_bucket_t *bucket, lcb_CMDFTS *cmd, int json_r
144144
{
145145
opcookie *cookie;
146146
lcb_error_t err;
147-
#ifdef LCB_TRACING
148147
lcbtrace_TRACER *tracer = NULL;
149148
lcb_FTSHANDLE handle = NULL;
150-
#endif
151149

152150
cmd->callback = ftsrow_callback;
153151
cookie = opcookie_init();
154152
cookie->json_response = json_response;
155153
cookie->json_options = json_options;
156-
#ifdef LCB_TRACING
157154
tracer = lcb_get_tracer(bucket->conn->lcb);
158155
if (tracer) {
159156
cookie->span = lcbtrace_span_start(tracer, "php/search", 0, NULL);
160157
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
161158
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_SEARCH);
162159
cmd->handle = &handle;
163160
}
164-
#endif
165161
err = lcb_fts_query(bucket->conn->lcb, cookie, cmd);
166162
if (err == LCB_SUCCESS) {
167-
#ifdef LCB_TRACING
168163
if (cookie->span) {
169164
lcb_fts_set_parent_span(bucket->conn->lcb, handle, cookie->span);
170165
}
171-
#endif
172166
lcb_wait(bucket->conn->lcb);
173167
err = proc_ftsrow_results(bucket, return_value, cookie TSRMLS_CC);
174168
}
@@ -179,10 +173,8 @@ void pcbc_bucket_cbft_request(pcbc_bucket_t *bucket, lcb_CMDFTS *cmd, int json_r
179173
zend_throw_exception_object(&cookie->exc TSRMLS_CC);
180174
}
181175
}
182-
#ifdef LCB_TRACING
183176
if (cookie->span) {
184177
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
185178
}
186-
#endif
187179
opcookie_destroy(cookie);
188180
}

‎src/couchbase/bucket/counter.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ PHP_METHOD(Bucket, counter)
9595
zval *zdelta, *zinitial, *zexpiry, *zgroupid;
9696
opcookie *cookie;
9797
lcb_error_t err = LCB_SUCCESS;
98-
#ifdef LCB_TRACING
9998
lcbtrace_TRACER *tracer = NULL;
100-
#endif
10199

102100
// Note that groupid is experimental here and should not be used.
103101
if (pcbc_pp_begin(ZEND_NUM_ARGS() TSRMLS_CC, &pp_state, "id|delta|initial,expiry,groupid", &id, &zdelta, &zinitial,
@@ -108,14 +106,12 @@ PHP_METHOD(Bucket, counter)
108106

109107
ncmds = pcbc_pp_keycount(&pp_state);
110108
cookie = opcookie_init();
111-
#ifdef LCB_TRACING
112109
tracer = lcb_get_tracer(obj->conn->lcb);
113110
if (tracer) {
114111
cookie->span = lcbtrace_span_start(tracer, "php/" LCBTRACE_OP_COUNTER, 0, NULL);
115112
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
116113
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_KV);
117114
}
118-
#endif
119115

120116
nscheduled = 0;
121117
for (ii = 0; pcbc_pp_next(&pp_state); ++ii) {
@@ -141,11 +137,9 @@ PHP_METHOD(Bucket, counter)
141137
if (zgroupid) {
142138
LCB_KREQ_SIMPLE(&cmd._hashkey, Z_STRVAL_P(zgroupid), Z_STRLEN_P(zgroupid));
143139
}
144-
#ifdef LCB_TRACING
145140
if (cookie->span) {
146141
LCB_CMD_SET_TRACESPAN(&cmd, cookie->span);
147142
}
148-
#endif
149143

150144
err = lcb_counter3(obj->conn->lcb, cookie, &cmd);
151145
if (err != LCB_SUCCESS) {
@@ -161,11 +155,9 @@ PHP_METHOD(Bucket, counter)
161155
err = proc_arithmetic_results(obj, return_value, cookie, pcbc_pp_ismapped(&pp_state) TSRMLS_CC);
162156
}
163157

164-
#ifdef LCB_TRACING
165158
if (cookie->span) {
166159
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
167160
}
168-
#endif
169161
opcookie_destroy(cookie);
170162

171163
if (err != LCB_SUCCESS) {

‎src/couchbase/bucket/get.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ static lcb_error_t proc_get_results(pcbc_bucket_t *bucket, zval *return_value, o
5656
{
5757
opcookie_get_res *res;
5858
lcb_error_t err = LCB_SUCCESS;
59-
#ifdef LCB_TRACING
6059
lcbtrace_SPAN *parent = cookie->span;
6160
lcbtrace_TRACER *tracer = lcb_get_tracer(bucket->conn->lcb);
62-
#endif
6361

6462
// If we are not mapped, we need to throw any op errors
6563
if (is_mapped == 0) {
@@ -72,7 +70,6 @@ static lcb_error_t proc_get_results(pcbc_bucket_t *bucket, zval *return_value, o
7270
zval *doc = bop_get_return_doc(return_value, res->key, res->key_len, is_mapped TSRMLS_CC);
7371

7472
if (res->header.err == LCB_SUCCESS) {
75-
#ifdef LCB_TRACING
7673
lcbtrace_SPAN *span = NULL;
7774
if (parent) {
7875
lcbtrace_REF ref;
@@ -82,14 +79,11 @@ static lcb_error_t proc_get_results(pcbc_bucket_t *bucket, zval *return_value, o
8279
lcbtrace_span_add_tag_str(span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
8380
lcbtrace_span_add_tag_str(span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_KV);
8481
}
85-
#endif
8682
pcbc_document_init_decode(doc, bucket, res->bytes, res->bytes_len, res->flags, res->datatype, res->cas,
8783
NULL TSRMLS_CC);
88-
#ifdef LCB_TRACING
8984
if (span) {
9085
lcbtrace_span_finish(span, LCBTRACE_NOW);
9186
}
92-
#endif
9387
} else {
9488
pcbc_document_init_error(doc, &res->header TSRMLS_CC);
9589
}
@@ -116,21 +110,17 @@ void pcbc_bucket_get(pcbc_bucket_t *obj, pcbc_pp_state *pp_state, pcbc_pp_id *id
116110
int ii, ncmds, nscheduled;
117111
opcookie *cookie;
118112
lcb_error_t err = LCB_SUCCESS;
119-
#ifdef LCB_TRACING
120113
lcbtrace_TRACER *tracer = NULL;
121-
#endif
122114

123115
ncmds = pcbc_pp_keycount(pp_state);
124116
cookie = opcookie_init();
125117

126-
#ifdef LCB_TRACING
127118
tracer = lcb_get_tracer(obj->conn->lcb);
128119
if (tracer) {
129120
cookie->span = lcbtrace_span_start(tracer, "php/" LCBTRACE_OP_GET, 0, NULL);
130121
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
131122
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_KV);
132123
}
133-
#endif
134124

135125
nscheduled = 0;
136126
for (ii = 0; pcbc_pp_next(pp_state); ++ii) {
@@ -147,11 +137,9 @@ void pcbc_bucket_get(pcbc_bucket_t *obj, pcbc_pp_state *pp_state, pcbc_pp_id *id
147137
}
148138

149139
LCB_CMD_SET_KEY(&cmd, id->str, id->len);
150-
#ifdef LCB_TRACING
151140
if (cookie->span) {
152141
LCB_CMD_SET_TRACESPAN(&cmd, cookie->span);
153142
}
154-
#endif
155143
if (expiry && *expiry) {
156144
cmd.lock = 0;
157145
cmd.exptime = Z_LVAL_P(*expiry);
@@ -176,11 +164,9 @@ void pcbc_bucket_get(pcbc_bucket_t *obj, pcbc_pp_state *pp_state, pcbc_pp_id *id
176164
err = proc_get_results(obj, return_value, cookie, pcbc_pp_ismapped(pp_state) TSRMLS_CC);
177165
}
178166

179-
#ifdef LCB_TRACING
180167
if (cookie->span) {
181168
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
182169
}
183-
#endif
184170
opcookie_destroy(cookie);
185171

186172
if (err != LCB_SUCCESS) {
@@ -250,9 +236,7 @@ PHP_METHOD(Bucket, getFromReplica)
250236
zval *zindex, *zgroupid;
251237
opcookie *cookie;
252238
lcb_error_t err = LCB_SUCCESS;
253-
#ifdef LCB_TRACING
254239
lcbtrace_TRACER *tracer = NULL;
255-
#endif
256240

257241
// Note that groupid is experimental here and should not be used.
258242
if (pcbc_pp_begin(ZEND_NUM_ARGS() TSRMLS_CC, &pp_state, "id||index,groupid", &id, &zindex, &zgroupid) != SUCCESS) {
@@ -262,14 +246,12 @@ PHP_METHOD(Bucket, getFromReplica)
262246

263247
ncmds = pcbc_pp_keycount(&pp_state);
264248
cookie = opcookie_init();
265-
#ifdef LCB_TRACING
266249
tracer = lcb_get_tracer(obj->conn->lcb);
267250
if (tracer) {
268251
cookie->span = lcbtrace_span_start(tracer, "php/" LCBTRACE_OP_GET_FROM_REPLICA, 0, NULL);
269252
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
270253
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_KV);
271254
}
272-
#endif
273255

274256
nscheduled = 0;
275257
for (ii = 0; pcbc_pp_next(&pp_state); ++ii) {
@@ -279,11 +261,9 @@ PHP_METHOD(Bucket, getFromReplica)
279261
PCBC_CHECK_ZVAL_STRING(zgroupid, "groupid must be a string");
280262

281263
LCB_CMD_SET_KEY(&cmd, id.str, id.len);
282-
#ifdef LCB_TRACING
283264
if (cookie->span) {
284265
LCB_CMD_SET_TRACESPAN(&cmd, cookie->span);
285266
}
286-
#endif
287267
if (zindex) {
288268
cmd.index = Z_LVAL_P(zindex);
289269
if (cmd.index >= 0) {
@@ -310,11 +290,9 @@ PHP_METHOD(Bucket, getFromReplica)
310290
err = proc_get_results(obj, return_value, cookie, pcbc_pp_ismapped(&pp_state) TSRMLS_CC);
311291
}
312292

313-
#ifdef LCB_TRACING
314293
if (cookie->span) {
315294
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
316295
}
317-
#endif
318296
opcookie_destroy(cookie);
319297

320298
if (err != LCB_SUCCESS) {

‎src/couchbase/bucket/n1ql.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,15 @@ void pcbc_bucket_n1ql_request(pcbc_bucket_t *bucket, lcb_CMDN1QL *cmd, int json_
147147
{
148148
opcookie *cookie;
149149
lcb_error_t err;
150-
#ifdef LCB_TRACING
151150
lcbtrace_TRACER *tracer = NULL;
152151
lcb_N1QLHANDLE handle = NULL;
153-
#endif
154152

155153
cmd->callback = n1qlrow_callback;
156154
cmd->content_type = PCBC_CONTENT_TYPE_JSON;
157155
cookie = opcookie_init();
158156
cookie->json_response = json_response;
159157
cookie->json_options = json_options;
160158
cookie->is_cbas = is_cbas;
161-
#ifdef LCB_TRACING
162159
tracer = lcb_get_tracer(bucket->conn->lcb);
163160
if (tracer) {
164161
cookie->span = lcbtrace_span_start(tracer, is_cbas ? "php/analytics" : "php/n1ql", 0, NULL);
@@ -167,14 +164,11 @@ void pcbc_bucket_n1ql_request(pcbc_bucket_t *bucket, lcb_CMDN1QL *cmd, int json_
167164
is_cbas ? LCBTRACE_TAG_SERVICE_ANALYTICS : LCBTRACE_TAG_SERVICE_N1QL);
168165
cmd->handle = &handle;
169166
}
170-
#endif
171167
err = lcb_n1ql_query(bucket->conn->lcb, cookie, cmd);
172168
if (err == LCB_SUCCESS) {
173-
#ifdef LCB_TRACING
174169
if (cookie->span) {
175170
lcb_n1ql_set_parent_span(bucket->conn->lcb, handle, cookie->span);
176171
}
177-
#endif
178172
lcb_wait(bucket->conn->lcb);
179173
err = proc_n1qlrow_results(return_value, cookie TSRMLS_CC);
180174
}
@@ -185,10 +179,8 @@ void pcbc_bucket_n1ql_request(pcbc_bucket_t *bucket, lcb_CMDN1QL *cmd, int json_
185179
zend_throw_exception_object(&cookie->exc TSRMLS_CC);
186180
}
187181
}
188-
#ifdef LCB_TRACING
189182
if (cookie->span) {
190183
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
191184
}
192-
#endif
193185
opcookie_destroy(cookie);
194186
}

‎src/couchbase/bucket/remove.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ PHP_METHOD(Bucket, remove)
4848
opcookie *cookie;
4949
zval *zcas, *zgroupid;
5050
lcb_error_t err;
51-
#ifdef LCB_TRACING
5251
lcbtrace_TRACER *tracer = NULL;
53-
#endif
5452

5553
// Note that groupid is experimental here and should not be used.
5654
if (pcbc_pp_begin(ZEND_NUM_ARGS() TSRMLS_CC, &pp_state, "id||cas,groupid", &id, &zcas, &zgroupid) != SUCCESS) {
@@ -60,14 +58,12 @@ PHP_METHOD(Bucket, remove)
6058

6159
ncmds = pcbc_pp_keycount(&pp_state);
6260
cookie = opcookie_init();
63-
#ifdef LCB_TRACING
6461
tracer = lcb_get_tracer(obj->conn->lcb);
6562
if (tracer) {
6663
cookie->span = lcbtrace_span_start(tracer, "php/" LCBTRACE_OP_REMOVE, 0, NULL);
6764
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_COMPONENT, pcbc_client_string);
6865
lcbtrace_span_add_tag_str(cookie->span, LCBTRACE_TAG_SERVICE, LCBTRACE_TAG_SERVICE_KV);
6966
}
70-
#endif
7167

7268
nscheduled = 0;
7369
for (ii = 0; pcbc_pp_next(&pp_state); ++ii) {
@@ -84,11 +80,9 @@ PHP_METHOD(Bucket, remove)
8480
LCB_KREQ_SIMPLE(&cmd._hashkey, Z_STRVAL_P(zgroupid), Z_STRLEN_P(zgroupid));
8581
}
8682

87-
#ifdef LCB_TRACING
8883
if (cookie->span) {
8984
LCB_CMD_SET_TRACESPAN(&cmd, cookie->span);
9085
}
91-
#endif
9286
err = lcb_remove3(obj->conn->lcb, cookie, &cmd);
9387
if (err != LCB_SUCCESS) {
9488
break;
@@ -103,11 +97,9 @@ PHP_METHOD(Bucket, remove)
10397
err = proc_remove_results(obj, return_value, cookie, pcbc_pp_ismapped(&pp_state) TSRMLS_CC);
10498
}
10599

106-
#ifdef LCB_TRACING
107100
if (cookie->span) {
108101
lcbtrace_span_finish(cookie->span, LCBTRACE_NOW);
109102
}
110-
#endif
111103
opcookie_destroy(cookie);
112104

113105
if (err != LCB_SUCCESS) {

0 commit comments

Comments
 (0)