Skip to content

Commit

Permalink
add replaces to go.mod and fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
timothyalexandersoftware committed Sep 24, 2024
1 parent ab545d8 commit 3bb5a50
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion pkg/config/remote/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ replace (
github.com/DataDog/datadog-agent/comp/core/telemetry => ../../../comp/core/telemetry
github.com/DataDog/datadog-agent/comp/def => ../../../comp/def
github.com/DataDog/datadog-agent/pkg/config/model => ../model
github.com/DataDog/datadog-agent/pkg/obfuscate => ../../obfuscate
github.com/DataDog/datadog-agent/pkg/proto => ../../proto
github.com/DataDog/datadog-agent/pkg/remoteconfig/state => ../../remoteconfig/state
github.com/DataDog/datadog-agent/pkg/telemetry => ../../telemetry
Expand Down Expand Up @@ -43,8 +44,9 @@ require (
github.com/DataDog/appsec-internal-go v1.7.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/cache v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-go/v5 v5.3.0 // indirect
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
github.com/DataDog/go-libddwaf/v3 v3.3.0 // indirect
github.com/DataDog/go-sqllexer v0.0.14 // indirect
github.com/DataDog/sketches-go v1.4.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions pkg/config/remote/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/config/remote/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ func (c *HTTPClient) getUpdate(
) (*state.Update, error) {
c.Lock()
defer c.Unlock()
span, ctx := tracer.StartSpanFromContext(ctx, "HTTPClient.getUpdate")
span, _ := tracer.StartSpanFromContext(ctx, "HTTPClient.getUpdate")
defer span.Finish()
span.SetTag("products", products)
span.SetTag("current_targets_version", currentTargetsVersion)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/remote/uptane/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (c *CDNClient) update(ctx context.Context) error {

func (c *CDNClient) updateRepos(ctx context.Context) error {
var err error
span, ctx := tracer.StartSpanFromContext(ctx, "CDNClient.updateRepos")
span, _ := tracer.StartSpanFromContext(ctx, "CDNClient.updateRepos")
defer span.Finish(tracer.WithError(err))

_, err = c.directorTUFClient.Update()
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/remote/uptane/remote_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func getCDNHostnameFromSite(site string) string {
// e.g. https://app.datadoghq.com -> datadoghq.com
func getCDNPathPrefixFromSite(site string) string {
s := strings.TrimPrefix(site, "https://app.")
s = strings.TrimPrefix(site, "https://")
s = strings.TrimPrefix(s, "https://")
return s
}

Expand Down

0 comments on commit 3bb5a50

Please sign in to comment.