Pass the blocklist source debuggee labels up to the Java code

PiperOrigin-RevId: 371746388
Change-Id: I70181d08cbd46d21268793c3bd5c0de28bb14047

Author: jasonborg

src/agent/bridge.h

@@ -20,6 +20,7 @@
 #include <memory>
 
 #include "common.h"
+#include "debuggee_labels.h"
 #include "model.h"
 
 namespace devtools {
@@ -52,7 +53,8 @@ class Bridge {
   // Registers the debuggee with the controller. Returns true if the request
   // was successful. When registration succeeds "is_enabled" will usually be
   // set to true (unless the Hub remotely disables the debuglet).
-  virtual bool RegisterDebuggee(bool* is_enabled) = 0;
+  virtual bool RegisterDebuggee(bool* is_enabled,
+                                const DebuggeeLabels& debugee_labels) = 0;
 
   // Queries for the list of currently active breakpoints. Returns false if the
   // network call failed.

src/agent/debuggee_labels.cc

@@ -8,10 +8,31 @@ constexpr char DebuggeeLabels::kBlocklistSourceDeprecatedFile[];
 constexpr char DebuggeeLabels::kBlocklistSourceFile[];
 constexpr char DebuggeeLabels::kBlocklistSourceNone[];
 
-void DebuggeeLabels::Set(const std::string& /* name */,
-                         const std::string& /* value */) {
-  // TODO: Implement in follow on CL.
+void DebuggeeLabels::Set(const std::string& name, const std::string& value) {
+  labels_[name] = value;
 }
 
+JniLocalRef DebuggeeLabels::Get() const {
+  ExceptionOr<JniLocalRef> jni_labels = jniproxy::HashMap()->NewObject();
+
+  if (jni_labels.HasException()) {
+    // This means an error occurred trying to allocate the HashMap in the JVM.
+    return JniLocalRef();
+  }
+
+  for (const auto& label : labels_) {
+    auto rc = jniproxy::HashMap()->put(jni_labels.GetData().get(),
+                                       JniToJavaString(label.first).get(),
+                                       JniToJavaString(label.second).get());
+
+    if (rc.HasException()) {
+      return JniLocalRef();
+    }
+  }
+
+  return jni_labels.Release(ExceptionAction::IGNORE);
+}
+
+
 }  // namespace cdbg
 }  // namespace devtools

src/agent/debuggee_labels.h

@@ -31,6 +31,11 @@ class DebuggeeLabels {
   static constexpr char kBlocklistSourceNone[] = "none";
 
   void Set(const std::string& name, const std::string& value);
+
+  JniLocalRef Get() const;
+
+ private:
+  std::map<std::string, std::string> labels_;
 };
 
 }  // namespace cdbg

src/agent/jni_bridge.cc

@@ -19,7 +19,6 @@
 #include "jni_proxy_classloader.h"
 #include "jni_proxy_hubclient.h"
 #include "jni_proxy_hubclient_listactivebreakpointsresult.h"
