Skip to content

Commit

Permalink
Merge branch 'main' into true_reset
Browse files Browse the repository at this point in the history
  • Loading branch information
@dashpole
dashpole authored Feb 11, 2025
2 parents 26b896d + 36969ef commit de62187
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion cmd/githubgen/allowlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jcreixell
jriguera
KiranmayiB
m1rp
rlankfo
shazlehu
swar8080
thmshmm
Expand Down
2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ require (
)

require (
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.119.0
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/integrationtest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ require (
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/datadog/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.62.2
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.25.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.119.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 1 addition & 1 deletion processor/schemaprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.0

require (
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
Expand Down

0 comments on commit de62187

Please sign in to comment.