Skip to content

Commit 8e6c72b

Browse files
realFlowControlrealFlowControl
committed
Revert "Send spans_created telemetry metric (#2577)"
This reverts commit 7169ff4.
1 parent ac0f416 commit 8e6c72b

27 files changed

Lines changed: 114 additions & 742 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,6 @@ benchmarks_opcache: benchmarks_run_dependencies call_benchmarks_opcache
11211121
test_opentelemetry_1: global_test_run_dependencies
11221122
rm -f tests/.scenarios.lock/opentelemetry1/composer.lock
11231123
$(MAKE) test_scenario_opentelemetry1
1124-
$(call run_composer_with_retry,tests/Frameworks/Custom/OpenTelemetry,)
11251124
$(eval TEST_EXTRA_ENV=$(shell [ $(PHP_MAJOR_MINOR) -ge 81 ] && echo "OTEL_PHP_FIBERS_ENABLED=1" || echo '') DD_TRACE_OTEL_ENABLED=1 DD_TRACE_GENERATE_ROOT_SPAN=0)
11261125
$(call run_tests,--testsuite=opentelemetry1 $(TESTS))
11271126
$(eval TEST_EXTRA_ENV=)
@@ -1136,9 +1135,7 @@ test_opentracing_beta6: global_test_run_dependencies
11361135

11371136
test_opentracing_10: global_test_run_dependencies
11381137
$(MAKE) test_scenario_opentracing10
1139-
$(call run_composer_with_retry,tests/Frameworks/Custom/OpenTracing,)
11401138
$(call run_tests,tests/OpenTracer1Unit)
1141-
$(call run_tests,tests/OpenTracing)
11421139

11431140
test_integrations: $(TEST_INTEGRATIONS_$(PHP_MAJOR_MINOR))
11441141
test_web: $(TEST_WEB_$(PHP_MAJOR_MINOR))

‎components-rs/ddtrace.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,6 @@ ddog_MaybeError ddog_sidecar_telemetry_buffer_flush(ddog_SidecarTransport **tran
171171
const ddog_QueueId *queue_id,
172172
struct ddog_SidecarActionsBuffer *buffer);
173173