-#include "jni_proxy_ju_hashmap.h"
 
 namespace devtools {
 namespace cdbg {
@@ -67,19 +66,19 @@ void JniBridge::EnqueueBreakpointUpdate(
   }
 }
 
-
-bool JniBridge::RegisterDebuggee(bool* is_enabled) {
+bool JniBridge::RegisterDebuggee(bool* is_enabled,
+                                 const DebuggeeLabels& debuggee_labels) {
   *is_enabled = false;
 
-  // TODO Follow on CL will be getting actual labels wired in.
-  ExceptionOr<JniLocalRef> labels = jniproxy::HashMap()->NewObject();
-  if (labels.HasException()) {
-    // This means an error occurred trying to allocate the HashMap in the JVM.
-    return false;  // No registration occurred
+  JniLocalRef java_labels = debuggee_labels.Get();
+
+  if (!java_labels) {
+    LOG(ERROR) << "Failed to create the Debuggee labels Java map.";
+    return false;
   }
 
   auto rc = jniproxy::HubClient()->registerDebuggee(jni_hub_.get(),
-                                                    labels.GetData().get());
+                                                    java_labels.get());
 
   if (rc.HasException()) {
     // The Java code logs important errors.
@@ -91,7 +90,6 @@ bool JniBridge::RegisterDebuggee(bool* is_enabled) {
   return true;
 }
 
-
 Bridge::HangingGetResult JniBridge::ListActiveBreakpoints(
     std::vector<std::unique_ptr<BreakpointModel>>* breakpoints) {
   breakpoints->clear();

src/agent/jni_bridge.h

@@ -23,6 +23,7 @@
 #include "nullable.h"
 #include "bridge.h"
 #include "common.h"
+#include "debuggee_labels.h"
 #include "jni_utils.h"
 #include "mutex.h"
 #include "transmit_queue.h"
@@ -54,7 +55,8 @@ class JniBridge : public Bridge {
 
   void Shutdown() override;
 
-  bool RegisterDebuggee(bool* is_enabled) override;
+  bool RegisterDebuggee(bool* is_enabled,
+                        const DebuggeeLabels& debuggee_labels) override;
 
   HangingGetResult ListActiveBreakpoints(
       std::vector<std::unique_ptr<BreakpointModel>>* breakpoints) override;

src/agent/jvmti_agent.cc

@@ -332,7 +332,7 @@ void JvmtiAgent::EnableJvmtiDebuggerNotifications(jvmtiEventMode mode) {
 }
 
 
-bool JvmtiAgent::OnWorkerReady() {
+bool JvmtiAgent::OnWorkerReady(DebuggeeLabels* debuggee_labels) {
   // Connect to Java internals implementation.
   {
     if (!internals_->LoadInternals()) {
@@ -381,13 +381,9 @@ bool JvmtiAgent::OnWorkerReady() {
     return false;
   }
 
-  // TODO The labels will be wired up and passed out in a follow on
-  // CL.
-  DebuggeeLabels debuggee_labels;
-
   // Load data visibility configuration.
   data_visibility_policy_ =
-      data_visibility_policy_fn_(internals_, &debuggee_labels);
+      data_visibility_policy_fn_(internals_, debuggee_labels);
 
   return true;
 }

src/agent/jvmti_agent.h

@@ -121,7 +121,7 @@ class JvmtiAgent : public Worker::Provider {
   // Implementation of Worker::Provider interface
   //
 
-  bool OnWorkerReady() override;
+  bool OnWorkerReady(DebuggeeLabels* debuggee_labels) override;
 
   void OnIdle() override;
 

src/agent/worker.cc

@@ -121,7 +121,7 @@ void Worker::MainThreadProc() {
   // application startup time.
 
   // Deferred initialization of the agent.
-  if (!provider_->OnWorkerReady()) {
+  if (!provider_->OnWorkerReady(&debuggee_labels_)) {
     LOG(ERROR) << "Agent initialization failed: "
                   "debugger thread can't continue.";
     return;  // Signal to stop the main debugger thread.
@@ -215,7 +215,7 @@ void Worker::TransmissionThreadProc() {
 
 void Worker::RegisterDebuggee() {
   bool new_is_enabled = false;
-  is_registered_ = bridge_->RegisterDebuggee(&new_is_enabled);
+  is_registered_ = bridge_->RegisterDebuggee(&new_is_enabled, debuggee_labels_);
 
   if (is_registered_) {
     provider_->EnableDebugger(new_is_enabled);

src/agent/worker.h

@@ -24,6 +24,7 @@
 #include "auto_reset_event.h"
 #include "canary_control.h"
 #include "common.h"
+#include "debuggee_labels.h"
 #include "format_queue.h"
 #include "model.h"
 #include "stopwatch.h"
@@ -50,7 +51,7 @@ class Worker {
     // callbacks, actions done from this function don't impact the start up
     // time of the application. If this function returns false, "Worker" will
     // stop and the debugger will not be functioning.
-    virtual bool OnWorkerReady() = 0;
+    virtual bool OnWorkerReady(DebuggeeLabels* debuggee_labels) = 0;
 
     // Called periodically by the worker thread to give opportunity to the
     // agent to perform routine tasks. Examples: flushing logs, garbage
@@ -148,6 +149,16 @@ class Worker {
   // Result of last call to "RegisterDebuggee".
   bool is_registered_ { false };
 
+  // Debuggee labels gathered from the native code to be included in the set of
+  // labels for the Debuggee in the RegisterDebuggee call.
+  //
+  // NOTE: Once the label are gathered before the first call to
+  // RegisterDebuggee, we must be sure not to update it again, the same set of
+  // labels should be used in every subsequent call since the labels are used in
+  // the debuggee ID generation, so we don't want to cause duplicate IDs for the
+  // same agent.
+  DebuggeeLabels debuggee_labels_;
+
   DISALLOW_COPY_AND_ASSIGN(Worker);
 };