Skip to content

Commit 80911d1

Browse files
alexcamsalexcams
authored
Merge branch 'main' into create-base64encode-function
2 parents 658f890 + fcefb9b commit 80911d1

682 files changed

Lines changed: 24845 additions & 22583 deletions

File tree

Some content is hidden

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

‎.chloggen/deprecate_wavefront.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: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7+
component: receiver/wavefront
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Deprecate the wavefront receiver
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: [46087]
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+
There is no replacement for the wavefront receiver.
20+
Wavefront is EOL: https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/release-announcements/0/25153
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/fix-xk8stest-ipv6-endpoint.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
5+
component: pkg/xk8stest
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Fix IPv6 gateway handling in HostEndpoint to avoid invalid address formatting in e2e tests
9+
10+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
11+
issues: [46082]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext: |
17+
Prefer IPv4 gateways when resolving the Docker kind network gateway.
18+
Fall back to bracketed IPv6 if no IPv4 gateway is found, so that
19+
appending :port produces a valid address (e.g. [::1]:4317).
20+
21+
# Optional: The change log or logs in which this entry should be included.
22+
# e.g. '[user]' or '[user, api]'
23+
# Include 'user' if the change is relevant to end users.
24+
# Include 'api' if there is a change to a library API.
25+
# Default: '[user]'
26+
change_logs: []

‎.chloggen/fix_42391.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: "enhancement"
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7+
component: "pkg/stanza"
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Ensure filter operator does not split batches of entries"
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: [42391]
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/k8sclusterreceiver-service-metrics.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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. receiver/filelog)
7+
component: receiver/k8s_cluster
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add opt-in service metrics derived from k8s Service and EndpointSlice API
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: [45620]
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+
New metrics (disabled by default):
20+
- `k8s.service.endpoint.count`: Number of endpoints by condition (ready, serving, terminating), address type, and zone
21+
- `k8s.service.load_balancer.ingress.count`: Number of load balancer ingress points assigned to the service
22+
New resource attributes:
23+
- `k8s.service.name`: The k8s service name
24+
- `k8s.service.uid`: The k8s service uid
25+
- `k8s.service.type`: The k8s service type
26+
- `k8s.service.traffic_distribution`: The service's traffic routing preference
27+
- `k8s.service.publish_not_ready_addresses`: Whether the service publishes endpoints before pods are ready
28+
29+
# If your change doesn't affect end users or the exported elements of any package,
30+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
31+
# Optional: The change log or logs in which this entry should be included.
32+
# e.g. '[user]' or '[user, api]'
33+
# Include 'user' if the change is relevant to end users.
34+
# Include 'api' if there is a change to a library API.
35+
# Default: '[user]'
36+
change_logs: [user]

‎.github/workflows/configs/e2e-kind-config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
3+
networking:
4+
ipFamily: ipv4
35
kubeadmConfigPatches:
46
- |
57
kind: KubeletConfiguration

