[trace-agent] adding output of 'trace-agent -info' (#3164)

* [trace-agent] adding output of 'trace-agent -info' on 'datadog-agent info'

* [trace-agent] added support for CentOS

- Dropped source & OS/X patches, does not make sense yet
- Still returning 0 if trace-agent fails to get its status.
  Indeed, some might use this script as a health check, and
  we don't want it to fail just because the trace-agent is
  not working, as it's not a base core component (yet).

* [trace-agent] not checking for trace-agent binary, should be always shipped

packaging/centos/datadog-agent.init

@@ -31,6 +31,7 @@ PIDPATH="/var/run/dd-agent/"
 PROG="datadog-agent"
 LOCKFILE=/var/lock/subsys/$PROG
 FORWARDERPATH="/opt/datadog-agent/agent/ddagent.py"
+TRACEAGENTPATH="/opt/datadog-agent/bin/trace-agent"
 SUPERVISORD_PATH="PATH=/opt/datadog-agent/embedded/bin:/opt/datadog-agent/bin:$PATH /opt/datadog-agent/bin/supervisord"
 SUPERVISORCTL_PATH="/opt/datadog-agent/bin/supervisorctl"
 SUPERVISOR_CONF="/etc/dd-agent/supervisor.conf"
@@ -186,7 +187,9 @@ info() {
     DOGSTATSD_RETURN=$?
     su $AGENTUSER -c "$FORWARDERPATH info"
     FORWARDER_RETURN=$?
-    exit $(($FORWARDER_RETURN+$COLLECTOR_RETURN+DOGSTATSD_RETURN))
+    su $AGENTUSER -c "$TRACEAGENTPATH -info"
+    TRACEAGENT_RETURN=$? # not used for now, Trace/APM not a core feature yet
+    exit $(($FORWARDER_RETURN+$COLLECTOR_RETURN+$DOGSTATSD_RETURN))
 }
 
 reload() {

packaging/debian/datadog-agent.init

@@ -19,6 +19,7 @@ DOGSTATSDPATH="/opt/datadog-agent/agent/dogstatsd.py"
 KILL_PATH="/opt/datadog-agent/embedded/bin/kill"
 AGENTUSER="dd-agent"
 FORWARDERPATH="/opt/datadog-agent/agent/ddagent.py"
+TRACEAGENTPATH="/opt/datadog-agent/bin/trace-agent"
 NAME="datadog-agent"
 DESC="Datadog Agent"
 SUPERVISOR_PIDFILE="/opt/datadog-agent/run/datadog-supervisord.pid"
@@ -176,6 +177,8 @@ case "$1" in
         DOGSTATSD_RETURN=$?
         su $AGENTUSER -c "$FORWARDERPATH info"
         FORWARDER_RETURN=$?
+        su $AGENTUSER -c "$TRACEAGENTPATH -info"
+        TRACEAGENT_RETURN=$? # not used for now, Trace/APM not a core feature yet
         exit $(($COLLECTOR_RETURN+$DOGSTATSD_RETURN+$FORWARDER_RETURN))
         ;;
 

packaging/suse/datadog-agent.init

@@ -19,6 +19,7 @@ DOGSTATSDPATH="/opt/datadog-agent/agent/dogstatsd.py"
 KILL_PATH="/opt/datadog-agent/embedded/bin/kill"
 AGENTUSER="dd-agent"
 FORWARDERPATH="/opt/datadog-agent/agent/ddagent.py"
+TRACEAGENTPATH="/opt/datadog-agent/bin/trace-agent"
 NAME="datadog-agent"
 DESC="Datadog Agent"
 SUPERVISOR_PIDFILE="/opt/datadog-agent/run/datadog-supervisord.pid"
@@ -417,6 +418,8 @@ case "$1" in
         DOGSTATSD_RETURN=$?
         su $AGENTUSER -c "$FORWARDERPATH info"
         FORWARDER_RETURN=$?
+        su $AGENTUSER -c "$TRACEAGENTPATH -info"
+        TRACEAGENT_RETURN=$? # not used for now, Trace/APM not a core feature yet
         exit $(($COLLECTOR_RETURN+$DOGSTATSD_RETURN+$FORWARDER_RETURN))
         ;;