Skip to content

Commit 95fcbab

Browse files
ElfoLiNkElfoLiNk
authored
Merge branch 'open-telemetry:main' into fix/update-nodejs-autoinstrumentation
2 parents c6ed877 + 56db123 commit 95fcbab

36 files changed

+182
-111
lines changed

‎.chloggen/add-python-instr-aiokafka-click.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: auto-instrumentation
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: add Python instrumentation of aiokafka, click
9+
10+
# One or more tracking issues related to the change
11+
issues: [3611]
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:

‎.chloggen/fix-allocator-metric.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: breaking
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: target allocator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: "change metric `opentelemetry_allocator_targets_remaining` type from counter to gauge"
9+
10+
# One or more tracking issues related to the change
11+
issues: [3578]
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:

‎.chloggen/operator32.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: 'enhancement'
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
5+
component: operator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Add support for Kubernetes `1.32`
9+
10+
# One or more tracking issues related to the change
11+
issues: [3544]
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:

‎.github/workflows/changelog.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Go
3434
uses: actions/setup-go@v5
3535
with:
36-
go-version: "~1.22.4"
36+
go-version: "~1.23.4"
3737

3838
- name: Ensure no changes to the CHANGELOG
3939
run: |

‎.github/workflows/continuous-integration.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-go@v5
2323
id: setup-go
2424
with:
25-
go-version: "~1.22.4"
25+
go-version: "~1.23.4"
2626

2727
- name: Cache tools
2828
uses: actions/cache@v4
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Go
4747
uses: actions/setup-go@v5
4848
with:
49-
go-version: "~1.22.4"
49+
go-version: "~1.23.4"
5050

5151
- name: Cache tools
5252
uses: actions/cache@v4
@@ -79,7 +79,7 @@ jobs:
7979
- name: Set up Go
8080
uses: actions/setup-go@v5
8181
with:
82-
go-version: "~1.22.4"
82+
go-version: "~1.23.4"
8383

8484
- name: Initialize CodeQL
8585
uses: github/codeql-action/init@v3

‎.github/workflows/e2e.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# should be compatible with them.
2222
kube-version:
2323
- "1.23"
24-
- "1.31"
24+
- "1.32"
2525
group:
2626
- e2e
2727
- e2e-automatic-rbac
@@ -61,7 +61,7 @@ jobs:
6161
uses: actions/setup-go@v5
6262
id: setup-go
6363
with:
64-
go-version: "~1.22.4"
64+
go-version: "~1.23.4"
6565
- name: Cache tools
6666
uses: actions/cache@v4
6767
with:

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Go
3737
uses: actions/setup-go@v5
3838
with:
39-
go-version: "~1.22.4"
39+
go-version: "~1.23.4"
4040

4141
- name: "generate release resources"
4242
run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator" VERSION=${DESIRED_VERSION}

‎.github/workflows/scorecard.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
matrix:
1919
kube-version:
2020
- "1.23"
21-
- "1.31"
21+
- "1.32"
2222

2323
steps:
2424

2525
- name: Set up Go
2626
uses: actions/setup-go@v5
2727
id: setup-go
2828
with:
29-
go-version: "~1.22.4"
29+
go-version: "~1.23.4"
3030

3131
- name: Check out code into the Go module directory
3232
uses: actions/checkout@v4

‎.golangci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
concurrency: 4
2+
concurrency: 3
33
timeout: 5m
44
issues-exit-code: 1
55
tests: true

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif
5959

6060
START_KIND_CLUSTER ?= true
6161

62-
KUBE_VERSION ?= 1.31
62+
KUBE_VERSION ?= 1.32
6363
KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
6464
KIND_CLUSTER_NAME ?= "otel-operator"
6565

@@ -492,11 +492,11 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
492492
CHAINSAW ?= $(LOCALBIN)/chainsaw
493493

