bugfix: fix panic when creator return nil, err

cloudonly · Nov 15, 2023 · 1cf9eb8 · 1cf9eb8
1 parent da1811d
commit 1cf9eb8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/pkg/exporter/probe/event.go b/pkg/exporter/probe/event.go
@@ -49,26 +49,34 @@ func newEventProbeCreator(creator interface{}) (*eventProbeCreator, error) {
 	return ret, nil
 }
 
-func (e *eventProbeCreator) Call(sink chan<- *Event, args map[string]interface{}) (EventProbe, error) {
+func (e *eventProbeCreator) Call(sink chan<- *Event, args map[string]interface{}) (ep EventProbe, err error) {
 	in := []reflect.Value{
 		reflect.ValueOf(sink),
 	}
 	if e.s != nil {
-		s, err := createStructFromTypeWithArgs(*e.s, args)
-		if err != nil {
-			return nil, err
+		s, e := createStructFromTypeWithArgs(*e.s, args)
+		if e != nil {
+			return nil, e
 		}
 		in = append(in, s)
 	}
 
 	result := e.f.Call(in)
 	// return parameter count and type has been checked in newEventProbeCreator
-	ret := result[0].Interface().(EventProbe)
-	err := result[1].Interface()
-	if err == nil {
-		return ret, nil
+
+	if result[0].Interface() == nil {
+		ep = nil
+	} else {
+		ep = result[0].Interface().(EventProbe)
 	}
-	return ret, err.(error)
+
+	if result[1].Interface() == nil {
+		err = nil
+	} else {
+		err = result[1].Interface().(error)
+	}
+
+	return
 }
 
 // MustRegisterEventProbe registers the event probe by given name and creator.

diff --git a/pkg/exporter/probe/metrics.go b/pkg/exporter/probe/metrics.go
@@ -50,24 +50,31 @@ func newMetricProbeCreator(creator interface{}) (*metricsProbeCreator, error) {
 	return ret, nil
 }
 
-func (m *metricsProbeCreator) Call(args map[string]interface{}) (MetricsProbe, error) {
+func (m *metricsProbeCreator) Call(args map[string]interface{}) (mp MetricsProbe, err error) {
 	var in []reflect.Value
 	if m.s != nil {
-		s, err := createStructFromTypeWithArgs(*m.s, args)
-		if err != nil {
-			return nil, err
+		s, e := createStructFromTypeWithArgs(*m.s, args)
+		if e != nil {
+			return nil, e
 		}
 		in = append(in, s)
 	}
 
 	result := m.f.Call(in)
 	// return parameter count and type has been checked in newMetricProbeCreator
-	ret := result[0].Interface().(MetricsProbe)
-	err := result[1].Interface()
-	if err == nil {
-		return ret, nil
+	if result[0].Interface() == nil {
+		mp = nil
+	} else {
+		mp = result[0].Interface().(MetricsProbe)
 	}
-	return ret, err.(error)
+
+	if result[1].Interface() == nil {
+		err = nil
+	} else {
+		err = result[1].Interface().(error)
+	}
+
+	return
 }
 
 // MustRegisterMetricsProbe registers the metrics probe by given name and creator.