Skip to content

Commit 496cc89

Browse files
pankaj101Apankaj101A
committed
SUMO-263476:merge upstream
2 parents 6a57c4e + d7b13d9 commit 496cc89

File tree

648 files changed

+20439
-19763
lines changed

Some content is hidden

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

648 files changed

+20439
-19763
lines changed

‎.chloggen/jm-otel-prom-metadata-translation-pass-namespace-config.yaml

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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/translator/prometheusremotewrite
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Fix bug where metric metadata was sent with incorrect metric name if configuration includes 'namespace'"
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: [ 39826 ]
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, api]

‎.chloggen/mackjmr_tls-setting-serializer-exporter.yaml

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: bug_fix
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: config `tls::insecure_skip_verify` is now taken into account in metrics path.
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: [40507, 40085]
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/prometheus-ct-zero-ingestion.yaml

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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: prometheusrecevier
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add feature gate to allow enabling and disabling the Prometheus created timestamp zero ingestion feature flag.
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: [40245]
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/sqlserver-remove-extra-config.yaml

Lines changed: 29 additions & 0 deletions
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: sqlserverreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Rename flags for enabling top query collection and query sample collection.
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: [40416]
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+
Renamed `top_query_collection.enabled` to `events."db.server.top_query".enabled` in top query collection.
20+
Renamed `query_sample_collection.enabled` to `events."db.server.query_sample".enabled` in query sample collection.
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: [user]

