Skip to content

Commit 8521ae3

Browse files
authored
Merge branch 'main' into python-multi-libc-distribution-2
2 parents fff7345 + 99bf725 commit 8521ae3

File tree

26 files changed

+236
-136
lines changed

26 files changed

+236
-136
lines changed

.chloggen/1814-java-configmap.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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: Support configuring Java auto-instrumentation when runtime configuration is provided from configmap or secret.
9+
10+
# One or more tracking issues related to the change
11+
issues: [1814]
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+
This change allows users to configure JAVA_TOOL_OPTIONS in config map or secret.
18+
The operator in this case set another JAVA_TOOL_OPTIONS that references the original value
19+
e.g. `JAVA_TOOL_OPTIONS=$(JAVA_TOOL_OPTIONS) -javaagent:/otel-auto-instrumentation-java/javaagent.jar`.

.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/ta-no-root.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: bug_fix
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 docker image to run as non-root
9+
10+
# One or more tracking issues related to the change
11+
issues: [3378]
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/CODEOWNERS

-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@
1717

1818
# AutoInstrumentation owners
1919
# TBD
20-
21-
# Target Allocator owners
22-
cmd/otel-allocator @open-telemetry/operator-ta-maintainers

README.md

-9
Original file line numberDiff line numberDiff line change
@@ -860,15 +860,6 @@ Emeritus Approvers:
860860
- [Owais Lone](https://github.com/owais), Splunk
861861
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
862862

863-
Target Allocator Maintainers ([@open-telemetry/operator-ta-maintainers](https://github.com/orgs/open-telemetry/teams/operator-ta-maintainers)):
864-
865-
- [Sebastian Poxhofer](https://github.com/secustor)
866-
867-
Emeritus Target Allocator Maintainers
868-
869-
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
870-
- [Kristina Pathak](https://github.com/kristinapathak), Lightstep
871-
872863
Maintainers ([@open-telemetry/operator-maintainers](https://github.com/orgs/open-telemetry/teams/operator-maintainers)):
873864

874865
- [Jacob Aronoff](https://github.com/jaronoff97), Lightstep

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
}

cmd/otel-allocator/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get CA certificates from the Alpine package repo
2-
FROM alpine:3.20 as certificates
2+
FROM alpine:3.20 AS certificates
33

44
RUN apk --no-cache add ca-certificates
55

@@ -8,12 +8,14 @@ FROM scratch
88

99
ARG TARGETARCH
1010

11-
WORKDIR /root/
11+
WORKDIR /
1212

1313
# Copy the certs
1414
COPY --from=certificates /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
1515

1616
# Copy binary built on the host
1717
COPY bin/targetallocator_${TARGETARCH} ./main
1818

19+
USER 65532:65532
20+
1921
ENTRYPOINT ["./main"]

config/manager/kustomization.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
resources:
22
- manager.yaml
3-

go.mod

+18-18
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ require (
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
2828
github.com/prometheus/client_golang v1.20.5
29-
github.com/prometheus/common v0.60.0
30-
github.com/prometheus/prometheus v0.54.1
29+
github.com/prometheus/common v0.60.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
34-
go.opentelemetry.io/collector/featuregate v1.17.0
34+
go.opentelemetry.io/collector/featuregate v1.18.0
3535
go.opentelemetry.io/otel v1.31.0
3636
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0
3737
go.opentelemetry.io/otel/exporters/prometheus v0.53.0
@@ -42,15 +42,15 @@ require (
4242
go.uber.org/zap v1.27.0
4343
gopkg.in/yaml.v2 v2.4.0
4444
gopkg.in/yaml.v3 v3.0.1
45-
k8s.io/api v0.31.1
46-
k8s.io/apiextensions-apiserver v0.31.1
47-
k8s.io/apimachinery v0.31.1
48-
k8s.io/client-go v0.31.1
49-
k8s.io/component-base v0.31.1
45+
k8s.io/api v0.31.2
46+
k8s.io/apiextensions-apiserver v0.31.2
47+
k8s.io/apimachinery v0.31.2
48+
k8s.io/client-go v0.31.2
49+
k8s.io/component-base v0.31.2
5050
k8s.io/klog/v2 v2.130.1
51-
k8s.io/kubectl v0.31.1
51+
k8s.io/kubectl v0.31.2
5252
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
53-
sigs.k8s.io/controller-runtime v0.19.0
53+
sigs.k8s.io/controller-runtime v0.19.1
5454
sigs.k8s.io/gateway-api v1.1.0 // indirect
5555
sigs.k8s.io/yaml v1.4.0
5656
)
@@ -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)