Skip to content

WIP: otel metrics #3535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Leiyks wants to merge 1 commit into
base: rachel.yang/otel-metrics-part2-telemetry
Choose a base branch
from
Draft

WIP: otel metrics #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DDTrace/OpenTelemetry/CompositeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class DatadogResolver implements ResolverInterface
private const DEFAULT_HOST = 'localhost';
private const DEFAULT_SCHEME = 'http';

public function retrieveValue(string $name): mixed
public function retrieveValue(string $name)
{
if (!$this->isMetricsEnabled($name)) {
return null;
Expand Down
20 changes: 12 additions & 8 deletions src/DDTrace/OpenTelemetry/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,21 @@
];

// Helper function to track config access
function track_otel_config_if_whitelisted(string $name, mixed $value): void
function track_otel_config_if_whitelisted(string $name, $value): void
{
if (in_array($name, OTEL_CONFIG_WHITELIST, true)) {
// Convert value to string for telemetry
$value_str = match (true) {
is_bool($value) => $value ? 'true' : 'false',
is_null($value) => '',
is_array($value) => json_encode($value),
is_object($value) => get_class($value),
default => (string)$value,
};
if (is_bool($value)) {
$value_str = $value ? 'true' : 'false';
} elseif (is_null($value)) {
$value_str = '';
} elseif (is_array($value)) {
$value_str = json_encode($value);
} elseif (is_object($value)) {
$value_str = get_class($value);
} else {
$value_str = (string)$value;
}

\dd_trace_internal_fn('track_otel_config', $name, $value_str);
}
Expand Down
22 changes: 13 additions & 9 deletions src/bridge/_generated_opentelemetry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ class DatadogResolver implements ResolverInterface
private const HTTP_PORT = '4318';
private const DEFAULT_HOST = 'localhost';
private const DEFAULT_SCHEME = 'http';
public function retrieveValue(string $name): mixed
public function retrieveValue(string $name)
{
if (!$this->isMetricsEnabled($name)) {
return null;
Expand Down Expand Up @@ -1245,17 +1245,21 @@ private function isGrpc(string $protocol): bool
'OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE',
];
// Helper function to track config access
function track_otel_config_if_whitelisted(string $name, mixed $value): void
function track_otel_config_if_whitelisted(string $name, $value): void
{
if (in_array($name, OTEL_CONFIG_WHITELIST, true)) {
// Convert value to string for telemetry
$value_str = match (true) {
is_bool($value) => $value ? 'true' : 'false',
is_null($value) => '',
is_array($value) => json_encode($value),
is_object($value) => get_class($value),
default => (string) $value,
};
if (is_bool($value)) {
$value_str = $value ? 'true' : 'false';
} elseif (is_null($value)) {
$value_str = '';
} elseif (is_array($value)) {
$value_str = json_encode($value);
} elseif (is_object($value)) {
$value_str = get_class($value);
} else {
$value_str = (string) $value;
}
\dd_trace_internal_fn('track_otel_config', $name, $value_str);
}
}
Expand Down
Loading