Skip to content

Commit 6674510

Browse files
amarzialiamarziali
authored
Merge branch 'main' into andrea.marziali/svc-name-process-tag
2 parents 75d005a + 3e8a286 commit 6674510

17 files changed

Lines changed: 2011 additions & 44 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ static-analysis.datadog.yml
2828
coverage-*.txt
2929

3030
# Editors and Agents
31+
/.codex/
3132
/.cursor
3233
/.vscode
3334
/.claude/*

‎ddtrace/tracer/option.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ func newConfig(opts ...StartOption) (*config, error) {
474474
Service: c.internalConfig.ServiceName(),
475475
Version: c.internalConfig.Version(),
476476
AgentURL: c.internalConfig.AgentURL(),
477-
APIKey: env.Get("DD_API_KEY"),
477+
APIKey: c.internalConfig.APIKey(),
478478
APPKey: env.Get("DD_APP_KEY"),
479479
HTTPClient: c.httpClient,
480480
Site: env.Get("DD_SITE"),

‎ddtrace/tracer/telemetry.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"fmt"
1010
"strings"
1111

12-
"github.com/DataDog/dd-trace-go/v2/internal/env"
1312
"github.com/DataDog/dd-trace-go/v2/internal/log"
1413
"github.com/DataDog/dd-trace-go/v2/internal/telemetry"
1514
)
@@ -121,7 +120,7 @@ func startTelemetry(c *config) telemetry.Client {
121120
cfg.AgentURL = c.internalConfig.AgentURL().String()
122121
}
123122
if c.internalConfig.LogToStdout() || c.ciVisibilityAgentless {
124-
cfg.APIKey = env.Get("DD_API_KEY")
123+
cfg.APIKey = c.internalConfig.APIKey()
125124
}
126125
client, err := telemetry.NewClient(c.internalConfig.ServiceName(), c.internalConfig.Env(), c.internalConfig.Version(), cfg)
127126
if err != nil {

0 commit comments

Comments
 (0)