Skip to content
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

Add tmp_free enhanced lambda metric #32927

Closed
wants to merge 4 commits into from
Closed

Add tmp_free enhanced lambda metric #32927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
630a59e
add tmp_free enhanced metric
shreyamalpani Jan 13, 2025
ffe56bd
fix
shreyamalpani Jan 13, 2025
e1bc7b6
update snapshots
shreyamalpani Jan 13, 2025
833d2b6
Merge branch 'main' into shreya.malpani/enhanced-metric-tmp-free
shreyamalpani Jan 13, 2025
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
9 changes: 9 additions & 0 deletions pkg/serverless/metrics/enhanced_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const (
totalNetworkMetric = "aws.lambda.enhanced.total_network"
tmpUsedMetric = "aws.lambda.enhanced.tmp_used"
tmpMaxMetric = "aws.lambda.enhanced.tmp_max"
tmpFreeMetric = "aws.lambda.enhanced.tmp_free"
fdMaxMetric = "aws.lambda.enhanced.fd_max"
fdUseMetric = "aws.lambda.enhanced.fd_use"
threadsMaxMetric = "aws.lambda.enhanced.threads_max"
Expand Down Expand Up @@ -526,6 +527,14 @@ func generateTmpEnhancedMetrics(args generateTmpEnhancedMetricsArgs) {
SampleRate: 1,
Timestamp: args.Time,
})
args.Demux.AggregateSample(metrics.MetricSample{
Name: tmpFreeMetric,
Value: args.TmpMax - args.TmpUsed,
Mtype: metrics.DistributionType,
Tags: args.Tags,
SampleRate: 1,
Timestamp: args.Time,
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for not understanding this better, but what's the reason behind adding this metric? Customers can already technically produce this data on their own using a bit of metric math.

}

func SendTmpEnhancedMetrics(sendMetrics chan bool, tags []string, metricAgent *ServerlessMetricAgent) {
Expand Down
8 changes: 8 additions & 0 deletions pkg/serverless/metrics/enhanced_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,14 @@ func TestSendTmpEnhancedMetrics(t *testing.T) {
SampleRate: 1,
Timestamp: now,
},
{
Name: tmpFreeMetric,
Value: 538331440,
Mtype: metrics.DistributionType,
Tags: tags,
SampleRate: 1,
Timestamp: now,
},
},
generatedMetrics,
)
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/error-csharp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-csharp",
"functionname:integration-tests-extension-XXXXXX-error-csharp",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-csharp",
"runtime:dotnet6",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-csharp",
"functionname:integration-tests-extension-XXXXXX-error-csharp",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-csharp",
"runtime:dotnet6",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/error-java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-java",
"functionname:integration-tests-extension-XXXXXX-error-java",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-java",
"runtime:java8.al2",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-java",
"functionname:integration-tests-extension-XXXXXX-error-java",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-java",
"runtime:java8.al2",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/error-node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-node",
"functionname:integration-tests-extension-XXXXXX-error-node",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-node",
"runtime:nodejs18.x",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-node",
"functionname:integration-tests-extension-XXXXXX-error-node",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-node",
"runtime:nodejs18.x",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/error-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-proxy",
"functionname:integration-tests-extension-XXXXXX-error-proxy",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-proxy",
"runtime:nodejs18.x",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-proxy",
"functionname:integration-tests-extension-XXXXXX-error-proxy",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-proxy",
"runtime:nodejs18.x",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/error-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-python",
"functionname:integration-tests-extension-XXXXXX-error-python",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-python",
"runtime:python3.8",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-error-python",
"functionname:integration-tests-extension-XXXXXX-error-python",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-error-python",
"runtime:python3.8",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
48 changes: 48 additions & 0 deletions test/integration/serverless/snapshots/metric-csharp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,54 @@
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-metric-csharp",
"functionname:integration-tests-extension-XXXXXX-metric-csharp",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-metric-csharp",
"runtime:dotnet6",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
"metric": "aws.lambda.enhanced.tmp_free",
"tags": [
"account_id:############",
"architecture:XXX",
"aws_account:############",
"dd_extension_version:123",
"env:integration-tests-env",
"function_arn:arn:aws:lambda:eu-west-1:############:function:integration-tests-extension-XXXXXX-metric-csharp",
"functionname:integration-tests-extension-XXXXXX-metric-csharp",
"memorysize:1024",
"region:eu-west-1",
"resource:integration-tests-extension-XXXXXX-metric-csharp",
"runtime:dotnet6",
"service:integration-tests-service",
"taga:valuea",
"tagb:valueb",
"tagc:valuec",
"tagd:valued",
"version:integration-tests-version"
]
},
{
"distributions": null,
"dogsketches": [],
Expand Down
Loading
Loading