Skip to content

Commit 117114e

Browse files
author
Israel Blancas
authored
Merge branch 'main' into 3370
2 parents ac8a330 + bea432e commit 117114e

38 files changed

+1039
-68
lines changed

‎.chloggen/3384-build-musl-python-autoinstrumentation.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: build musl based auto-instrumentation in Python docker image
9+
10+
# One or more tracking issues related to the change
11+
issues: [2264]
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/httpd_safe_conf.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: 'An empty line should come before the addition of Include ...opentemetry_agent.conf, as a protection measure against cases of httpd.conf w/o a blank last line'
9+
10+
# One or more tracking issues related to the change
11+
issues: [3401]
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/kubeletstats.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: collector
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: "Add automatic RBAC creation for the `kubeletstats` receiver."
9+
10+
# One or more tracking issues related to the change
11+
issues: [3155]
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:

‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,12 @@ add-image-opampbridge:
204204
add-rbac-permissions-to-operator: manifests kustomize
205205
# Kustomize only allows patches in the folder where the kustomization is located
206206
# This folder is ignored by .gitignore
207-
cp -r tests/e2e-automatic-rbac/extra-permissions-operator/ config/rbac/extra-permissions-operator
207+
mkdir -p config/rbac/extra-permissions-operator
208+
cp -r tests/e2e-automatic-rbac/extra-permissions-operator/* config/rbac/extra-permissions-operator
208209
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/namespaces.yaml
209210
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/nodes.yaml
211+
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/nodes-stats.yaml
212+
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/nodes-proxy.yaml
210213
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/rbac.yaml
211214
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/replicaset.yaml
212215

‎autoinstrumentation/nodejs/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
},
1616
"dependencies": {
1717
"@opentelemetry/api": "1.9.0",
18-
"@opentelemetry/auto-instrumentations-node": "0.51.0",
19-
"@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0",
20-
"@opentelemetry/exporter-prometheus": "0.53.0",
21-
"@opentelemetry/exporter-trace-otlp-grpc": "0.53.0",
22-
"@opentelemetry/resource-detector-alibaba-cloud": "0.29.3",
23-
"@opentelemetry/resource-detector-aws": "1.6.2",
24-
"@opentelemetry/resource-detector-container": "0.4.4",
25-
"@opentelemetry/resource-detector-gcp": "0.29.12",
26-
"@opentelemetry/resources": "1.26.0",
27-
"@opentelemetry/sdk-metrics": "1.26.0",
28-
"@opentelemetry/sdk-node": "0.53.0"
18+
"@opentelemetry/auto-instrumentations-node": "0.52.0",
19+
"@opentelemetry/exporter-metrics-otlp-grpc": "0.54.0",
20+
"@opentelemetry/exporter-prometheus": "0.54.0",
21+
"@opentelemetry/exporter-trace-otlp-grpc": "0.54.0",
22+
"@opentelemetry/resource-detector-alibaba-cloud": "0.29.4",
23+
"@opentelemetry/resource-detector-aws": "1.7.0",
24+
"@opentelemetry/resource-detector-container": "0.5.0",
25+
"@opentelemetry/resource-detector-gcp": "0.29.13",
26+
"@opentelemetry/resources": "1.27.0",
27+
"@opentelemetry/sdk-metrics": "1.27.0",
28+
"@opentelemetry/sdk-node": "0.54.0"
2929
}
3030
}

‎autoinstrumentation/python/Dockerfile

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# To build one auto-instrumentation image for Python, please:
2-
# - Ensure the packages are installed in the `/autoinstrumentation` directory. This is required as when instrumenting the pod,
3-
# one init container will be created to copy all the content in `/autoinstrumentation` directory to your app's container. Then
2+
# - Ensure the packages are installed in the `/autoinstrumentation,{-musl}` directory. This is required as when instrumenting the pod,
3+
# one init container will be created to copy all the content in `/autoinstrumentation{,-musl}` directory to your app's container. Then
44
# update the `PYTHONPATH` environment variable accordingly. To achieve this, you can mimic the one in `autoinstrumentation/python/Dockerfile`
55
# by using multi-stage builds. In the first stage, install all the required packages in one custom directory with `pip install --target`.
6-
# Then in the second stage, copy the directory to `/autoinstrumentation`.
6+
# Then in the second stage, copy the directory to `/autoinstrumentation{,-musl}`.
77
# - Ensure you have `opentelemetry-distro` and `opentelemetry-instrumentation` or your customized alternatives installed.
88
# Those two packages are essential to Python auto-instrumentation.
9-
# - Grant the necessary access to `/autoinstrumentation` directory. `chmod -R go+r /autoinstrumentation`
9+
# - Grant the necessary access to `/autoinstrumentation{,-musl}` directory. `chmod -R go+r /autoinstrumentation`
1010
# - For auto-instrumentation by container injection, the Linux command cp is
1111
# used and must be availabe in the image.
1212
FROM python:3.11 AS build
@@ -17,8 +17,19 @@ ADD requirements.txt .
1717

1818
RUN mkdir workspace && pip install --target workspace -r requirements.txt
1919

20+
FROM python:3.11-alpine AS build-musl
21+
22+
WORKDIR /operator-build
23+
24+
ADD requirements.txt .
25+
26+
RUN apk add gcc python3-dev musl-dev linux-headers
27+
RUN mkdir workspace && pip install --target workspace -r requirements.txt
28+
2029
FROM busybox
2130

2231
COPY --from=build /operator-build/workspace /autoinstrumentation
32+
COPY --from=build-musl /operator-build/workspace /autoinstrumentation-musl
2333

2434
RUN chmod -R go+r /autoinstrumentation
35+
RUN chmod -R go+r /autoinstrumentation-musl

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2
2828
github.com/prometheus/client_golang v1.20.5
2929
github.com/prometheus/common v0.60.1
30-
github.com/prometheus/prometheus v0.54.1
30+
github.com/prometheus/prometheus v0.55.0
3131
github.com/shirou/gopsutil v3.21.11+incompatible
3232
github.com/spf13/pflag v1.0.5
3333
github.com/stretchr/testify v1.9.0
@@ -70,7 +70,7 @@ require (
7070
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
7171
github.com/armon/go-metrics v0.4.1 // indirect
7272
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
73-
github.com/aws/aws-sdk-go v1.54.19 // indirect
73+
github.com/aws/aws-sdk-go v1.55.5 // indirect
7474
github.com/beorn7/perks v1.0.1 // indirect
7575
github.com/bytedance/sonic v1.11.6 // indirect
7676
github.com/bytedance/sonic/loader v0.1.1 // indirect
@@ -83,7 +83,7 @@ require (
8383
github.com/dennwc/varint v1.0.0 // indirect
8484
github.com/digitalocean/godo v1.125.0 // indirect
8585
github.com/distribution/reference v0.6.0 // indirect
86-
github.com/docker/docker v27.1.1+incompatible // indirect
86+
github.com/docker/docker v27.2.0+incompatible // indirect
8787
github.com/docker/go-connections v0.4.0 // indirect
8888
github.com/docker/go-units v0.5.0 // indirect
8989
github.com/edsrzf/mmap-go v1.1.0 // indirect
@@ -130,11 +130,11 @@ require (
130130
github.com/google/s2a-go v0.1.8 // indirect
131131
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
132132
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
133-
github.com/gophercloud/gophercloud v1.13.0 // indirect
133+
github.com/gophercloud/gophercloud v1.14.0 // indirect
134134
github.com/gorilla/websocket v1.5.1 // indirect
135135
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
136136
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
137-
github.com/hashicorp/consul/api v1.29.2 // indirect
137+
github.com/hashicorp/consul/api v1.29.4 // indirect
138138
github.com/hashicorp/cronexpr v1.1.2 // indirect
139139
github.com/hashicorp/errwrap v1.1.0 // indirect
140140
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -147,10 +147,10 @@ require (
147147
github.com/hashicorp/golang-lru v0.6.0 // indirect
148148
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect
149149
github.com/hashicorp/serf v0.10.1 // indirect
150-
github.com/hetznercloud/hcloud-go/v2 v2.10.2 // indirect
150+
github.com/hetznercloud/hcloud-go/v2 v2.13.1 // indirect
151151
github.com/imdario/mergo v0.3.16 // indirect
152152
github.com/inconshreveable/mousetrap v1.1.0 // indirect
153-
github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect
153+
github.com/ionos-cloud/sdk-go/v6 v6.2.1 // indirect
154154
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
155155
github.com/josharian/intern v1.0.0 // indirect
156156
github.com/jpillora/backoff v1.0.0 // indirect
@@ -159,7 +159,7 @@ require (
159159
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
160160
github.com/kylelemons/godebug v1.1.0 // indirect
161161
github.com/leodido/go-urn v1.4.0 // indirect
162-
github.com/linode/linodego v1.37.0 // indirect
162+
github.com/linode/linodego v1.40.0 // indirect
163163
github.com/mailru/easyjson v0.7.7 // indirect
164164
github.com/mattn/go-colorable v0.1.13 // indirect
165165
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -186,7 +186,7 @@ require (
186186
github.com/prometheus/client_model v0.6.1 // indirect
187187
github.com/prometheus/common/sigv4 v0.1.0 // indirect
188188
github.com/prometheus/procfs v0.15.1 // indirect
189-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect
189+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 // indirect
190190
github.com/sirupsen/logrus v1.9.3 // indirect
191191
github.com/spf13/cobra v1.8.1 // indirect
192192
github.com/stretchr/objx v0.5.2 // indirect

0 commit comments

Comments
 (0)