Merge pull request open-telemetry#21 from chadpatel/may30_refactor_le…

…ader_election Refactor leader election
sky333999 · May 31, 2023 · 59e2f8d · 59e2f8d
2 parents 7a68c73 + c12b747
commit 59e2f8d
Show file tree

Hide file tree

Showing 14 changed files with 626 additions and 343 deletions.
diff --git a/internal/aws/k8s/k8sclient/daemonset.go b/internal/aws/k8s/k8sclient/daemonset.go
@@ -17,14 +17,15 @@ package k8sclient // import "github.com/open-telemetry/opentelemetry-collector-c
 import (
 	"context"
 	"fmt"
+	"sync"
+
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
-	"sync"
 )
 
 type DaemonSetClient interface {

diff --git a/internal/aws/k8s/k8sclient/daemonset_test.go b/internal/aws/k8s/k8sclient/daemonset_test.go
@@ -14,14 +14,16 @@
 package k8sclient
 
 import (
+	"sort"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
-	"testing"
 )
 
 var daemonSetObjects = []runtime.Object{
@@ -88,6 +90,9 @@ func TestDaemonSetClient(t *testing.T) {
 		},
 	}
 	actual := client.DaemonSetInfos()
+	sort.Slice(actual, func(i, j int) bool {
+		return actual[i].Name < actual[j].Name
+	})
 	assert.Equal(t, expected, actual)
 	client.shutdown()
 	assert.True(t, client.stopped)

diff --git a/internal/aws/k8s/k8sclient/deployment.go b/internal/aws/k8s/k8sclient/deployment.go
@@ -17,14 +17,15 @@ package k8sclient // import "github.com/open-telemetry/opentelemetry-collector-c
 import (
 	"context"
 	"fmt"
+	"sync"
+
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
-	"sync"
 )
 
 type DeploymentClient interface {

diff --git a/internal/aws/k8s/k8sclient/deployment_test.go b/internal/aws/k8s/k8sclient/deployment_test.go
@@ -14,14 +14,16 @@
 package k8sclient
 
 import (
+	"sort"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
-	"testing"
 )
 
 var desired = int32(20)
@@ -98,6 +100,9 @@ func TestDeploymentClient(t *testing.T) {
 		},
 	}
 	actual := client.DeploymentInfos()
+	sort.Slice(actual, func(i, j int) bool {
+		return actual[i].Name < actual[j].Name
+	})
 	assert.Equal(t, expected, actual)
 	client.shutdown()
 	assert.True(t, client.stopped)

diff --git a/receiver/awscontainerinsightreceiver/README.md b/receiver/awscontainerinsightreceiver/README.md
@@ -112,6 +112,8 @@ rules:
     resources: ["configmaps"]
     resourceNames: ["otel-container-insight-clusterleader"]
     verbs: ["get","update"]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get", "list", "watch"]
 
 ---
 kind: ClusterRoleBinding
@@ -338,10 +340,19 @@ kubectl apply -f config.yaml
 
 ## Available Metrics and Resource Attributes
 ### Cluster
-| Metric                    | Unit  |
-|---------------------------|-------|
-| cluster_failed_node_count | Count |
-| cluster_node_count        | Count |
+| Metric                                                     | Unit    |
+|------------------------------------------------------------|---------|
+| cluster_failed_node_count                                  | Count   |
+| cluster_node_count                                         | Count   |
+| apiserver_storage_objects                                  | Count   |
+| apiserver_request_total                                    | Count   |
+| apiserver_request_duration_seconds                         | Seconds |
+| apiserver_admission_controller_admission_duration_seconds  | Seconds |
+| rest_client_request_duration_seconds                       | Seconds |
+| rest_client_requests_total                                 | Count   |
+| etcd_request_duration_seconds                              | Seconds |
+
+
 
 <br/><br/> 
 | Resource Attribute |
@@ -397,6 +408,24 @@ kubectl apply -f config.yaml
 
 
 <br/><br/> 
+
+### Cluster Endpoint
+| Metric                      | Unit  |
+|-----------------------------|-------|
+| etcd_db_total_size_in_bytes | bytes |
+
+
+<br/><br/>
+| Resource Attribute |
+|--------------------|
+| ClusterName        |
+| NodeName           |
+| Endpoint           |
+| Type               |
+| Timestamp          |
+| Version            |
+| Sources            |
+
 <br/><br/> 
 
 ### Cluster Deployment