174-
void ddog_sidecar_telemetry_register_metric_buffer(struct ddog_SidecarActionsBuffer *buffer,
175-
ddog_CharSlice metric_name);
176-
177-
void ddog_sidecar_telemetry_add_span_metric_point_buffer(struct ddog_SidecarActionsBuffer *buffer,
178-
ddog_CharSlice metric_name,
179-
double metric_value,
180-
ddog_CharSlice integration_name);
181-
182174
ddog_MaybeError ddog_sidecar_connect_php(ddog_SidecarTransport **connection,
183175
const char *error_path,
184176
ddog_CharSlice log_level,

‎components-rs/telemetry.h‎

Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

‎components-rs/telemetry.rs‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ use datadog_sidecar::interface::blocking::SidecarTransport;
22
use datadog_sidecar::interface::{blocking, InstanceId, QueueId, SidecarAction};
33
use ddcommon_ffi::slice::AsBytes;
44
use ddcommon_ffi::CharSlice;
5-
use ddcommon::tag::Tag;
65
use ddtelemetry::data;
76
use ddtelemetry::data::{Dependency, Integration};
8-
use ddtelemetry::metrics::MetricContext;
97
use ddtelemetry::worker::TelemetryActions;
108
use ddtelemetry_ffi::{try_c, MaybeError};
119
use std::error::Error;
@@ -129,37 +127,3 @@ pub extern "C" fn ddog_sidecar_telemetry_buffer_flush(
129127

130128
MaybeError::None
131129
}
132-
133-
#[no_mangle]
134-
pub unsafe extern "C" fn ddog_sidecar_telemetry_register_metric_buffer(
135-
buffer: &mut SidecarActionsBuffer,
136-
metric_name: CharSlice,
137-
) {
138-
139-
buffer.buffer.push(SidecarAction::RegisterTelemetryMetric(MetricContext {
140-
name: metric_name.to_utf8_lossy().into_owned(),
141-
namespace: data::metrics::MetricNamespace::Tracers,
142-
metric_type: data::metrics::MetricType::Count,
143-
tags: Vec::default(),
144-
common: false,
145-
}));
146-
}
147-
148-
#[no_mangle]
149-
pub unsafe extern "C" fn ddog_sidecar_telemetry_add_span_metric_point_buffer(
150-
buffer: &mut SidecarActionsBuffer,
151-
metric_name: CharSlice,
152-
metric_value: f64,
153-
integration_name: CharSlice,
154-
) {
155-
let mut tags: Vec<Tag> = Vec::default();
156-
if integration_name.len() > 0 {
157-
tags.push(Tag::new("integration_name", integration_name.to_utf8_lossy().into_owned()).unwrap())
158-
}
159-
160-
buffer.buffer.push(SidecarAction::AddTelemetryMetricPoint((
161-
metric_name.to_utf8_lossy().into_owned(),
162-
metric_value,
163-
tags,
164-
)));
165-
}

‎ext/ddtrace.c‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ static void ddtrace_activate(void) {
419419
zai_hook_rinit();
420420
zai_interceptor_activate();
421421
zai_uhook_rinit();
422-
ddtrace_telemetry_rinit();
423422
zend_hash_init(&DDTRACE_G(traced_spans), 8, unused, NULL, 0);
424423
zend_hash_init(&DDTRACE_G(tracestate_unknown_dd_keys), 8, unused, NULL, 0);
425424

@@ -1403,8 +1402,6 @@ static PHP_RSHUTDOWN_FUNCTION(ddtrace) {
14031402
}
14041403

14051404
dd_finalize_telemetry();
1406-
ddtrace_telemetry_rshutdown();
1407-
14081405
if (DDTRACE_G(last_flushed_root_service_name)) {
14091406
zend_string_release(DDTRACE_G(last_flushed_root_service_name));
14101407
DDTRACE_G(last_flushed_root_service_name) = NULL;
@@ -1958,21 +1955,6 @@ PHP_FUNCTION(DDTrace_Testing_trigger_error) {
19581955
}
19591956
}
19601957

1961-
PHP_FUNCTION(DDTrace_Internal_add_span_flag) {
1962-
zend_object *span;
1963-
zend_long flag;
1964-
1965-
ZEND_PARSE_PARAMETERS_START(2, 2)
1966-
Z_PARAM_OBJ_OF_CLASS_EX(span, ddtrace_ce_span_data, 0, 1)
1967-
Z_PARAM_LONG(flag)
1968-
ZEND_PARSE_PARAMETERS_END();
1969-
1970-
ddtrace_span_data *span_data = OBJ_SPANDATA(span);
1971-
span_data->flags |= (uint8_t)flag;
1972-
1973-
RETURN_NULL();
1974-
}
1975-
19761958
PHP_FUNCTION(ddtrace_init) {
19771959
if (DDTRACE_G(request_init_hook_loaded) == 1) {
19781960
RETURN_FALSE;

‎ext/ddtrace.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ ZEND_BEGIN_MODULE_GLOBALS(ddtrace)
109109
zend_string *last_flushed_root_service_name;
110110
zend_string *last_flushed_root_env_name;
111111

112-
HashTable telemetry_spans_created_per_integration;
113-
114112
HashTable uhook_active_hooks;
115113
HashTable uhook_closure_hooks;
116114
ZEND_END_MODULE_GLOBALS(ddtrace)

‎ext/ddtrace.stub.php‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -669,30 +669,6 @@ function set_blocking_function(\DDTrace\RootSpanData $span, callable $blockingFu
669669
function trigger_error(string $message, int $errorType): void {}
670670
}
671671

672-
namespace DDTrace\Internal {
673-
/**
674-
* @var int
675-
* @cvalue DDTRACE_SPAN_FLAG_OPENTELEMETRY
676-
*/
677-
const SPAN_FLAG_OPENTELEMETRY = UNKNOWN;
678-
679-
/**
680-
* @var int
681-
* @cvalue DDTRACE_SPAN_FLAG_OPENTRACING
682-
*/
683-
const SPAN_FLAG_OPENTRACING = UNKNOWN;
684-
685-
/**
686-
* Adds a flag to a span.
687-
*
688-
* @internal
689-
*
690-
* @param \DDTrace\SpanData $span the span to flag
691-
* @param int $flag the flag to add to the span
692-
*/
693-
function add_span_flag(\DDTrace\SpanData $span, int $flag): void {}
694-
}
695-
696672
namespace {
697673

698674
/**

‎ext/ddtrace_arginfo.h‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 1271064f2b0fcdc3d20e2f3d6c780607b300c5f9 */
2+
* Stub hash: 7fec613751ec101cba339b6dfa3a72fbaf38074f */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_DDTrace_trace_method, 0, 3, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, className, IS_STRING, 0)
@@ -165,11 +165,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_DDTrace_Testing_trigger_error, 0
165165
ZEND_ARG_TYPE_INFO(0, errorType, IS_LONG, 0)
166166
ZEND_END_ARG_INFO()
167167

168-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_DDTrace_Internal_add_span_flag, 0, 2, IS_VOID, 0)
169-
ZEND_ARG_OBJ_INFO(0, span, DDTrace\\SpanData, 0)
170-
ZEND_ARG_TYPE_INFO(0, flag, IS_LONG, 0)
171-
ZEND_END_ARG_INFO()
172-
173168
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dd_trace_env_config, 0, 1, IS_MIXED, 0)
174169
ZEND_ARG_TYPE_INFO(0, envName, IS_STRING, 0)
175170
ZEND_END_ARG_INFO()
@@ -331,7 +326,6 @@ ZEND_FUNCTION(DDTrace_UserRequest_notify_start);
331326
ZEND_FUNCTION(DDTrace_UserRequest_notify_commit);
332327
ZEND_FUNCTION(DDTrace_UserRequest_set_blocking_function);
333328
ZEND_FUNCTION(DDTrace_Testing_trigger_error);
334-
ZEND_FUNCTION(DDTrace_Internal_add_span_flag);
335329
ZEND_FUNCTION(dd_trace_env_config);
336330
ZEND_FUNCTION(dd_trace_disable_in_request);
337331
ZEND_FUNCTION(dd_trace_reset);
@@ -415,7 +409,6 @@ static const zend_function_entry ext_functions[] = {
415409
ZEND_NS_FALIAS("DDTrace\\UserRequest", notify_commit, DDTrace_UserRequest_notify_commit, arginfo_DDTrace_UserRequest_notify_commit)
416410
ZEND_NS_FALIAS("DDTrace\\UserRequest", set_blocking_function, DDTrace_UserRequest_set_blocking_function, arginfo_DDTrace_UserRequest_set_blocking_function)
417411
ZEND_NS_FALIAS("DDTrace\\Testing", trigger_error, DDTrace_Testing_trigger_error, arginfo_DDTrace_Testing_trigger_error)
418-
ZEND_NS_FALIAS("DDTrace\\Internal", add_span_flag, DDTrace_Internal_add_span_flag, arginfo_DDTrace_Internal_add_span_flag)
419412
ZEND_FE(dd_trace_env_config, arginfo_dd_trace_env_config)
420413
ZEND_FE(dd_trace_disable_in_request, arginfo_dd_trace_disable_in_request)
421414
ZEND_FE(dd_trace_reset, arginfo_dd_trace_reset)
@@ -486,8 +479,6 @@ static void register_ddtrace_symbols(int module_number)
486479
REGISTER_LONG_CONSTANT("DDTrace\\DBM_PROPAGATION_DISABLED", DD_TRACE_DBM_PROPAGATION_DISABLED, CONST_PERSISTENT);
487480
REGISTER_LONG_CONSTANT("DDTrace\\DBM_PROPAGATION_SERVICE", DD_TRACE_DBM_PROPAGATION_SERVICE, CONST_PERSISTENT);
488481
REGISTER_LONG_CONSTANT("DDTrace\\DBM_PROPAGATION_FULL", DD_TRACE_DBM_PROPAGATION_FULL, CONST_PERSISTENT);
489-
REGISTER_LONG_CONSTANT("DDTrace\\Internal\\SPAN_FLAG_OPENTELEMETRY", DDTRACE_SPAN_FLAG_OPENTELEMETRY, CONST_PERSISTENT);
490-
REGISTER_LONG_CONSTANT("DDTrace\\Internal\\SPAN_FLAG_OPENTRACING", DDTRACE_SPAN_FLAG_OPENTRACING, CONST_PERSISTENT);
491482
REGISTER_STRING_CONSTANT("DD_TRACE_VERSION", PHP_DDTRACE_VERSION, CONST_PERSISTENT);
492483
REGISTER_LONG_CONSTANT("DD_TRACE_PRIORITY_SAMPLING_AUTO_KEEP", PRIORITY_SAMPLING_AUTO_KEEP, CONST_PERSISTENT);
493484
REGISTER_LONG_CONSTANT("DD_TRACE_PRIORITY_SAMPLING_AUTO_REJECT", PRIORITY_SAMPLING_AUTO_REJECT, CONST_PERSISTENT);

‎ext/span.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <components/log/log.h>
1313
#include "random.h"
1414
#include "serializer.h"
15-
#include "telemetry.h"
1615
#include "ext/standard/php_string.h"
1716
#include <hook/hook.h>
1817
#include "user_request.h"
@@ -554,10 +553,6 @@ void ddtrace_close_span(ddtrace_span_data *span) {
554553
ddtrace_switch_span_stack(span->stack);
555554
}
556555

557-
// Telemetry: increment the spans_created counter
558-
// Must be done at closing because we need to read the "component" span's meta which is not available at creation
559-
ddtrace_telemetry_inc_spans_created(span);
560-
561556
ddtrace_close_stack_userland_spans_until(span);
562557

563558
ddtrace_close_top_span_without_stack_swap(span);

‎ext/span.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#define DDTRACE_DROPPED_SPAN (-1ull)
1414
#define DDTRACE_SILENTLY_DROPPED_SPAN (-2ull)
1515

16-
#define DDTRACE_SPAN_FLAG_OPENTELEMETRY (1 << 0)
17-
#define DDTRACE_SPAN_FLAG_OPENTRACING (1 << 1)
18-
1916
struct ddtrace_span_stack;
2017

2118
enum ddtrace_span_dataype {
@@ -75,7 +72,6 @@ struct ddtrace_span_data {
7572
uint64_t start;
7673
uint64_t duration_start;
7774
uint64_t duration;
78-
uint8_t flags;
7975
enum ddtrace_span_dataype type : 8;
8076
bool notify_user_req_end;
8177
struct ddtrace_span_data *next;

0 commit comments

Comments
 (0)