Skip to content

Commit f8ad66e

Browse files
abhishek-at-cloudwerxabhishek-at-cloudwerx
authored
Merge branch 'main' into googlecloudmonitoringreceiver-phase1
2 parents 2dd2a8b + f95a9d6 commit f8ad66e

File tree

87 files changed

+1868
-157
lines changed

Some content is hidden

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

87 files changed

+1868
-157
lines changed

‎.chloggen/codeboten_update-scope-dockerstatsreceiver.yaml

+27
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: dockerstatsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Update the scope name for telemetry produced by the dockerstatsreceiver from `otelcol/dockerstatsreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver`"
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: [34528]
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: []

‎.chloggen/dd-conn-fg.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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: datadogconnector
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Move feature gate `connector.datadogconnector.NativeIngest` to beta"
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: [34549]
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: When this feature gate is enabled (default), the datadog connector uses the new API to produce APM stats under the hood.
19+
| The new API has better throughput when your spans have many attributes (especially container related attributes). Funtional-wise the new API should have no user-facing change compared to the old API.
20+
| However if you observe any unexpected behaviors, you can disable this feature gate to revert to the old stats processing APIs.
21+
22+
# If your change doesn't affect end users or the exported elements of any package,
23+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
24+
# Optional: The change log or logs in which this entry should be included.
25+
# e.g. '[user]' or '[user, api]'
26+
# Include 'user' if the change is relevant to end users.
27+
# Include 'api' if there is a change to a library API.
28+
# Default: '[user]'
29+
change_logs: []

‎.chloggen/logdedup-shutdown.yaml

+27
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: logdedupprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Simplifies the processor shutdown behaviour by removing the unnecessary done channel.
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: [34478]
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: [user]

‎.chloggen/ottl_grok.yaml

+27
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: pkg/ottl
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce ExtractGrokPatterns converter
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: [32593]
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: [user]

‎.chloggen/receiver-kafkametrics-topic-configs.yaml

+27
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: kafkametricsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Add option to configure cluster alias name and add new metrics for kafka topic configurations"
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: [34148]
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: [user]

‎.github/auto_assign.yml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ assigneeGroups:
1212
approvers_maintainers:
1313
# Approvers
1414
- atoulme
15-
- bryan-aguilar
1615
- crobert-1
1716
- dashpole
1817
- mwear

‎CONTRIBUTING.md

