Skip to content

Commit 6860193

Browse files
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents a2e5912 + 7fa2d55 commit 6860193

File tree

701 files changed

+19961
-19805
lines changed

Some content is hidden

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

701 files changed

+19961
-19805
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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: datadogexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Enable instrumentation_scope_metadata_as_tags by default in datadogexporter. Scope attributes are now added as tags to metrics.
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: [39767]
14+
15+
subtext: |
16+
If you have too many unique values for instrumentation scope attributes, this may cause cardinality issues.
17+
If this is a concern, you can disable this by setting `datadog.metrics.instrumentation_scope_metadata_as_tags` to `false`.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ receiver/collectdreceiver/ @open-telemetry
232232
receiver/couchdbreceiver/ @open-telemetry/collector-contrib-approvers @antonblock
233233
receiver/datadogreceiver/ @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @MovieStoreGuy
234234
receiver/dockerstatsreceiver/ @open-telemetry/collector-contrib-approvers @jamesmoessis
235-
receiver/elasticsearchreceiver/ @open-telemetry/collector-contrib-approvers @jsirianni
235+
receiver/elasticsearchreceiver/ @open-telemetry/collector-contrib-approvers @jsirianni @VihasMakwana @rogercoll
236236
receiver/envoyalsreceiver/ @open-telemetry/collector-contrib-approvers @evan-bradley @zirain
237237
receiver/expvarreceiver/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
238238
receiver/faroreceiver/ @open-telemetry/collector-contrib-approvers @dehaansa @rlankfo @mar4uk

cmd/golden/go.mod

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.31.0
10-
go.opentelemetry.io/collector/component/componenttest v0.125.0
11-
go.opentelemetry.io/collector/consumer v1.31.0
12-
go.opentelemetry.io/collector/pdata v1.31.0
13-
go.opentelemetry.io/collector/receiver v1.31.0
14-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.0
9+
go.opentelemetry.io/collector/component v1.31.1-0.20250430101735-2ecd0b7f95cd
10+
go.opentelemetry.io/collector/component/componenttest v0.125.1-0.20250430101735-2ecd0b7f95cd
11+
go.opentelemetry.io/collector/consumer v1.31.1-0.20250430101735-2ecd0b7f95cd
12+
go.opentelemetry.io/collector/pdata v1.31.1-0.20250430101735-2ecd0b7f95cd
13+
go.opentelemetry.io/collector/receiver v1.31.1-0.20250430101735-2ecd0b7f95cd
14+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.1-0.20250430101735-2ecd0b7f95cd
1515
go.opentelemetry.io/otel/metric v1.35.0
1616
go.opentelemetry.io/otel/trace v1.35.0
1717
go.uber.org/goleak v1.3.0
@@ -45,29 +45,29 @@ require (
4545
github.com/pmezard/go-difflib v1.0.0 // indirect
4646
github.com/rs/cors v1.11.1 // indirect
4747
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
48-
go.opentelemetry.io/collector v0.125.0 // indirect
49-
go.opentelemetry.io/collector/client v1.31.0 // indirect
50-
go.opentelemetry.io/collector/component/componentstatus v0.125.0 // indirect
51-
go.opentelemetry.io/collector/config/configauth v0.125.0 // indirect
52-
go.opentelemetry.io/collector/config/configcompression v1.31.0 // indirect
53-
go.opentelemetry.io/collector/config/configgrpc v0.125.0 // indirect
54-
go.opentelemetry.io/collector/config/confighttp v0.125.0 // indirect
55-
go.opentelemetry.io/collector/config/configmiddleware v0.125.0 // indirect
56-
go.opentelemetry.io/collector/config/confignet v1.31.0 // indirect
57-
go.opentelemetry.io/collector/config/configopaque v1.31.0 // indirect
58-
go.opentelemetry.io/collector/config/configtls v1.31.0 // indirect
59-
go.opentelemetry.io/collector/confmap v1.31.0 // indirect
60-
go.opentelemetry.io/collector/consumer/consumererror v0.125.0 // indirect
61-
go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 // indirect
62-
go.opentelemetry.io/collector/extension/extensionauth v1.31.0 // indirect
63-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.125.0 // indirect
64-
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
65-
go.opentelemetry.io/collector/internal/sharedcomponent v0.125.0 // indirect
66-
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
67-
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
68-
go.opentelemetry.io/collector/pipeline v0.125.0 // indirect
69-
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.0 // indirect
70-
go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
48+
go.opentelemetry.io/collector v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
49+
go.opentelemetry.io/collector/client v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
50+
go.opentelemetry.io/collector/component/componentstatus v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
51+
go.opentelemetry.io/collector/config/configauth v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
52+
go.opentelemetry.io/collector/config/configcompression v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
53+
go.opentelemetry.io/collector/config/configgrpc v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
54+
go.opentelemetry.io/collector/config/confighttp v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
55+
go.opentelemetry.io/collector/config/configmiddleware v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
56+
go.opentelemetry.io/collector/config/confignet v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
57+
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
58+
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
59+
go.opentelemetry.io/collector/confmap v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
60+
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
61+
go.opentelemetry.io/collector/consumer/xconsumer v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
62+
go.opentelemetry.io/collector/extension/extensionauth v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
63+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
64+
go.opentelemetry.io/collector/featuregate v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
65+
go.opentelemetry.io/collector/internal/sharedcomponent v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
66+
go.opentelemetry.io/collector/internal/telemetry v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
67+
go.opentelemetry.io/collector/pdata/pprofile v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
68+
go.opentelemetry.io/collector/pipeline v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
69+
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
70+
go.opentelemetry.io/collector/receiver/xreceiver v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
7171
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
7272
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7373
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect

0 commit comments

Comments
 (0)