From c25a5e06cf5f3b84699bf187bd9129f9ea65e29a Mon Sep 17 00:00:00 2001
From: Mak Muftic <mak@nodefactory.io>
Date: Thu, 16 Sep 2021 12:15:42 +0200
Subject: [PATCH] Use config string for elasticsearch client

---
 node/modules/lp2p/pubsub.go                    |  4 +++-
 node/modules/tracer/elasticsearch_transport.go | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go
index 905643ed0..d12a3fa1c 100644
--- a/node/modules/lp2p/pubsub.go
+++ b/node/modules/lp2p/pubsub.go
@@ -376,7 +376,9 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) {
 		transports = append(transports, jsonTransport)
 	}
 	if in.Cfg.ElasticSearchTracer != "" {
-		elasticSearchTransport, err := tracer.NewElasticSearchTransport()
+		elasticSearchTransport, err := tracer.NewElasticSearchTransport(
+			in.Cfg.ElasticSearchTracer,
+		)
 		if err != nil {
 			return nil, err
 		}
diff --git a/node/modules/tracer/elasticsearch_transport.go b/node/modules/tracer/elasticsearch_transport.go
index 3bf86ee29..45ddd36aa 100644
--- a/node/modules/tracer/elasticsearch_transport.go
+++ b/node/modules/tracer/elasticsearch_transport.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"strings"
 
 	"github.com/elastic/go-elasticsearch/v7"
@@ -17,8 +18,20 @@ const (
 	ElasticSearch_DOC_PUBSUB = "doc_pubsub"
 )
 
-func NewElasticSearchTransport() (TracerTransport, error) {
-	es, err := elasticsearch.NewDefaultClient()
+func NewElasticSearchTransport(connectionString string) (TracerTransport, error) {
+	conUrl, err := url.Parse(connectionString)
+
+	username := conUrl.User.Username()
+	password, _ := conUrl.User.Password()
+	cfg := elasticsearch.Config{
+		Addresses: []string{
+			"https://" + conUrl.Host,
+		},
+		Username: username,
+		Password: password,
+	}
+
+	es, err := elasticsearch.NewClient(cfg)
 
 	if err != nil {
 		return nil, err