Skip to content

Enable secure random ID generation for AWS Lambda MicroVM environments #11622

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

Open
litianningdatadog wants to merge 1 commit into
base: master
Choose a base branch
from
+49 −1
Open

Enable secure random ID generation for AWS Lambda MicroVM environments #11622

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
4 changes: 3 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
configProvider.getBoolean(WRITER_BAGGAGE_INJECT, isDatadogTraceWriter);
injectLinksAsTagsEnabled = configProvider.getBoolean(WRITER_LINKS_INJECT, isDatadogTraceWriter);
String lambdaInitType = getEnv("AWS_LAMBDA_INITIALIZATION_TYPE");
if (lambdaInitType != null && lambdaInitType.equals("snap-start")) {
String lambdaMicrovmImageArn = ConfigHelper.env("AWS_LAMBDA_MICROVM_IMAGE_ARN");
if ((lambdaInitType != null && lambdaInitType.equals("snap-start"))
|| (lambdaMicrovmImageArn != null && !lambdaMicrovmImageArn.isEmpty())) {
secureRandom = true;
} else {
secureRandom = configProvider.getBoolean(SECURE_RANDOM, DEFAULT_SECURE_RANDOM);
Expand Down
46 changes: 46 additions & 0 deletions internal-api/src/test/java/datadog/trace/api/ConfigSecureRandomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package datadog.trace.api;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;

import datadog.trace.junit.utils.config.WithConfig;
import datadog.trace.junit.utils.config.WithConfigExtension;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

@ExtendWith(WithConfigExtension.class)
class ConfigSecureRandomTest {

@Test
void defaultStrategyIsRandom() {
assertNotEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
}

@Test
void snapStartEnablesSecureRandom() {
WithConfigExtension.injectEnvConfig("AWS_LAMBDA_INITIALIZATION_TYPE", "snap-start", false);

assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
}

@Test
void microvmImageArnEnablesSecureRandom() {
WithConfigExtension.injectEnvConfig(
"AWS_LAMBDA_MICROVM_IMAGE_ARN", "arn:aws:lambda:us-east-1::runtime:microvm", false);

assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
}

@Test
void emptyMicrovmImageArnDoesNotEnableSecureRandom() {
WithConfigExtension.injectEnvConfig("AWS_LAMBDA_MICROVM_IMAGE_ARN", "", false);

assertNotEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
}

@Test
@WithConfig(key = "trace.secure-random", value = "true")
void configPropertyEnablesSecureRandom() {
assertEquals("SRandom", Config.get().getIdGenerationStrategy().getClass().getSimpleName());
}
}
Loading