-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ The following GitHub users are the currently available sponsors, either by being
268268
* [@fatsheep9146](https://github.com/fatsheep9146)
269269
* [@andrzej-stencel](https://github.com/andrzej-stencel)
270270
* [@songy23](https://github.com/songy23)
271-
* [@Bryan Aguilar](https://github.com/bryan-aguilar)
272271
* [@atoulme](https://github.com/atoulme)
273272
* [@crobert-1](https://github.com/crobert-1)
274273

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ Emeritus Triagers:
8686
Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs/open-telemetry/teams/collector-contrib-approvers)):
8787

8888
- [Antoine Toulme](https://github.com/atoulme), Splunk
89-
- [Bryan Aguilar](https://github.com/bryan-aguilar), AWS
9089
- [Curtis Robert](https://github.com/crobert-1), Splunk
9190
- [David Ashpole](https://github.com/dashpole), Google
9291
- [Matt Wear](https://github.com/mwear), Lightstep
@@ -95,9 +94,10 @@ Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs
9594

9695
Emeritus Approvers:
9796

97+
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
98+
- [Bryan Aguilar](https://github.com/bryan-aguilar), AWS
9899
- [Przemek Maciolek](https://github.com/pmm-sumo)
99100
- [Ruslan Kovalov](https://github.com/kovrus)
100-
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
101101

102102
Maintainers ([@open-telemetry/collector-contrib-maintainer](https://github.com/orgs/open-telemetry/teams/collector-contrib-maintainer)):
103103

‎cmd/otelcontribcol/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ require (
456456
github.com/elastic/go-docappender/v2 v2.2.1 // indirect
457457
github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
458458
github.com/elastic/go-elasticsearch/v8 v8.14.0 // indirect
459+
github.com/elastic/go-grok v0.3.1 // indirect
459460
github.com/elastic/go-structform v0.0.11 // indirect
460461
github.com/elastic/go-sysinfo v1.7.1 // indirect
461462
github.com/elastic/go-windows v1.0.1 // indirect
@@ -587,6 +588,7 @@ require (
587588
github.com/linode/linodego v1.35.0 // indirect
588589
github.com/logicmonitor/lm-data-sdk-go v1.3.2 // indirect
589590
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
591+
github.com/magefile/mage v1.15.0 // indirect
590592
github.com/magiconair/properties v1.8.7 // indirect
591593
github.com/mailru/easyjson v0.7.7 // indirect
592594
github.com/mattn/go-colorable v0.1.13 // indirect

‎cmd/otelcontribcol/go.sum

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/oteltestbedcol/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ require (
8989
github.com/docker/docker v26.1.4+incompatible // indirect
9090
github.com/docker/go-connections v0.5.0 // indirect
9191
github.com/docker/go-units v0.5.0 // indirect
92+
github.com/elastic/go-grok v0.3.1 // indirect
9293
github.com/elastic/go-structform v0.0.11 // indirect
9394
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9495
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
@@ -164,6 +165,7 @@ require (
164165
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
165166
github.com/linode/linodego v1.35.0 // indirect
166167
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
168+
github.com/magefile/mage v1.15.0 // indirect
167169
github.com/mailru/easyjson v0.7.7 // indirect
168170
github.com/mattn/go-colorable v0.1.13 // indirect
169171
github.com/mattn/go-isatty v0.0.20 // indirect

‎cmd/oteltestbedcol/go.sum

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/countconnector/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
github.com/beorn7/perks v1.0.1 // indirect
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
27+
github.com/elastic/go-grok v0.3.1 // indirect
2728
github.com/go-logr/logr v1.4.2 // indirect
2829
github.com/go-logr/stdr v1.2.2 // indirect
2930
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
@@ -37,6 +38,7 @@ require (
3738
github.com/knadh/koanf/maps v0.1.1 // indirect
3839
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3940
github.com/knadh/koanf/v2 v2.1.1 // indirect
41+
github.com/magefile/mage v1.15.0 // indirect
4042
github.com/mitchellh/copystructure v1.2.0 // indirect
4143
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4244
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

‎connector/countconnector/go.sum

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/datadogconnector/connector_native_test.go

-19
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"go.opentelemetry.io/collector/component/componenttest"
1818
"go.opentelemetry.io/collector/connector/connectortest"
1919
"go.opentelemetry.io/collector/consumer/consumertest"
20-
"go.opentelemetry.io/collector/featuregate"
2120
"go.opentelemetry.io/collector/pdata/ptrace"
2221
semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
2322
"go.uber.org/zap"
@@ -29,12 +28,6 @@ var _ component.Component = (*traceToMetricConnectorNative)(nil) // testing that
2928

3029
// create test to create a connector, check that basic code compiles
3130
func TestNewConnectorNative(t *testing.T) {
32-
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
33-
assert.NoError(t, err)
34-
defer func() {
35-
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
36-
}()
37-
3831
factory := NewFactory()
3932

4033
creationParams := connectortest.NewNopSettings()
@@ -48,12 +41,6 @@ func TestNewConnectorNative(t *testing.T) {
4841
}
4942

5043
func TestTraceToTraceConnectorNative(t *testing.T) {
51-
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
52-
assert.NoError(t, err)
53-
defer func() {
54-
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
55-
}()
56-
5744
factory := NewFactory()
5845

5946
creationParams := connectortest.NewNopSettings()
@@ -73,12 +60,6 @@ func creteConnectorNative(t *testing.T) (*traceToMetricConnectorNative, *consume
7360
}
7461

7562
func creteConnectorNativeWithCfg(t *testing.T, cfg *Config) (*traceToMetricConnectorNative, *consumertest.MetricsSink) {
76-
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
77-
assert.NoError(t, err)
78-
defer func() {
79-
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
80-
}()
81-
8263
factory := NewFactory()
8364

8465
creationParams := connectortest.NewNopSettings()

‎connector/datadogconnector/connector_test.go

+19
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"go.opentelemetry.io/collector/component/componenttest"
1919
"go.opentelemetry.io/collector/connector/connectortest"
2020
"go.opentelemetry.io/collector/consumer/consumertest"
21+
"go.opentelemetry.io/collector/featuregate"
2122
"go.opentelemetry.io/collector/pdata/pcommon"
2223
"go.opentelemetry.io/collector/pdata/ptrace"
2324
semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
@@ -29,6 +30,12 @@ var _ component.Component = (*traceToMetricConnector)(nil) // testing that the c
2930

3031
// create test to create a connector, check that basic code compiles
3132
func TestNewConnector(t *testing.T) {
33+
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
34+
assert.NoError(t, err)
35+
defer func() {
36+
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
37+
}()
38+
3239
factory := NewFactory()
3340

3441
creationParams := connectortest.NewNopSettings()
@@ -42,6 +49,12 @@ func TestNewConnector(t *testing.T) {
4249
}
4350

4451
func TestTraceToTraceConnector(t *testing.T) {
52+
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
53+
assert.NoError(t, err)
54+
defer func() {
55+
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
56+
}()
57+
4558
factory := NewFactory()
4659

4760
creationParams := connectortest.NewNopSettings()
@@ -101,6 +114,12 @@ func fillSpanOne(span ptrace.Span) {
101114
}
102115

103116
func creteConnector(t *testing.T) (*traceToMetricConnector, *consumertest.MetricsSink) {
117+
err := featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), false)
118+
assert.NoError(t, err)
119+
defer func() {
120+
_ = featuregate.GlobalRegistry().Set(NativeIngestFeatureGate.ID(), true)
121+
}()
122+
104123
factory := NewFactory()
105124

106125
creationParams := connectortest.NewNopSettings()

0 commit comments

Comments
 (0)