Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI Visibility] Add support for CI Visibility mode in ddtrace #2739

Merged
merged 14 commits into from
Jul 8, 2024
Merged

[CI Visibility] Add support for CI Visibility mode in ddtrace #2739

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3922951
Initial commit for adding a CI Visibility mode to ddtrace
tonyredondo Jun 12, 2024
d0ef2b1
Fixes for reviewdog comments
tonyredondo Jun 12, 2024
fe0e687
Improve the configuration switch
tonyredondo Jun 13, 2024
d255e5f
log an error and exit if agentless mode is set but there's no API key
tonyredondo Jun 13, 2024
f7fc64b
Changes from review
tonyredondo Jun 13, 2024
cdf770b
Changes from review
tonyredondo Jun 13, 2024
e3400dd
fix documentation
tonyredondo Jun 13, 2024
f93f2a9
PR feedback
liashenko Jul 1, 2024
a1f55ad
Merge branch 'tony/civisibility-part1-consts-and-utils' into tony/civ…
liashenko Jul 1, 2024
7d361e3
Fix constants
liashenko Jul 1, 2024
0e20a0a
Remove os.Exit
liashenko Jul 2, 2024
6d9882b
Write a test for agentless with no api key
liashenko Jul 2, 2024
93cfbc8
[CI Visibility] Manual Api and Go/Testing integration (#2742)
tonyredondo Jul 5, 2024
c3be8d0
Fix dependencies
liashenko Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ddtrace/tracer/civisibility_transport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ import (
)

func TestCiVisibilityTransport(t *testing.T) {
t.Run("agentless", func(t *testing.T) { runTransportTest(t, true) })
t.Run("agentbased", func(t *testing.T) { runTransportTest(t, false) })
t.Run("agentless", func(t *testing.T) { runTransportTest(t, true, true) })
t.Run("agentless_no_api_key", func(t *testing.T) { runTransportTest(t, true, false) })
t.Run("agentbased", func(t *testing.T) { runTransportTest(t, false, true) })
}

func runTransportTest(t *testing.T, agentless bool) {
func runTransportTest(t *testing.T, agentless, shouldSetAPIKey bool) {
assert := assert.New(t)

testCases := []struct {
Expand All @@ -42,7 +43,7 @@ func runTransportTest(t *testing.T, agentless bool) {
metaLang := r.Header.Get("Datadog-Meta-Lang")
assert.NotNil(metaLang)

if agentless {
if agentless && shouldSetAPIKey {
apikey := r.Header.Get("dd-api-key")
assert.Equal("12345", apikey)
}
Expand Down Expand Up @@ -87,7 +88,9 @@ func runTransportTest(t *testing.T, agentless bool) {
if agentless {
t.Setenv(constants.CIVisibilityAgentlessEnabledEnvironmentVariable, "1")
t.Setenv(constants.CIVisibilityAgentlessURLEnvironmentVariable, srv.URL)
t.Setenv(constants.APIKeyEnvironmentVariable, "12345")
if shouldSetAPIKey {
t.Setenv(constants.APIKeyEnvironmentVariable, "12345")
}
dianashevchenko marked this conversation as resolved.
Show resolved Hide resolved
}

for _, tc := range testCases {
Expand Down
Loading