Skip to content

Commit 4502783

Browse files
jinja2jinja2
committed
use latest image
1 parent 5fdc939 commit 4502783

File tree

3 files changed

+40
-105
lines changed

3 files changed

+40
-105
lines changed

‎functional_tests/functional/testdata/expected_kind_values/expected_python_traces.yaml‎

Lines changed: 35 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,10 @@ resourceSpans:
99
stringValue: opentelemetry
1010
- key: telemetry.sdk.version
1111
value:
12-
stringValue: 1.35.0
13-
- key: process.runtime.description
14-
value:
15-
stringValue: 3.13.1 (main, Jan 24 2025, 21:33:38) [GCC 14.2.0]
16-
- key: process.runtime.name
17-
value:
18-
stringValue: cpython
19-
- key: process.runtime.version
20-
value:
21-
stringValue: 3.13.1
22-
- key: process.pid
23-
value:
24-
intValue: "25"
25-
- key: process.executable.name
26-
value:
27-
stringValue: /usr/local/bin/python3
28-
- key: process.executable.path
29-
value:
30-
stringValue: /usr/local/bin
31-
- key: process.command
32-
value:
33-
stringValue: web.py
34-
- key: process.command_line
35-
value:
36-
stringValue: web.py
37-
- key: process.command_args
38-
value:
39-
arrayValue:
40-
values:
41-
- stringValue: web.py
42-
- key: process.parent_pid
43-
value:
44-
intValue: "1"
12+
stringValue: 1.36.0
4513
- key: splunk.zc.method
4614
value:
47-
stringValue: splunk-otel-instrumentation-python:v2.6.0
15+
stringValue: splunk-otel-instrumentation-python:v2.7.0
4816
- key: k8s.container.name
4917
value:
5018
stringValue: python-test
@@ -59,13 +27,13 @@ resourceSpans:
5927
stringValue: kind-control-plane
6028
- key: k8s.pod.name
6129
value:
62-
stringValue: python-test-68df75b848-487j8
30+
stringValue: python-test-7b649494c8-5z2gr
6331
- key: k8s.replicaset.name
6432
value:
65-
stringValue: python-test-68df75b848
33+
stringValue: python-test-7b649494c8
6634
- key: service.instance.id
6735
value:
68-
stringValue: default.python-test-68df75b848-487j8.python-test
36+
stringValue: default.python-test-7b649494c8-5z2gr.python-test
6937
- key: service.namespace
7038
value:
7139
stringValue: default
@@ -77,22 +45,19 @@ resourceSpans:
7745
stringValue: splunk-opentelemetry
7846
- key: telemetry.distro.version
7947
value:
80-
stringValue: 2.5.0
48+
stringValue: 2.7.0
8149
- key: service.name
8250
value:
8351
stringValue: python-test
84-
- key: host.arch
85-
value:
86-
stringValue: aarch64
8752
- key: telemetry.auto.version
8853
value:
89-
stringValue: 0.56b0
54+
stringValue: 0.57b0
9055
- key: k8s.pod.ip
9156
value:
92-
stringValue: 10.244.0.12
57+
stringValue: 10.244.0.17
9358
- key: k8s.pod.uid
9459
value:
95-
stringValue: 454afbf5-b8f1-4bc9-a2a5-e191927e9bcd
60+
stringValue: 90e31be5-9e99-4692-a28e-5a3f4315d9ac
9661
- key: k8s.pod.labels.app
9762
value:
9863
stringValue: python-test
@@ -104,7 +69,7 @@ resourceSpans:
10469
stringValue: latest
10570
- key: container.id
10671
value:
107-
stringValue: 592075a79e4399d54931b32d858fffd6389137ea582e014165a1198249f35584
72+
stringValue: 9b9c3e675a1ffae923ec31893a63a06a13049255b0ba7fc59e241a4528299a10
10873
- key: host.name
10974
value:
11075
stringValue: kind-control-plane
@@ -159,7 +124,7 @@ resourceSpans:
159124
stringValue: 127.0.0.1
160125
- key: net.peer.port
161126
value:
162-
intValue: "51628"
127+
intValue: "35682"
163128
- key: http.user_agent
164129
value:
165130
stringValue: curl/8.11.1
@@ -172,15 +137,14 @@ resourceSpans:
172137
- key: http.status_code
173138
value:
174139
intValue: "200"
175-
endTimeUnixNano: "1752511848542835502"
140+
endTimeUnixNano: "1757973730674275179"
176141
flags: 256
177142
kind: 2
178143
name: GET /
179-
parentSpanId: ""
180-
spanId: 890189b3532bbc4d
181-
startTimeUnixNano: "1752511848542267562"
144+
spanId: 452ca957e5a3f689
145+
startTimeUnixNano: "1757973730673575679"
182146
status: {}
183-
traceId: ddb5bc5ef8e96c6647193763f6fb7162
147+
traceId: 02480604263ac6b3632a0ce0ffa5f888
184148
- attributes:
185149
- key: http.method
186150
value:
@@ -208,7 +172,7 @@ resourceSpans:
208172
stringValue: 127.0.0.1
209173
- key: net.peer.port
210174
value:
211-
intValue: "51632"
175+
intValue: "35686"
212176
- key: http.user_agent
213177
value:
214178
stringValue: curl/8.11.1
@@ -221,15 +185,14 @@ resourceSpans:
221185
- key: http.status_code
222186
value:
223187
intValue: "200"
224-
endTimeUnixNano: "1752511849544449800"
188+
endTimeUnixNano: "1757973731676873055"
225189
flags: 256
226190
kind: 2
227191
name: GET /
228-
parentSpanId: ""
229-
spanId: 8e221ca3ed9436ec
230-
startTimeUnixNano: "1752511849543758860"
192+
spanId: 9496023db84c74f2
193+
startTimeUnixNano: "1757973731675596055"
231194
status: {}
232-
traceId: b5560eb3d564a0eff5eb3b9ab242de24
195+
traceId: 942f6e0f338dfb834202e872565fa3e4
233196
- attributes:
234197
- key: http.method
235198
value:
@@ -257,7 +220,7 @@ resourceSpans:
257220
stringValue: 127.0.0.1
258221
- key: net.peer.port
259222
value:
260-
intValue: "51648"
223+
intValue: "48168"
261224
- key: http.user_agent
262225
value:
263226
stringValue: curl/8.11.1
@@ -270,15 +233,14 @@ resourceSpans:
270233
- key: http.status_code
271234
value:
272235
intValue: "200"
273-
endTimeUnixNano: "1752511850545363608"
236+
endTimeUnixNano: "1757973732679760514"
274237
flags: 256
275238
kind: 2
276239
name: GET /
277-
parentSpanId: ""
278-
spanId: 0affd31c40064e50
279-
startTimeUnixNano: "1752511850544756385"
240+
spanId: e390ca2c7684ce1b
241+
startTimeUnixNano: "1757973732679209264"
280242
status: {}
281-
traceId: 5283439627a5dd4b6152a578aede7ba1
243+
traceId: e0cb286631aca9fcf034fa3b8d5d5616
282244
- attributes:
283245
- key: http.method
284246
value:
@@ -306,7 +268,7 @@ resourceSpans:
306268
stringValue: 127.0.0.1
307269
- key: net.peer.port
308270
value:
309-
intValue: "34162"
271+
intValue: "48176"
310272
- key: http.user_agent
311273
value:
312274
stringValue: curl/8.11.1
@@ -319,15 +281,14 @@ resourceSpans:
319281
- key: http.status_code
320282
value:
321283
intValue: "200"
322-
endTimeUnixNano: "1752511851546191010"
284+
endTimeUnixNano: "1757973733684957625"
323285
flags: 256
324286
kind: 2
325287
name: GET /
326-
parentSpanId: ""
327-
spanId: 5f97e4fe41460d1c
328-
startTimeUnixNano: "1752511851545604095"
288+
spanId: ce78061e2018b528
289+
startTimeUnixNano: "1757973733684193333"
329290
status: {}
330-
traceId: e0b4111d150c880d3f1c77279d9054af
291+
traceId: 2bdfeacd636197908a69a71ac43afbdd
331292
- attributes:
332293
- key: http.method
333294
value:
@@ -355,7 +316,7 @@ resourceSpans:
355316
stringValue: 127.0.0.1
356317
- key: net.peer.port
357318
value:
358-
intValue: "51660"
319+
intValue: "48188"
359320
- key: http.user_agent
360321
value:
361322
stringValue: curl/8.11.1
@@ -368,12 +329,11 @@ resourceSpans:
368329
- key: http.status_code
369330
value:
370331
intValue: "200"
371-
endTimeUnixNano: "1752511852547236754"
332+
endTimeUnixNano: "1757973734690507375"
372333
flags: 256
373334
kind: 2
374335
name: GET /
375-
parentSpanId: ""
376-
spanId: f8f8482a02914e7d
377-
startTimeUnixNano: "1752511852546621957"
336+
spanId: 6a3639b368c3942f
337+
startTimeUnixNano: "1757973734689674209"
378338
status: {}
379-
traceId: 2cc9fcb5842a8ff2279140bf7a916282
339+
traceId: 8e7c0c61ac413cbea9eabacee40086df