‎cmd/golden/go.mod‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.145.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.145.0
88
github.com/stretchr/testify v1.11.1
9-
go.opentelemetry.io/collector/component v1.51.1-0.20260212054546-f0da990367b6
10-
go.opentelemetry.io/collector/component/componenttest v0.145.1-0.20260212054546-f0da990367b6
11-
go.opentelemetry.io/collector/config/configoptional v1.51.1-0.20260212054546-f0da990367b6
12-
go.opentelemetry.io/collector/confmap v1.51.1-0.20260212054546-f0da990367b6
13-
go.opentelemetry.io/collector/consumer v1.51.1-0.20260212054546-f0da990367b6
14-
go.opentelemetry.io/collector/pdata v1.51.1-0.20260212054546-f0da990367b6
15-
go.opentelemetry.io/collector/receiver v1.51.1-0.20260212054546-f0da990367b6
16-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.145.1-0.20260212054546-f0da990367b6
9+
go.opentelemetry.io/collector/component v1.51.1-0.20260212100729-5a059d1d6718
10+
go.opentelemetry.io/collector/component/componenttest v0.145.1-0.20260212100729-5a059d1d6718
11+
go.opentelemetry.io/collector/config/configoptional v1.51.1-0.20260212100729-5a059d1d6718
12+
go.opentelemetry.io/collector/confmap v1.51.1-0.20260212100729-5a059d1d6718
13+
go.opentelemetry.io/collector/consumer v1.51.1-0.20260212100729-5a059d1d6718
14+
go.opentelemetry.io/collector/pdata v1.51.1-0.20260212100729-5a059d1d6718
15+
go.opentelemetry.io/collector/receiver v1.51.1-0.20260212100729-5a059d1d6718
16+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.145.1-0.20260212100729-5a059d1d6718
1717
go.opentelemetry.io/otel/metric v1.40.0
1818
go.opentelemetry.io/otel/trace v1.40.0
1919
go.uber.org/goleak v1.3.0
@@ -49,31 +49,31 @@ require (
4949
github.com/pmezard/go-difflib v1.0.0 // indirect
5050
github.com/rs/cors v1.11.1 // indirect
5151
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
52-
go.opentelemetry.io/collector v0.145.1-0.20260212054546-f0da990367b6 // indirect
53-
go.opentelemetry.io/collector/client v1.51.1-0.20260212054546-f0da990367b6 // indirect
54-
go.opentelemetry.io/collector/component/componentstatus v0.145.1-0.20260212054546-f0da990367b6 // indirect
55-
go.opentelemetry.io/collector/config/configauth v1.51.1-0.20260212054546-f0da990367b6 // indirect
56-
go.opentelemetry.io/collector/config/configcompression v1.51.1-0.20260212054546-f0da990367b6 // indirect
57-
go.opentelemetry.io/collector/config/configgrpc v0.145.1-0.20260212054546-f0da990367b6 // indirect
58-
go.opentelemetry.io/collector/config/confighttp v0.145.1-0.20260212054546-f0da990367b6 // indirect
59-
go.opentelemetry.io/collector/config/configmiddleware v1.51.1-0.20260212054546-f0da990367b6 // indirect
60-
go.opentelemetry.io/collector/config/confignet v1.51.1-0.20260212054546-f0da990367b6 // indirect
61-
go.opentelemetry.io/collector/config/configopaque v1.51.1-0.20260212054546-f0da990367b6 // indirect
62-
go.opentelemetry.io/collector/config/configtls v1.51.1-0.20260212054546-f0da990367b6 // indirect
63-
go.opentelemetry.io/collector/confmap/xconfmap v0.145.1-0.20260212054546-f0da990367b6 // indirect
64-
go.opentelemetry.io/collector/consumer/consumererror v0.145.1-0.20260212054546-f0da990367b6 // indirect
65-
go.opentelemetry.io/collector/consumer/xconsumer v0.145.1-0.20260212054546-f0da990367b6 // indirect
66-
go.opentelemetry.io/collector/extension/extensionauth v1.51.1-0.20260212054546-f0da990367b6 // indirect
67-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.145.1-0.20260212054546-f0da990367b6 // indirect
68-
go.opentelemetry.io/collector/featuregate v1.51.1-0.20260212054546-f0da990367b6 // indirect
69-
go.opentelemetry.io/collector/internal/componentalias v0.145.1-0.20260212054546-f0da990367b6 // indirect
70-
go.opentelemetry.io/collector/internal/sharedcomponent v0.145.1-0.20260212054546-f0da990367b6 // indirect
71-
go.opentelemetry.io/collector/internal/telemetry v0.145.1-0.20260212054546-f0da990367b6 // indirect
72-
go.opentelemetry.io/collector/pdata/pprofile v0.145.1-0.20260212054546-f0da990367b6 // indirect
73-
go.opentelemetry.io/collector/pipeline v1.51.1-0.20260212054546-f0da990367b6 // indirect
74-
go.opentelemetry.io/collector/pipeline/xpipeline v0.145.1-0.20260212054546-f0da990367b6 // indirect
75-
go.opentelemetry.io/collector/receiver/receiverhelper v0.145.1-0.20260212054546-f0da990367b6 // indirect
76-
go.opentelemetry.io/collector/receiver/xreceiver v0.145.1-0.20260212054546-f0da990367b6 // indirect
52+
go.opentelemetry.io/collector v0.145.1-0.20260212100729-5a059d1d6718 // indirect
53+
go.opentelemetry.io/collector/client v1.51.1-0.20260212100729-5a059d1d6718 // indirect
54+
go.opentelemetry.io/collector/component/componentstatus v0.145.1-0.20260212100729-5a059d1d6718 // indirect
55+
go.opentelemetry.io/collector/config/configauth v1.51.1-0.20260212100729-5a059d1d6718 // indirect
56+
go.opentelemetry.io/collector/config/configcompression v1.51.1-0.20260212100729-5a059d1d6718 // indirect
57+
go.opentelemetry.io/collector/config/configgrpc v0.145.1-0.20260212100729-5a059d1d6718 // indirect
58+
go.opentelemetry.io/collector/config/confighttp v0.145.1-0.20260212100729-5a059d1d6718 // indirect
59+
go.opentelemetry.io/collector/config/configmiddleware v1.51.1-0.20260212100729-5a059d1d6718 // indirect
60+
go.opentelemetry.io/collector/config/confignet v1.51.1-0.20260212100729-5a059d1d6718 // indirect
61+
go.opentelemetry.io/collector/config/configopaque v1.51.1-0.20260212100729-5a059d1d6718 // indirect
62+
go.opentelemetry.io/collector/config/configtls v1.51.1-0.20260212100729-5a059d1d6718 // indirect
63+
go.opentelemetry.io/collector/confmap/xconfmap v0.145.1-0.20260212100729-5a059d1d6718 // indirect
64+
go.opentelemetry.io/collector/consumer/consumererror v0.145.1-0.20260212100729-5a059d1d6718 // indirect
65+
go.opentelemetry.io/collector/consumer/xconsumer v0.145.1-0.20260212100729-5a059d1d6718 // indirect
66+
go.opentelemetry.io/collector/extension/extensionauth v1.51.1-0.20260212100729-5a059d1d6718 // indirect
67+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.145.1-0.20260212100729-5a059d1d6718 // indirect
68+
go.opentelemetry.io/collector/featuregate v1.51.1-0.20260212100729-5a059d1d6718 // indirect
69+
go.opentelemetry.io/collector/internal/componentalias v0.145.1-0.20260212100729-5a059d1d6718 // indirect
70+
go.opentelemetry.io/collector/internal/sharedcomponent v0.145.1-0.20260212100729-5a059d1d6718 // indirect
71+
go.opentelemetry.io/collector/internal/telemetry v0.145.1-0.20260212100729-5a059d1d6718 // indirect
72+
go.opentelemetry.io/collector/pdata/pprofile v0.145.1-0.20260212100729-5a059d1d6718 // indirect
73+
go.opentelemetry.io/collector/pipeline v1.51.1-0.20260212100729-5a059d1d6718 // indirect
74+
go.opentelemetry.io/collector/pipeline/xpipeline v0.145.1-0.20260212100729-5a059d1d6718 // indirect
75+
go.opentelemetry.io/collector/receiver/receiverhelper v0.145.1-0.20260212100729-5a059d1d6718 // indirect
76+
go.opentelemetry.io/collector/receiver/xreceiver v0.145.1-0.20260212100729-5a059d1d6718 // indirect
7777
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
7878
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
7979
go.opentelemetry.io/otel v1.40.0 // indirect

0 commit comments

Comments
 (0)