From 587ae808436aceb25ece393be8ffa259b9d26ebd Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@google.com>
Date: Mon, 29 Jun 2020 10:57:14 +0200
Subject: [PATCH] src/daemon/identity.[ch]: Remove; superseded by
 metric_family_t and metric_t.

---
 src/daemon/plugin.c | 45 ---------------------------------------------
 src/daemon/plugin.h |  1 -
 2 files changed, 46 deletions(-)

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 27365a3a3..62bef8b33 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -1610,51 +1610,6 @@ metric_family_t *plugin_value_list_to_metric_family(value_list_t const *vl,
   return fam;
 }
 
-identity_t *plugin_valuelist_to_identity(value_list_t const *vl,
-                                         data_source_t const *dsrc) {
-  if ((vl == NULL) || (dsrc == NULL)) {
-    errno = EINVAL;
-    return NULL;
-  }
-
-  strbuf_t name = STRBUF_CREATE;
-  int status = metric_family_name(&name, vl, dsrc);
-  if (status != 0) {
-    errno = status;
-    STRBUF_DESTROY(name);
-    return NULL;
-  }
-
-  keyval_t labels[3] = {
-      {"instance", (strlen(vl->host) != 0) ? vl->host : hostname_g},
-  };
-  size_t labels_num = 1;
-
-  if (strlen(vl->plugin_instance) != 0) {
-    labels[labels_num] = (keyval_t){vl->plugin, vl->plugin_instance};
-    labels_num++;
-  }
-  if (strlen(vl->type_instance) != 0) {
-    char const *key = "type";
-    if (strlen(vl->plugin_instance) == 0) {
-      key = vl->plugin;
-    }
-    labels[labels_num] = (keyval_t){key, vl->type_instance};
-    labels_num++;
-  }
-
-  identity_t *id = identity_create_labelled(name.ptr, labels, labels_num);
-  if (id == NULL) {
-    ERROR("plugin_valuelist_to_identity: identity_create(\"%s\") failed: %s",
-          name.ptr, STRERRNO);
-    STRBUF_DESTROY(name);
-    return NULL;
-  }
-
-  STRBUF_DESTROY(name);
-  return id;
-}
-
 EXPORT int plugin_unregister_read_group(const char *group) /* {{{ */
 {
   llentry_t *le;
diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index c081614d4..396161747 100644
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -32,7 +32,6 @@
 #include "collectd.h"
 
 #include "configfile.h"
-#include "identity.h"
 #include "metric.h"
 #include "utils/metadata/meta_data.h"
 #include "utils_time.h"
-- 
2.47.3