Skip to content

Commit c6ec532

Browse files
committed
Fix errors
1 parent cf32144 commit c6ec532

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

datadog-sidecar/src/service/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ pub enum SidecarAction {
7272
AddTelemetryMetricPoint((String, f64, Vec<Tag>)),
7373
PhpComposerTelemetryFile(PathBuf),
7474
ClearQueueId,
75-
AddRoute(Route),
75+
AddEndpoint(ddtelemetry::data::Endpoint),
7676
}

ddtelemetry/src/data/payload.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ pub enum Payload {
1212
AppDependenciesLoaded(AppDependenciesLoaded),
1313
AppIntegrationsChange(AppIntegrationsChange),
1414
AppClientConfigurationChange(AppClientConfigurationChange),
15+
AppEndpointsChange(AppEndpointsChange),
1516
AppHeartbeat(#[serde(skip_serializing)] ()),
1617
AppClosing(#[serde(skip_serializing)] ()),
1718
GenerateMetrics(GenerateMetrics),
@@ -29,6 +30,7 @@ impl Payload {
2930
AppDependenciesLoaded(_) => "app-dependencies-loaded",
3031
AppIntegrationsChange(_) => "app-integrations-change",
3132
AppClientConfigurationChange(_) => "app-client-configuration-change",
33+
AppEndpointsChange(_) => "app-endpoints-change",
3234
AppHeartbeat(_) => "app-heartbeat",
3335
AppClosing(_) => "app-closing",
3436
GenerateMetrics(_) => "generate-metrics",

ddtelemetry/src/data/payloads.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ pub struct AppClientConfigurationChange {
6161
pub configuration: Vec<Configuration>,
6262
}
6363

64+
#[derive(Debug, Serialize)]
65+
pub struct AppEndpointsChange {
66+
pub endpoints: Vec<Endpoint>,
67+
}
68+
6469
#[derive(Serialize, Debug)]
6570
pub struct GenerateMetrics {
6671
pub series: Vec<metrics::Serie>,

ddtelemetry/src/worker/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use crate::{
1010
data::{self, Application, Dependency, Endpoint, Host, Integration, Log, Payload, Telemetry},
1111
metrics::{ContextKey, MetricBuckets, MetricContexts},
1212
};
13-
use ddcommon::Endpoint;
1413
use ddcommon::{hyper_migration, tag::Tag, worker::Worker};
1514

1615
use std::fmt::Debug;
@@ -717,7 +716,7 @@ impl TelemetryWorker {
717716
if let Some(endpoint) = self.config.endpoint.as_ref() {
718717
endpoint.timeout_ms
719718
} else {
720-
Endpoint::DEFAULT_TIMEOUT
719+
ddcommon::Endpoint::DEFAULT_TIMEOUT
721720
})) => {
722721
Err(anyhow::anyhow!("Request timed out"))
723722
},

0 commit comments

Comments
 (0)