Fix constants

DataDog · Jul 1, 2024 · 7d361e3 · 7d361e3
1 parent a1f55ad
commit 7d361e3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/ddtrace/tracer/civisibility_transport.go b/ddtrace/tracer/civisibility_transport.go
@@ -69,7 +69,7 @@ func newCiVisibilityTransport(config *config) *ciVisibilityTransport {
 	}
 
 	// Determine if agentless mode is enabled through an environment variable.
-	agentlessEnabled := internal.BoolEnv(constants.CiVisibilityAgentlessEnabledEnvironmentVariable, false)
+	agentlessEnabled := internal.BoolEnv(constants.CIVisibilityAgentlessEnabledEnvironmentVariable, false)
 
 	testCycleURL := ""
 	if agentlessEnabled {
@@ -84,7 +84,7 @@ func newCiVisibilityTransport(config *config) *ciVisibilityTransport {
 
 		// Check for a custom agentless URL.
 		agentlessURL := ""
-		if v := os.Getenv(constants.CiVisibilityAgentlessURLEnvironmentVariable); v != "" {
+		if v := os.Getenv(constants.CIVisibilityAgentlessURLEnvironmentVariable); v != "" {
 			agentlessURL = v
 		}
 

diff --git a/ddtrace/tracer/civisibility_transport_test.go b/ddtrace/tracer/civisibility_transport_test.go
@@ -85,8 +85,8 @@ func runTransportTest(t *testing.T, agentless bool) {
 
 	// Set CI Visibility environment variables for the test
 	if agentless {
-		t.Setenv(constants.CiVisibilityAgentlessEnabledEnvironmentVariable, "1")
-		t.Setenv(constants.CiVisibilityAgentlessURLEnvironmentVariable, srv.URL)
+		t.Setenv(constants.CIVisibilityAgentlessEnabledEnvironmentVariable, "1")
+		t.Setenv(constants.CIVisibilityAgentlessURLEnvironmentVariable, srv.URL)
 		t.Setenv(constants.APIKeyEnvironmentVariable, "12345")
 	}
 

diff --git a/ddtrace/tracer/civisibility_tslv.go b/ddtrace/tracer/civisibility_tslv.go
@@ -273,10 +273,10 @@ func getCiVisibilityEvent(span *span) *ciVisibilityEvent {
 //	A pointer to the created ciVisibilityEvent.
 func createTestEventFromSpan(span *span) *ciVisibilityEvent {
 	tSpan := createTslvSpan(span)
-	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTagName)
-	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTagName)
-	tSpan.SuiteID = getAndRemoveMetaToUInt64(span, constants.TestSuiteIDTagName)
-	tSpan.CorrelationID = getAndRemoveMeta(span, constants.ItrCorrelationIDTagName)
+	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTag)
+	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTag)
+	tSpan.SuiteID = getAndRemoveMetaToUInt64(span, constants.TestSuiteIDTag)
+	tSpan.CorrelationID = getAndRemoveMeta(span, constants.ItrCorrelationIDTag)
 	tSpan.SpanID = span.SpanID
 	tSpan.TraceID = span.TraceID
 	return &ciVisibilityEvent{
@@ -298,9 +298,9 @@ func createTestEventFromSpan(span *span) *ciVisibilityEvent {
 //	A pointer to the created ciVisibilityEvent.
 func createTestSuiteEventFromSpan(span *span) *ciVisibilityEvent {
 	tSpan := createTslvSpan(span)
-	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTagName)
-	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTagName)
-	tSpan.SuiteID = getAndRemoveMetaToUInt64(span, constants.TestSuiteIDTagName)
+	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTag)
+	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTag)
+	tSpan.SuiteID = getAndRemoveMetaToUInt64(span, constants.TestSuiteIDTag)
 	return &ciVisibilityEvent{
 		span:    span,
 		Type:    constants.SpanTypeTestSuite,
@@ -320,8 +320,8 @@ func createTestSuiteEventFromSpan(span *span) *ciVisibilityEvent {
 //	A pointer to the created ciVisibilityEvent.
 func createTestModuleEventFromSpan(span *span) *ciVisibilityEvent {
 	tSpan := createTslvSpan(span)
-	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTagName)
-	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTagName)
+	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTag)
+	tSpan.ModuleID = getAndRemoveMetaToUInt64(span, constants.TestModuleIDTag)
 	return &ciVisibilityEvent{
 		span:    span,
 		Type:    constants.SpanTypeTestModule,
@@ -341,7 +341,7 @@ func createTestModuleEventFromSpan(span *span) *ciVisibilityEvent {
 //	A pointer to the created ciVisibilityEvent.
 func createTestSessionEventFromSpan(span *span) *ciVisibilityEvent {
 	tSpan := createTslvSpan(span)
-	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTagName)
+	tSpan.SessionID = getAndRemoveMetaToUInt64(span, constants.TestSessionIDTag)
 	return &ciVisibilityEvent{
 		span:    span,
 		Type:    constants.SpanTypeTestSession,

diff --git a/ddtrace/tracer/option.go b/ddtrace/tracer/option.go
@@ -540,7 +540,7 @@ func newConfig(opts ...StartOption) *config {
 	c.initGlobalTags(c.globalTags.get(), globalTagsOrigin)
 
 	// Check if CI Visibility mode is enabled
-	if internal.BoolEnv(constants.CiVisibilityEnabledEnvironmentVariable, false) {
+	if internal.BoolEnv(constants.CIVisibilityEnabledEnvironmentVariable, false) {
 		c.ciVisibilityEnabled = true              // Enable CI Visibility mode
 		c.httpClientTimeout = time.Second * 45    // Increase timeout up to 45 seconds (same as other tracers in CIVis mode)
 		c.logStartup = false                      // If we are in CI Visibility mode we don't want to log the startup to stdout to avoid polluting the output