Merge pull request kubeedge#5628 from forsaken628/otel

Add opentelemetry to mapper-framework for enhancing pushmethod.
1Shubham7 · Oct 23, 2024 · 93e6aad · 93e6aad
2 parents fdc990f + 5ac358a
commit 93e6aad
Show file tree

Hide file tree

Showing 16 changed files with 1,166 additions and 1,367 deletions.
diff --git a/build/crds/devices/devices_v1beta1_device.yaml b/build/crds/devices/devices_v1beta1_device.yaml
@@ -737,6 +737,14 @@ spec:
                               description: publish topic for mqtt
                               type: string
                           type: object
+                        otel:
+                          description: OTEL Push Method configuration for otel
+                          properties:
+                            endpointURL:
+                              description: the target endpoint URL the Exporter will
+                                connect to, like https://localhost:4318/v1/metrics
+                              type: string
+                          type: object
                       type: object
                     reportCycle:
                       description: Define how frequent mapper will report the value.

diff --git a/hack/generate-groups.sh b/hack/generate-groups.sh
@@ -41,7 +41,11 @@ GENS="$1"
 OUTPUT_PKG="$2"
 APIS_PKG="$3"
 GROUPS_WITH_VERSIONS="$4"
-GOBIN="${GOBIN-$GOPATH/bin}"
+if [ $(go env GOBIN) != "" ]; then
+GOBIN=${GOBIN-$(go env GOBIN)}
+else
+GOBIN=${GOBIN-$(go env GOPATH)/bin}
+fi
 shift 4
 
 (

diff --git a/manifests/charts/cloudcore/crds/devices_v1beta1_device.yaml b/manifests/charts/cloudcore/crds/devices_v1beta1_device.yaml
@@ -737,6 +737,14 @@ spec:
                               description: publish topic for mqtt
                               type: string
                           type: object
+                        otel:
+                          description: OTEL Push Method configuration for otel
+                          properties:
+                            endpointURL:
+                              description: the target endpoint URL the Exporter will
+                                connect to, like https://localhost:4318/v1/metrics
+                              type: string
+                          type: object
                       type: object
                     reportCycle:
                       description: Define how frequent mapper will report the value.

diff --git a/staging/src/github.com/kubeedge/api/apis/devices/v1beta1/device_instance_types.go b/staging/src/github.com/kubeedge/api/apis/devices/v1beta1/device_instance_types.go
@@ -149,6 +149,9 @@ type PushMethod struct {
 	// MQTT Push method configuration for mqtt
 	// +optional
 	MQTT *PushMethodMQTT `json:"mqtt,omitempty"`
+	// OTEL Push Method configuration for otel
+	// +optional
+	OTEL *PushMethodOTEL `json:"otel,omitempty"`
 	// DBMethod represents the method used to push data to database,
 	// please ensure that the mapper can access the destination address.
 	// +optional
@@ -181,6 +184,11 @@ type PushMethodMQTT struct {
 	Retained bool `json:"retained,omitempty"`
 }
 
+type PushMethodOTEL struct {
+	// the target endpoint URL the Exporter will connect to, like https://localhost:4318/v1/metrics
+	EndpointURL string `protobuf:"bytes,1,opt,name=endpointURL,proto3" json:"endpointURL,omitempty"`
+}
+
 type DBMethodConfig struct {
 	// method configuration for database
 	// +optional

diff --git a/staging/src/github.com/kubeedge/api/apis/devices/v1beta1/zz_generated.deepcopy.go b/staging/src/github.com/kubeedge/api/apis/devices/v1beta1/zz_generated.deepcopy.go