merge OS PR #3

Bit-Quill · Aug 29, 2023 · b0ee628 · b0ee628
1 parent 8347bbe
commit b0ee628
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/exporter/clickhouseexporter/Makefile b/exporter/clickhouseexporter/Makefile
@@ -1,7 +1,6 @@
 include ../../Makefile.Common
 
 local-run-example:
-	cd ../../ && GOOS=linux go build -o ./local/otelcontribcol ./cmd/otelcontribcol
 	cd example && docker-compose up -d
 recreate-otel-collector:
 	cd ../../ && GOOS=linux go build -o ./local/otelcontribcol ./cmd/otelcontribcol

diff --git a/exporter/opensearchexporter/demo/docker-compose.yaml b/exporter/opensearchexporter/demo/docker-compose.yaml
@@ -5,10 +5,10 @@ networks:
 
 services:
   opensearch-node:
-#    image: opensearchproject/opensearch:latest
-    image: opensearchproject/opensearch-dashboards:latest
-#    container_name: opensearch-node
-    container_name: opensearch-node-dashboard
+    image: opensearchproject/opensearch:latest
+#    image: opensearchproject/opensearch-dashboards:latest
+    container_name: opensearch-node
+#    container_name: opensearch-node-dashboard
 
     environment:
       - cluster.name=opensearch-cluster # Name the cluster
@@ -27,7 +27,7 @@ services:
     ports:
       - "9200:9200"
       - "9600:9600"
-      - "5601:5601"
+#      - "5601:5601"
     networks:
       - otel-opensearch
 

diff --git a/exporter/opensearchexporter/trace_bulk_indexer.go b/exporter/opensearchexporter/trace_bulk_indexer.go
@@ -194,6 +194,15 @@ func responseAsError(item opensearchutil.BulkIndexerResponseItem) error {
 	return errors.New(string(errorJSON))
 }
 
+func attributesToMap(attributes pcommon.Map) map[string]string {
+	m := make(map[string]string, attributes.Len())
+	attributes.Range(func(k string, v pcommon.Value) bool {
+		m[k] = v.AsString()
+		return true
+	})
+	return m
+}
+
 func shouldRetryEvent(status int) bool {
 	var retryOnStatus = []int{500, 502, 503, 504, 429}
 	for _, retryable := range retryOnStatus {