‎cmd/golden/go.mod

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.127.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.127.0
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.33.1-0.20250603105141-605011a1fea8
10-
go.opentelemetry.io/collector/component/componenttest v0.127.1-0.20250603105141-605011a1fea8
11-
go.opentelemetry.io/collector/consumer v1.33.1-0.20250603105141-605011a1fea8
12-
go.opentelemetry.io/collector/pdata v1.33.1-0.20250603105141-605011a1fea8
13-
go.opentelemetry.io/collector/receiver v1.33.1-0.20250603105141-605011a1fea8
14-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.127.1-0.20250603105141-605011a1fea8
9+
go.opentelemetry.io/collector/component v1.33.1-0.20250605124916-efac6c7d44f1
10+
go.opentelemetry.io/collector/component/componenttest v0.127.1-0.20250605124916-efac6c7d44f1
11+
go.opentelemetry.io/collector/config/configoptional v0.0.0-20250605110633-e8ca607b7989
12+
go.opentelemetry.io/collector/confmap v1.33.1-0.20250605124916-efac6c7d44f1
13+
go.opentelemetry.io/collector/consumer v1.33.1-0.20250605124916-efac6c7d44f1
14+
go.opentelemetry.io/collector/pdata v1.33.1-0.20250605124916-efac6c7d44f1
15+
go.opentelemetry.io/collector/receiver v1.33.1-0.20250605124916-efac6c7d44f1
16+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.127.1-0.20250605124916-efac6c7d44f1
1517
go.opentelemetry.io/otel/metric v1.36.0
1618
go.opentelemetry.io/otel/trace v1.36.0
1719
go.uber.org/goleak v1.3.0
@@ -48,29 +50,28 @@ require (
4850
github.com/pmezard/go-difflib v1.0.0 // indirect
4951
github.com/rs/cors v1.11.1 // indirect
5052
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
51-
go.opentelemetry.io/collector v0.127.1-0.20250603105141-605011a1fea8 // indirect
52-
go.opentelemetry.io/collector/client v1.33.1-0.20250603105141-605011a1fea8 // indirect
53-
go.opentelemetry.io/collector/component/componentstatus v0.127.1-0.20250603105141-605011a1fea8 // indirect
54-
go.opentelemetry.io/collector/config/configauth v0.127.1-0.20250603105141-605011a1fea8 // indirect
55-
go.opentelemetry.io/collector/config/configcompression v1.33.1-0.20250603105141-605011a1fea8 // indirect
56-
go.opentelemetry.io/collector/config/configgrpc v0.127.1-0.20250603105141-605011a1fea8 // indirect
57-
go.opentelemetry.io/collector/config/confighttp v0.127.1-0.20250603105141-605011a1fea8 // indirect
58-
go.opentelemetry.io/collector/config/configmiddleware v0.127.1-0.20250603105141-605011a1fea8 // indirect
59-
go.opentelemetry.io/collector/config/confignet v1.33.1-0.20250603105141-605011a1fea8 // indirect
60-
go.opentelemetry.io/collector/config/configopaque v1.33.1-0.20250603105141-605011a1fea8 // indirect
61-
go.opentelemetry.io/collector/config/configtls v1.33.1-0.20250603105141-605011a1fea8 // indirect
62-
go.opentelemetry.io/collector/confmap v1.33.1-0.20250603105141-605011a1fea8 // indirect
63-
go.opentelemetry.io/collector/consumer/consumererror v0.127.1-0.20250603105141-605011a1fea8 // indirect
64-
go.opentelemetry.io/collector/consumer/xconsumer v0.127.1-0.20250603105141-605011a1fea8 // indirect
65-
go.opentelemetry.io/collector/extension/extensionauth v1.33.1-0.20250603105141-605011a1fea8 // indirect
66-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.127.1-0.20250603105141-605011a1fea8 // indirect
67-
go.opentelemetry.io/collector/featuregate v1.33.1-0.20250603105141-605011a1fea8 // indirect
68-
go.opentelemetry.io/collector/internal/sharedcomponent v0.127.1-0.20250603105141-605011a1fea8 // indirect
69-
go.opentelemetry.io/collector/internal/telemetry v0.127.1-0.20250603105141-605011a1fea8 // indirect
70-
go.opentelemetry.io/collector/pdata/pprofile v0.127.1-0.20250603105141-605011a1fea8 // indirect
71-
go.opentelemetry.io/collector/pipeline v0.127.1-0.20250603105141-605011a1fea8 // indirect
72-
go.opentelemetry.io/collector/receiver/receiverhelper v0.127.1-0.20250603105141-605011a1fea8 // indirect
73-
go.opentelemetry.io/collector/receiver/xreceiver v0.127.1-0.20250603105141-605011a1fea8 // indirect
53+
go.opentelemetry.io/collector v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
54+
go.opentelemetry.io/collector/client v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
55+
go.opentelemetry.io/collector/component/componentstatus v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
56+
go.opentelemetry.io/collector/config/configauth v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
57+
go.opentelemetry.io/collector/config/configcompression v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
58+
go.opentelemetry.io/collector/config/configgrpc v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
59+
go.opentelemetry.io/collector/config/confighttp v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
60+
go.opentelemetry.io/collector/config/configmiddleware v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
61+
go.opentelemetry.io/collector/config/confignet v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
62+
go.opentelemetry.io/collector/config/configopaque v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
63+
go.opentelemetry.io/collector/config/configtls v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
64+
go.opentelemetry.io/collector/consumer/consumererror v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
65+
go.opentelemetry.io/collector/consumer/xconsumer v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
66+
go.opentelemetry.io/collector/extension/extensionauth v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
67+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
68+
go.opentelemetry.io/collector/featuregate v1.33.1-0.20250605124916-efac6c7d44f1 // indirect
69+
go.opentelemetry.io/collector/internal/sharedcomponent v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
70+
go.opentelemetry.io/collector/internal/telemetry v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
71+
go.opentelemetry.io/collector/pdata/pprofile v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
72+
go.opentelemetry.io/collector/pipeline v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
73+
go.opentelemetry.io/collector/receiver/receiverhelper v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
74+
go.opentelemetry.io/collector/receiver/xreceiver v0.127.1-0.20250605124916-efac6c7d44f1 // indirect
7475
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
7576
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
7677
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect

0 commit comments

Comments
 (0)