Skip to content

Commit 1e6a04b

Browse files
mackjmrsongy23
authored andcommitted
[exporter/datadog] Expose source provider (open-telemetry#37668)
#### Description The goal of this PR is to expose the `GetSourceProvider` method from hostmetadata, which is currently under an internal folder in datadogexporter. In order to do so, we create new package `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog/hostmetadata` which calls on internal hostmetadata's `GetSourceProvider`. We also create new module `github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog`, where we store the internal `hostmetadata`, `clientutil` and `scrub` packages. We move `hostmetadata` there as it needs to be imported in both datadogexporter, and `pkg/datadog/hostmetadata`, and we move `clientutil` and `scrub` there as they are imported by `hostmetadata`. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.--> --------- Co-authored-by: Yang Song <[email protected]>
1 parent 3f51059 commit 1e6a04b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2098
-231
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: internal/datadog
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: create new package `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog/hostmetadata` which exposes `GetSourceProvider` from `github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/hostmetadata`
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37668]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [api]

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ extension/sumologicextension/ @open-telemetry
128128
internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
129129
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
130130
internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
131+
internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA
131132
internal/docker/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
132133
internal/exp/metrics/ @open-telemetry/collector-contrib-approvers @sh0rez @RichieSams
133134
internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ body:
131131
- internal/aws
132132
- internal/collectd
133133
- internal/core
134+
- internal/datadog
134135
- internal/docker
135136
- internal/exp/metrics
136137
- internal/filter

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ body:
125125
- internal/aws
126126
- internal/collectd
127127
- internal/core
128+
- internal/datadog
128129
- internal/docker
129130
- internal/exp/metrics
130131
- internal/filter

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ body:
125125
- internal/aws
126126
- internal/collectd
127127
- internal/core
128+
- internal/datadog
128129
- internal/docker
129130
- internal/exp/metrics
130131
- internal/filter

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ body:
130130
- internal/aws
131131
- internal/collectd
132132
- internal/core
133+
- internal/datadog
133134
- internal/docker
134135
- internal/exp/metrics
135136
- internal/filter

connector/datadogconnector/go.mod

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,19 @@ require (
116116
github.com/alecthomas/participle/v2 v2.1.1 // indirect
117117
github.com/antchfx/xmlquery v1.4.3 // indirect
118118
github.com/antchfx/xpath v1.3.3 // indirect
119-
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
120-
github.com/aws/aws-sdk-go-v2/config v1.29.5 // indirect
121-
github.com/aws/aws-sdk-go-v2/credentials v1.17.58 // indirect
122-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
123-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
124-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
119+
github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
120+
github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
121+
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
122+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
123+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
124+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
125125
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
126-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.3 // indirect
126+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.4 // indirect
127127
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
128-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
129-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
130-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
131-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.13 // indirect
128+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
129+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
130+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
131+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
132132
github.com/aws/smithy-go v1.22.2 // indirect
133133
github.com/benbjohnson/clock v1.3.5 // indirect
134134
github.com/beorn7/perks v1.0.1 // indirect
@@ -153,9 +153,9 @@ require (
153153
github.com/go-logr/logr v1.4.2 // indirect
154154
github.com/go-logr/stdr v1.2.2 // indirect
155155
github.com/go-ole/go-ole v1.3.0 // indirect
156-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
156+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
157157
github.com/go-openapi/jsonreference v0.20.4 // indirect
158-
github.com/go-openapi/swag v0.22.9 // indirect
158+
github.com/go-openapi/swag v0.23.0 // indirect
159159
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
160160
github.com/gobwas/glob v0.2.3 // indirect
161161
github.com/goccy/go-json v0.10.5 // indirect
@@ -205,6 +205,7 @@ require (
205205
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0 // indirect
206206
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0 // indirect
207207
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0 // indirect
208+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.0.0-00010101000000-000000000000 // indirect
208209
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0 // indirect
209210
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 // indirect
210211
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0 // indirect
@@ -329,10 +330,10 @@ require (
329330
k8s.io/apimachinery v0.31.3 // indirect
330331
k8s.io/client-go v0.31.3 // indirect
331332
k8s.io/klog/v2 v2.130.1 // indirect
332-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
333-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
333+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
334+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
334335
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
335-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
336+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
336337
sigs.k8s.io/yaml v1.4.0 // indirect
337338
)
338339

@@ -403,3 +404,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experiment
403404
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog
404405

405406
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils
407+
408+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog

connector/datadogconnector/go.sum

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)