‎functional_tests/functional/testdata/python/deployment.yaml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,6 @@ spec:
1919
containers:
2020
- image: quay.io/splunko11ytest/python_test:latest
2121
name: python-test
22-
imagePullPolicy: IfNotPresent
23-
command: ["/bin/bash", "-c"]
24-
args:
25-
- |
26-
echo "Installed OpenTelemetry packages:"
27-
pip list | grep opentelemetry || echo "No opentelemetry packages found"
28-
29-
if ! python3 -c "import opentelemetry.instrumentation.flask" 2>/dev/null; then
30-
echo "Flask instrumentation not found, installing..."
31-
pip install --target /usr/local/lib/python3.13/site-packages \
32-
--no-deps \
33-
--disable-pip-version-check \
34-
--root-user-action=ignore \
35-
opentelemetry-instrumentation-flask==0.46b0 \
36-
opentelemetry-instrumentation-wsgi==0.46b0 \
37-
opentelemetry-util-http==0.46b0
38-
if [ $? -eq 0 ]; then
39-
echo "Flask instrumentation installed successfully"
40-
else
41-
echo "Failed to install Flask instrumentation"
42-
fi
43-
else
44-
echo "Flask instrumentation is already available"
45-
fi
46-
47-
exec /start.sh
22+
imagePullPolicy: Always
4823
nodeSelector:
4924
kubernetes.io/os: "linux"

‎helm-charts/splunk-otel-collector/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,10 +1350,10 @@ instrumentation:
13501350
# - name: NODEJS_ENV_VAR
13511351
# value: nodejs_value
13521352
python:
1353-
image: quay.io/signalfx/splunk-otel-instrumentation-python:v2.6.0
1354-
# env:
1355-
# - name: PYTHON_ENV_VAR
1356-
# value: python_value
1353+
image: quay.io/signalfx/splunk-otel-instrumentation-python:v2.7.0
1354+
env:
1355+
- name: OTEL_EXPERIMENTAL_RESOURCE_DETECTORS
1356+
value: "container"
13571357
# Auto-instrumentation Libraries (End)
13581358

13591359
# Note - Installing certmanager as a subchart is deprecated and will be removed in the future.

0 commit comments

Comments
 (0)