Skip to content

Commit 67808a8

Browse files
github-actions[bot]jvoravongjinja2
authored
Bump java from v1.31.1 to v1.32.0 in helm-charts/splunk-otel-collector/values.yaml (#1265)
* Update java instrumentation version * update resattr for java --------- Co-authored-by: jvoravong <[email protected]> Co-authored-by: Jina Jain <[email protected]>
1 parent dd27955 commit 67808a8

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

.chloggen/update-java.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ change_type: enhancement
33
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
44
component: operator
55
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6-
note: Bump java to v1.31.1 in helm-charts/splunk-otel-collector/values.yaml
6+
note: Bump java to v1.32.0 in helm-charts/splunk-otel-collector/values.yaml
77
# One or more tracking issues related to the change
8-
issues: [1231]
8+
issues: [1231, 1265]
99
# (Optional) One or more lines of additional information to render under the primary note.
1010
# These lines will be padded with 2 spaces and then inserted directly into the document.
1111
# Use pipe (|) for multiline entries.

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ spec:
5757
- name: OTEL_RESOURCE_ATTRIBUTES
5858
value: splunk.zc.method=autoinstrumentation-go:v0.10.1-alpha
5959
java:
60-
image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.31.1
60+
image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.32.0
6161
env:
6262
- name: OTEL_RESOURCE_ATTRIBUTES
63-
value: splunk.zc.method=splunk-otel-java:v1.31.1
63+
value: splunk.zc.method=splunk-otel-java:v1.32.0
6464
nginx:
6565
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-apache-httpd:1.0.4
6666
env:

functional_tests/functional_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ func testJavaTraces(t *testing.T) {
496496
ptracetest.IgnoreResourceAttributeValue("telemetry.auto.version"),
497497
ptracetest.IgnoreResourceAttributeValue("splunk.distro.version"),
498498
ptracetest.IgnoreResourceAttributeValue("splunk.zc.method"),
499+
ptracetest.IgnoreResourceAttributeValue("service.instance.id"),
499500
ptracetest.IgnoreSpanAttributeValue("net.sock.peer.port"),
500501
ptracetest.IgnoreSpanAttributeValue("thread.id"),
501502
ptracetest.IgnoreSpanAttributeValue("thread.name"),

functional_tests/testdata/expected_eks_values/expected_java_traces.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ resourceSpans:
7070
- key: process.runtime.version
7171
value:
7272
stringValue: 21.0.2+13-LTS
73+
- key: service.instance.id
74+
value:
75+
stringValue: 9d6b356a-c9d2-49d4-b553-bf0e6bb7e323
7376
- key: service.name
7477
value:
7578
stringValue: java-test

functional_tests/testdata/expected_kind_values/expected_java_traces.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ resourceSpans:
7070
- key: process.runtime.version
7171
value:
7272
stringValue: 21.0.2+13-LTS
73+
- key: service.instance.id
74+
value:
75+
stringValue: 9d6b356a-c9d2-49d4-b553-bf0e6bb7e323
7376
- key: service.name
7477
value:
7578
stringValue: java-test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ operator:
11961196
# - env: (Optional) Allows you to add any additional environment variables.
11971197
java:
11981198
repository: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java
1199-
tag: v1.31.1
1199+
tag: v1.32.0
12001200
nodejs:
12011201
repository: ghcr.io/signalfx/splunk-otel-js/splunk-otel-js
12021202
tag: v2.7.1

0 commit comments

Comments
 (0)