STAC-21039: Fix rtloader tests

StackVista · May 2, 2024 · 832e66d · 832e66d
1 parent 8139b7f
commit 832e66d
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 18 deletions.
diff --git a/local.sh b/local.sh
@@ -124,11 +124,10 @@ if [ "${WHAT}" = "CMD" ]; then
     cd $SRC_PATH || exit
 
     echo "          ---                         ---"
-    echo "          --- Running command ${@:2} "
+    echo "          --- Running command `$2`"
     echo "          ---                         ---"
 
-
-    $("${@:2}")
+    $2
 
     cd "$CI_PROJECT_DIR" || exit
 fi
diff --git a/rtloader/common/builtins/_util.h b/rtloader/common/builtins/_util.h
@@ -4,6 +4,7 @@
 // Copyright 2019-present Datadog, Inc.
 #ifndef DATADOG_AGENT_RTLOADER_UTIL__H
 #define DATADOG_AGENT_RTLOADER_UTIL__H
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/containers.h b/rtloader/common/builtins/containers.h
@@ -36,7 +36,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/datadog_agent.h b/rtloader/common/builtins/datadog_agent.h
@@ -135,7 +135,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/health.h b/rtloader/common/builtins/health.h
@@ -52,7 +52,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/kubeutil.h b/rtloader/common/builtins/kubeutil.h
@@ -35,7 +35,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/state.h b/rtloader/common/builtins/state.h
@@ -45,7 +45,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/tagger.h b/rtloader/common/builtins/tagger.h
@@ -40,7 +40,7 @@
     tagger generate tags. This memory should be freed with the cgo_free helper
     available when done.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/telemetry.h b/rtloader/common/builtins/telemetry.h
@@ -40,7 +40,7 @@
     callback function.
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/topology.h b/rtloader/common/builtins/topology.h
@@ -66,7 +66,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/transaction.h b/rtloader/common/builtins/transaction.h
@@ -59,7 +59,7 @@
 
     The callback is expected to be provided by the rtloader caller - in go-context: CGO.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/builtins/util.h b/rtloader/common/builtins/util.h
@@ -11,7 +11,7 @@
     The prototypes here defined provide functions to initialize the python util
     builtin module, and set its relevant callbacks for the rtloader caller.
 */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader_types.h>
 

diff --git a/rtloader/common/stringutils.h b/rtloader/common/stringutils.h
@@ -75,6 +75,7 @@
 extern "C" {
 #endif
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 int init_stringutils(void);

diff --git a/rtloader/test/telemetry/telemetry.go b/rtloader/test/telemetry/telemetry.go
@@ -3,7 +3,7 @@ package testtelemetry
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/DataDog/datadog-agent/pkg/metrics"
+	"github.com/DataDog/datadog-agent/pkg/metrics/event"
 	"io/ioutil"
 	"log"
 	"os"
@@ -33,7 +33,7 @@ var (
 	rtloader     *C.rtloader_t
 	checkID      string
 	_data        map[string]interface{}
-	_topoEvt     metrics.Event
+	_topoEvt     event.Event
 	rawName      string
 	rawHostname  string
 	rawValue     float64
@@ -44,7 +44,7 @@ var (
 func resetOuputValues() {
 	checkID = ""
 	_data = nil
-	_topoEvt = metrics.Event{}
+	_topoEvt = event.Event{}
 	rawName = ""
 	rawHostname = ""
 	rawValue = 0

diff --git a/rtloader/test/telemetry/telemetry_test.go b/rtloader/test/telemetry/telemetry_test.go
@@ -2,7 +2,7 @@ package testtelemetry
 
 import (
 	"fmt"
-	"github.com/DataDog/datadog-agent/pkg/metrics"
+	"github.com/DataDog/datadog-agent/pkg/metrics/event"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"strings"
@@ -212,7 +212,7 @@ func TestSubmitTopologyChangeRequestEvents(t *testing.T) {
 		t.Fatalf("Unexpected topology event data 'context.source_links' size: %v", len(_topoEvt.EventContext.SourceLinks))
 	}
 
-	emptySourceLinks := make([]metrics.SourceLink, 0)
+	emptySourceLinks := make([]event.SourceLink, 0)
 	if !assert.ObjectsAreEqualValues(_topoEvt.EventContext.SourceLinks, emptySourceLinks) {
 		t.Fatalf("Unexpected topology event data 'context.source_links' value: %v", _topoEvt.EventContext.SourceLinks)
 	}

diff --git a/rtloader/three/three.h b/rtloader/three/three.h
@@ -19,6 +19,7 @@
 #include <string>
 #include <vector>
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader.h>
 

diff --git a/rtloader/two/two.h b/rtloader/two/two.h
@@ -17,6 +17,7 @@
 #include <string>
 #include <vector>
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <rtloader.h>