494494
# renovate: datasource=go depName=sigs.k8s.io/kustomize/kustomize/v5
495-
KUSTOMIZE_VERSION ?= v5.5.0
495+
KUSTOMIZE_VERSION ?= v5.6.0
496496
# renovate: datasource=go depName=sigs.k8s.io/controller-tools/cmd/controller-gen
497-
CONTROLLER_TOOLS_VERSION ?= v0.16.5
497+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
498498
# renovate: datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
499-
GOLANGCI_LINT_VERSION ?= v1.62.2
499+
GOLANGCI_LINT_VERSION ?= v1.63.4
500500
# renovate: datasource=go depName=sigs.k8s.io/kind
501501
KIND_VERSION ?= v0.26.0
502502
# renovate: datasource=go depName=github.com/kyverno/chainsaw

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ metadata:
743743
# this is just an example, you can create any resource attributes you need
744744
resource.opentelemetry.io/service.name: "my-service"
745745
resource.opentelemetry.io/service.version: "1.0.0"
746-
resource.opentelemetry.io/environment: "production"
746+
resource.opentelemetry.io/deployment.environment.name: "production"
747747
spec:
748748
containers:
749749
- name: main-container
@@ -810,7 +810,7 @@ Choose the first value found:
810810

811811
- `pod.annotation[resource.opentelemetry.io/service.name]`
812812
- `if (config[useLabelsForResourceAttributes]) pod.label[app.kubernetes.io/name]`
813-
- `k8s.depleyment.name`
813+
- `k8s.deployment.name`
814814
- `k8s.replicaset.name`
815815
- `k8s.statefulset.name`
816816
- `k8s.daemonset.name`

‎autoinstrumentation/python/requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ opentelemetry-propagator-ot-trace==0.50b0
1515
opentelemetry-instrumentation-aio-pika==0.50b0
1616
opentelemetry-instrumentation-aiohttp-client==0.50b0
1717
opentelemetry-instrumentation-aiohttp-server==0.50b0
18+
opentelemetry-instrumentation-aiokafka==0.50.b0
1819
opentelemetry-instrumentation-aiopg==0.50b0
1920
opentelemetry-instrumentation-asgi==0.50b0
2021
opentelemetry-instrumentation-asyncio==0.50b0
@@ -25,6 +26,7 @@ opentelemetry-instrumentation-boto3sqs==0.50b0
2526
opentelemetry-instrumentation-botocore==0.50b0
2627
opentelemetry-instrumentation-cassandra==0.50b0
2728
opentelemetry-instrumentation-celery==0.50b0
29+
opentelemetry-instrumentation-click==0.50b0
2830
opentelemetry-instrumentation-confluent-kafka==0.50b0
2931
opentelemetry-instrumentation-dbapi==0.50b0
3032
opentelemetry-instrumentation-django==0.50b0

‎bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-12-19T16:56:26Z"
102+
createdAt: "2025-01-13T10:35:38Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎bundle/community/manifests/opentelemetry.io_instrumentations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

‎bundle/community/manifests/opentelemetry.io_opampbridges.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator

‎bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator

‎bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-12-19T16:56:38Z"
102+
createdAt: "2025-01-13T10:35:38Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎bundle/openshift/manifests/opentelemetry.io_instrumentations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator

‎bundle/openshift/manifests/opentelemetry.io_opampbridges.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator

‎bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator

