Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion print-service/infra/aws/lib/print-service-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ export class PrintServiceStack extends cdk.Stack {
cluster,
ddApiKey,
ddApiKeyParam,
ddSite
ddSite,
true,
{
DD_APM_IGNORE_RESOURCES:
"(GET|HEAD) .*/health$,POST localhost:4317/opentelemetry.proto.collector.trace.v1.TraceService/Export,POST localhost:4317/opentelemetry.proto.collector.metrics.v1.MetricsService/Export",
},
);

const serviceProps: ServiceProps = {
Expand Down
5 changes: 3 additions & 2 deletions shared/lib/shared-constructs/lib/shared-props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ export class SharedProps {
ddApiKey: string,
ddApiKeyParam: IStringParameter,
ddSite: string | undefined = undefined,
enableDatadog: boolean = true
enableDatadog: boolean = true,
datadogAgentEnvironmentVariables: { [key: string]: string } = {}
) {
const environment = process.env.ENV || "dev";
const deployMode = process.env.DEPLOY_MODE;
Expand Down Expand Up @@ -81,7 +82,7 @@ export class SharedProps {
site: ddSite ?? "datadoghq.com",
clusterName: cluster.clusterName,
environmentVariables: {
DD_APM_IGNORE_RESOURCES: "(GET|HEAD) .*/health$",
...datadogAgentEnvironmentVariables,
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT: "0.0.0.0:4317",
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: "0.0.0.0:4318",
DD_LOGS_INJECTION: "true",
Expand Down
5 changes: 5 additions & 0 deletions sticker-award/infra/aws/lib/sticker-award-service-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ export class StickerAwardServiceStack extends cdk.Stack {
ddApiKey,
ddApiKeyParam,
ddSite,
true,
{
DD_APM_IGNORE_RESOURCES:
"(GET|HEAD) .*/health$",
}
);

// Create formatted database credentials from the shared RDS secret
Expand Down
4 changes: 4 additions & 0 deletions sticker-catalogue/infra/aws/lib/sticker-catalogue-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export class StickerCatalogueServiceStack extends cdk.Stack {
ddApiKey,
ddApiKeyParam,
ddSite,
true,
{
DD_APM_IGNORE_RESOURCES: "(GET|HEAD) .*/health$",
},
);

// Create formatted database credentials from the shared RDS secret
Expand Down
4 changes: 4 additions & 0 deletions user-management/infra/aws/lib/user-service-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ export class UserServiceStack extends cdk.Stack {
ddApiKey,
ddApiKeyParam,
ddSite,
true,
{
DD_APM_IGNORE_RESOURCES: "(GET|HEAD) .*/health$",
},
);

// Create formatted database credentials from the shared RDS secret
Expand Down
4 changes: 4 additions & 0 deletions web-backend/infra/aws/lib/web-backend-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ export class WebBackendStack extends cdk.Stack {
ddApiKey,
ddApiKeyParam,
ddSite,
true,
{
DD_APM_IGNORE_RESOURCES: "(GET|HEAD) .*/health$",
},
);

const serviceProps = {
Expand Down
Loading