Add env DD_TAGS support

GuanceCloud · Jan 20, 2025 · 2f22ac3 · 2f22ac3
1 parent bdbf3c2
commit 2f22ac3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/src/arguments.cpp b/src/arguments.cpp
@@ -411,6 +411,9 @@ Error Arguments::parse(const char* args) {
             CASE("dd_version")
                 _dd_version = value;
 
+            CASE("dd_tags")
+                _dd_tags = value;
+
             DEFAULT()
                 if (_unknown_arg == NULL) _unknown_arg = arg;
         }

diff --git a/src/arguments.h b/src/arguments.h
@@ -210,6 +210,7 @@ class Arguments {
     const char *_dd_service;
     const char *_dd_env;
     const char *_dd_version;
+    const char *_dd_tags;
 
     Arguments() :
         _buf(NULL),
@@ -265,6 +266,7 @@ class Arguments {
         _dd_service(""),
         _dd_env(""),
         _dd_version(""),
+        _dd_tags(""),
         _httpcli(NULL),
         _http_out(false) {
     }

diff --git a/src/flightRecorder.cpp b/src/flightRecorder.cpp
@@ -531,6 +531,9 @@ class Recording {
             gethostname(hostname, sizeof(hostname));
             ss << "process_id:" << getpid() << ",host:" << hostname << ",profiler_version:" << PROFILER_VERSION << ",service:" << _global_args._dd_service;
             ss << ",env:" << _global_args._dd_env << ",version:" << _global_args._dd_version << ",language:jvm";
+            if (_global_args._dd_tags != NULL && _global_args._dd_tags[0] != 0) {
+                ss << "," << _global_args._dd_tags;
+            }
             j["tags_profiler"] = ss.str();
             time_t start_time = Profiler::instance()->start_time();
             time_t stop_time = Profiler::instance()->stop_time();

diff --git a/src/launcher/main.cpp b/src/launcher/main.cpp
@@ -66,6 +66,7 @@ static const char USAGE_STRING[] =
     "\n"
     "  --loop time       run profiler in a loop\n"
     "  --ttl duration    total duration the profiler will run, which is useful in the loop (continuous profiling) model\n"
+    "  --http-out        send the profiling output to a remote server via http, additional ENVs DD_AGENT_HOST/DD_TRACE_AGENT_PORT/DD_SERVICE/DD_ENV/DD_VERSION/DD_TAGS are supported\n"
     "  --alloc bytes     allocation profiling interval in bytes\n"
     "  --live            build allocation profile from live objects only\n"
     "  --lock duration   lock profiling threshold in nanoseconds\n"
@@ -416,6 +417,10 @@ int main(int argc, const char** argv) {
             if (dd_version != NULL && dd_version[0] != 0) {
                 params << ",dd_version=" << dd_version;
             }
+            char *dd_tags = getenv("DD_TAGS");
+            if (dd_tags != NULL && dd_tags[0] != 0) {
+                params << ",dd_tags=" << dd_tags;
+            }
 
         } else if (arg == "-o") {
             output = args.next();

diff --git a/src/zInit.cpp b/src/zInit.cpp
@@ -35,8 +35,8 @@ class LateInitializer {
         _global_args._preloaded = true;
 
         Log::open(_global_args);
-        Log::info("_http_out: %d, _dd_agent_host: %s, _dd_trace_agent_port: %d, _dd_service: %s, _dd_env: %s, _dd_version: %s",
-        _global_args._http_out, _global_args._dd_agent_host, _global_args._dd_trace_agent_port, _global_args._dd_service, _global_args._dd_env, _global_args._dd_version);
+        Log::info("_http_out: %d, _dd_agent_host: %s, _dd_trace_agent_port: %d, _dd_service: %s, _dd_env: %s, _dd_version: %s, _dd_tags: %s",
+        _global_args._http_out, _global_args._dd_agent_host, _global_args._dd_trace_agent_port, _global_args._dd_service, _global_args._dd_env, _global_args._dd_version, _global_args._dd_tags);
 
         if (error || (error = Profiler::instance()->run(_global_args))) {
             Log::error("%s", error.message());