Skip to content

Commit 088b7bf

Browse files
jbachorikjbachorik
authored
Tag profiles for serverless (#8279)
1 parent 77b93e2 commit 088b7bf

4 files changed

Lines changed: 27 additions & 2 deletions

File tree

‎dd-java-agent/agent-profiling/profiling-uploader/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies {
2323
implementation libs.slf4j
2424
implementation project(':communication')
2525
implementation project(':internal-api')
26+
implementation project(':utils:container-utils')
2627
implementation project(':utils:socket-utils')
2728
implementation project(':utils:version-utils')
2829

‎dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.squareup.moshi.JsonAdapter;
2222
import com.squareup.moshi.JsonReader;
2323
import com.squareup.moshi.JsonWriter;
24+
import datadog.common.container.ServerlessInfo;
2425
import datadog.common.version.VersionInfo;
2526
import datadog.communication.http.OkHttpUtils;
2627
import datadog.trace.api.Config;
@@ -110,6 +111,8 @@ public final class ProfileUploader {
110111
+ V4_ATTACHMENT_FILENAME
111112
+ "\"");
112113

114+
static final String SERVELESS_TAG = "functionname";
115+
113116
private final Config config;
114117
private final ConfigProvider configProvider;
115118

@@ -173,6 +176,9 @@ public ProfileUploader(final Config config, final ConfigProvider configProvider)
173176
if (Platform.isNativeImage()) {
174177
tagsMap.put(DDTags.RUNTIME_VERSION_TAG, tagsMap.get(DDTags.RUNTIME_VERSION_TAG) + "-aot");
175178
}
179+
if (ServerlessInfo.get().isRunningInServerlessEnvironment()) {
180+
tagsMap.put(SERVELESS_TAG, ServerlessInfo.get().getFunctionName());
181+
}
176182

177183
// Comma separated tags string for V2.4 format
178184
Pattern quotes = Pattern.compile("\"");

‎dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.datadog.profiling.uploader;
1717

18+
import static com.datadog.profiling.uploader.ProfileUploader.SERVELESS_TAG;
1819
import static com.datadog.profiling.uploader.ProfileUploader.V4_PROFILE_END_PARAM;
1920
import static com.datadog.profiling.uploader.ProfileUploader.V4_PROFILE_START_PARAM;
2021
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -81,6 +82,7 @@
8182
import org.apache.commons.fileupload.FileItem;
8283
import org.apache.commons.io.IOUtils;
8384
import org.junit.jupiter.api.AfterEach;
85+
import org.junit.jupiter.api.BeforeAll;
8486
import org.junit.jupiter.api.BeforeEach;
8587
import org.junit.jupiter.api.Test;
8688
import org.junit.jupiter.api.extension.ExtendWith;
@@ -104,6 +106,8 @@ public class ProfileUploaderTest {
104106

105107
private static final Map<String, String> TAGS;
106108

109+
private static final String FUNCTION_NAME = "my_function";
110+
107111
static {
108112
// Not using Guava's ImmutableMap because we want to test null value
109113
final Map<String, String> tags = new HashMap<>();
@@ -120,6 +124,7 @@ public class ProfileUploaderTest {
120124
new ImmutableMap.Builder<String, String>()
121125
.put("baz", "123")
122126
.put("foo", "bar")
127+
.put(SERVELESS_TAG, FUNCTION_NAME)
123128
.put("quoted", "quoted")
124129
.put(DDTags.PID_TAG, PidHelper.getPid())
125130
.put(VersionInfo.PROFILER_VERSION_TAG, VersionInfo.VERSION)
@@ -149,6 +154,20 @@ public class ProfileUploaderTest {
149154

150155
private ProfileUploader uploader;
151156

157+
@BeforeAll
158+
static void setUpAll() throws Exception {
159+
Map<String, String> env = System.getenv();
160+
161+
Field field = env.getClass().getDeclaredField("m");
162+
field.setAccessible(true);
163+
164+
@SuppressWarnings("unchecked")
165+
Map<String, String> modifiableEnv = (Map<String, String>) field.get(env);
166+
// hard-coding the env variable here; we could theoretically make the field from ServerlessInfo
167+
// public instead
168+
modifiableEnv.put("AWS_LAMBDA_FUNCTION_NAME", FUNCTION_NAME);
169+
}
170+
152171
@BeforeEach
153172
public void setup() throws IOException {
154173
server.start();

‎internal-api/src/main/java/datadog/trace/api/Config.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static datadog.trace.api.ConfigDefaults.*;
44
import static datadog.trace.api.DDTags.*;
5-
import static datadog.trace.api.DDTags.PROFILING_ENABLED;
65
import static datadog.trace.api.config.AppSecConfig.*;
76
import static datadog.trace.api.config.CiVisibilityConfig.*;
87
import static datadog.trace.api.config.CrashTrackingConfig.*;
@@ -3410,7 +3409,7 @@ public Map<String, Object> getLocalRootSpanTags() {
34103409
result.putAll(runtimeTags);
34113410
result.put(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE);
34123411
result.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version());
3413-
result.put(PROFILING_ENABLED, isProfilingEnabled() ? 1 : 0);
3412+
result.put(DDTags.PROFILING_ENABLED, isProfilingEnabled() ? 1 : 0);
34143413
if (isAppSecStandaloneEnabled()) {
34153414
result.put(APM_ENABLED, 0);
34163415
}

0 commit comments

Comments
 (0)