‎cmd/otel-allocator/allocation/strategy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var (
4747
Name: "opentelemetry_allocator_time_to_allocate",
4848
Help: "The time it takes to allocate",
4949
}, []string{"method", "strategy"})
50-
targetsRemaining = promauto.NewCounter(prometheus.CounterOpts{
50+
TargetsRemaining = promauto.NewGauge(prometheus.GaugeOpts{
5151
Name: "opentelemetry_allocator_targets_remaining",
5252
Help: "Number of targets kept after filtering.",
5353
})
@@ -80,7 +80,7 @@ func WithFallbackStrategy(fallbackStrategy string) AllocationOption {
8080
}
8181

8282
func RecordTargetsKept(targets map[string]*target.Item) {
83-
targetsRemaining.Add(float64(len(targets)))
83+
TargetsRemaining.Set(float64(len(targets)))
8484
}
8585

8686
func New(name string, log logr.Logger, opts ...AllocationOption) (Allocator, error) {

‎config/crd/bases/opentelemetry.io_instrumentations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: instrumentations.opentelemetry.io
88
spec:
99
group: opentelemetry.io

‎config/crd/bases/opentelemetry.io_opampbridges.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: opampbridges.opentelemetry.io
88
spec:
99
group: opentelemetry.io

‎config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: opentelemetrycollectors.opentelemetry.io
88
spec:
99
group: opentelemetry.io

‎config/crd/bases/opentelemetry.io_targetallocators.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: targetallocators.opentelemetry.io
88
spec:
99
group: opentelemetry.io

‎controllers/opampbridge_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
28+
"k8s.io/client-go/kubernetes/scheme"
2829
"k8s.io/client-go/tools/record"
29-
"k8s.io/kubectl/pkg/scheme"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
k8sconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
3232
logf "sigs.k8s.io/controller-runtime/pkg/log"

‎go.mod

+6-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/open-telemetry/opamp-go v0.15.0
2222
github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e
2323
github.com/operator-framework/api v0.27.0
24-
github.com/operator-framework/operator-lib v0.15.0
24+
github.com/operator-framework/operator-lib v0.16.0
2525
github.com/prometheus-operator/prometheus-operator v0.76.2
2626
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
2727
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2
@@ -48,7 +48,6 @@ require (
4848
k8s.io/client-go v0.31.3
4949
k8s.io/component-base v0.31.3
5050
k8s.io/klog/v2 v2.130.1
51-
k8s.io/kubectl v0.31.3
5251
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
5352
sigs.k8s.io/controller-runtime v0.19.3
5453
sigs.k8s.io/gateway-api v1.1.0 // indirect
@@ -199,34 +198,33 @@ require (
199198
github.com/yusufpapurcu/wmi v1.2.3 // indirect
200199
go.mongodb.org/mongo-driver v1.14.0 // indirect
201200
go.opencensus.io v0.24.0 // indirect
201+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
202202
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
203203
go.opentelemetry.io/otel/trace v1.33.0 // indirect
204204
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
205205
go.uber.org/atomic v1.11.0 // indirect
206206
golang.org/x/arch v0.8.0 // indirect
207207
golang.org/x/crypto v0.31.0 // indirect
208208
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
209-
golang.org/x/mod v0.21.0 // indirect
210-
golang.org/x/net v0.32.0 // indirect
209+
golang.org/x/mod v0.22.0 // indirect
210+
golang.org/x/net v0.33.0 // indirect
211211
golang.org/x/oauth2 v0.24.0 // indirect
212212
golang.org/x/sync v0.10.0 // indirect
213213
golang.org/x/sys v0.28.0 // indirect
214214
golang.org/x/term v0.27.0 // indirect
215215
golang.org/x/text v0.21.0 // indirect
216216
golang.org/x/time v0.6.0 // indirect
217-
golang.org/x/tools v0.25.0 // indirect
217+
golang.org/x/tools v0.28.0 // indirect
218218
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
219219
google.golang.org/api v0.198.0 // indirect
220220
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
221221
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
222222
google.golang.org/grpc v1.68.1 // indirect
223-
google.golang.org/protobuf v1.35.2 // indirect
223+
google.golang.org/protobuf v1.36.1 // indirect
224224
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
225225
gopkg.in/inf.v0 v0.9.1 // indirect
226226
gopkg.in/ini.v1 v1.67.0 // indirect
227227
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
228228
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
229229
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
230230
)
231-
232-
require go.opentelemetry.io/auto/sdk v1.1.0 // indirect

0 commit comments

Comments
 (0)