Skip to content

Commit ce02a29

Browse files
authored
[chore] Upgrade release version used in mass deployment testing (#6265)
* [chore] Upgrade OTel Collector version in mass deployment tests Starting with Ansible * update chef, puppet, salt, installer tests * Set autoinstrumentation versions to 0.126.0 instead of latest * remove deprecated "logging" exporter in favor of debug exporter * Account for different formating of log from debug exporter * assert instrumentstion configs exist, add dotnet for arm64 * add some debugging * revert chef changes - handled in separate PR * debug msi_arguments value * try different syntax for passing msi_arguments * revert all windows ansible changes, handled in separate PR * Keep old collector config for Windows * Fix reference to config file on Windows
1 parent 9d69ac0 commit ce02a29

File tree

11 files changed

+59
-20
lines changed

11 files changed

+59
-20
lines changed

deployments/ansible/molecule/custom_vars/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
splunk_access_token: fake-token
77
splunk_ingest_url: https://fake-splunk-ingest.com
88
splunk_api_url: https://fake-splunk-api.com
9-
splunk_otel_collector_version: 0.48.0
9+
splunk_otel_collector_version: 0.126.0
1010
splunk_otel_collector_config: /etc/otel/collector/custom_config.yml
1111
splunk_otel_collector_config_source: ./custom_collector_config.yml
1212
splunk_service_user: custom-user

deployments/ansible/molecule/custom_vars/custom_collector_config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ processors:
2222
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
2323

2424
exporters:
25-
logging/debug:
26-
loglevel: debug
27-
logging/info:
28-
loglevel: info
25+
debug/detailed:
26+
verbosity: detailed
27+
debug/normal:
28+
verbosity: normal
2929

3030
service:
3131
pipelines:
3232
metrics:
3333
receivers: [otlp, prometheus]
3434
processors: [memory_limiter]
35-
exporters: [logging/info]
35+
exporters: [debug/normal]
3636
logs:
3737
receivers: [fluentforward, otlp]
3838
processors: [memory_limiter]
39-
exporters: [logging/debug]
39+
exporters: [debug/detailed]
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
# Custom collector config for test purposes
3+
4+
receivers:
5+
fluentforward:
6+
endpoint: 127.0.0.1:8006
7+
otlp:
8+
protocols:
9+
grpc:
10+
http:
11+
prometheus:
12+
config:
13+
scrape_configs:
14+
- job_name: 'otel-collector'
15+
scrape_interval: 10s
16+
static_configs:
17+
- targets: ['127.0.0.1:8888']
18+
19+
processors:
20+
memory_limiter:
21+
check_interval: 2s
22+
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
23+
24+
exporters:
25+
logging/debug:
26+
loglevel: debug
27+
logging/info:
28+
loglevel: info
29+
30+
service:
31+
pipelines:
32+
metrics:
33+
receivers: [otlp, prometheus]
34+
processors: [memory_limiter]
35+
exporters: [logging/info]
36+
logs:
37+
receivers: [fluentforward, otlp]
38+
processors: [memory_limiter]
39+
exporters: [logging/debug]

deployments/ansible/molecule/custom_vars/verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
- name: Assert specified version of splunk-otel-collector is installed
7272
assert:
73-
that: ansible_facts.packages['splunk-otel-collector'][0].version == '0.48.0'
73+
that: ansible_facts.packages['splunk-otel-collector'][0].version == '0.126.0'
7474

7575
- name: Assert custom service user is set
7676
ansible.builtin.lineinfile:
@@ -135,7 +135,7 @@
135135

136136
- name: Look for the test log message in collector service output
137137
ansible.builtin.shell:
138-
cmd: 'journalctl -u splunk-otel-collector | grep "Body: test logs pipeline"'
138+
cmd: 'journalctl -u splunk-otel-collector | grep "Body: Str(test logs pipeline)"'
139139
register: result
140140
changed_when: false
141141
until: result.stdout

deployments/ansible/molecule/custom_vars/windows-converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
splunk_hec_token: fake-hec-token
1111
splunk_otel_collector_version: 0.48.0
1212
splunk_otel_collector_config: '{{ansible_env.ProgramData}}\Splunk\OpenTelemetry Collector\custom_config.yml'
13-
splunk_otel_collector_config_source: ./custom_collector_config.yml
13+
splunk_otel_collector_config_source: ./custom_collector_config_deprecated.yml
1414
splunk_memory_total_mib: 256
1515
gomemlimit: 230
1616
install_fluentd: yes

deployments/ansible/molecule/with_instrumentation/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
splunk_access_token: fake-token
77
splunk_realm: fake-realm
88
install_splunk_otel_auto_instrumentation: true
9-
splunk_otel_auto_instrumentation_version: 0.50.0
9+
splunk_otel_auto_instrumentation_version: 0.126.0
1010
splunk_otel_auto_instrumentation_resource_attributes: deployment.environment=test
1111
splunk_otel_auto_instrumentation_service_name: test
1212
splunk_otel_auto_instrumentation_generate_service_name: false

deployments/ansible/molecule/with_instrumentation/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
- name: Assert specified version of splunk-otel-auto-instrumentation is installed
1717
assert:
18-
that: ansible_facts.packages['splunk-otel-auto-instrumentation'][0].version == '0.50.0'
18+
that: ansible_facts.packages['splunk-otel-auto-instrumentation'][0].version == '0.126.0'
1919

2020
- name: Check for the new config files
2121
ansible.builtin.stat:
@@ -26,9 +26,9 @@
2626
- /etc/splunk/zeroconfig/dotnet.conf
2727
register: new_config_files
2828

29-
- name: Assert the new config files do not exist
29+
- name: Assert the new config files exist
3030
assert:
31-
that: not item.stat.exists
31+
that: item.stat.exists
3232
loop: "{{ new_config_files.results }}"
3333

3434
- name: Check for systemd drop-in file
@@ -60,7 +60,7 @@
6060

6161
- name: Assert instrumentation config contains resource attribute
6262
ansible.builtin.lineinfile:
63-
line: resource_attributes=splunk.zc.method=splunk-otel-auto-instrumentation-0.50.0,deployment.environment=test
63+
line: resource_attributes=splunk.zc.method=splunk-otel-auto-instrumentation-0.126.0,deployment.environment=test
6464
dest: /usr/lib/splunk-instrumentation/instrumentation.conf
6565
state: present
6666
check_mode: yes

deployments/ansible/roles/collector/tasks/linux_auto_instrumentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
and auto_instrumentation_version is version('0.87.0', '>=') }}"
3434
with_dotnet: "{{ 'dotnet' in (splunk_otel_auto_instrumentation_sdks | default([])) \
3535
and auto_instrumentation_version is version('0.99.0', '>=') \
36-
and ansible_architecture in ('x86_64', 'amd64') }}"
36+
and ansible_architecture in ('x86_64', 'amd64', 'arm64') }}"
3737

3838
- name: Check for npm
3939
shell: npm --version

packaging/tests/deployments/puppet/puppet_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ def test_puppet_with_custom_vars(distro, puppet_release):
215215
try:
216216
api_url = "https://fake-splunk-api.com"
217217
ingest_url = "https://fake-splunk-ingest.com"
218-
config = CUSTOM_VARS_CONFIG.substitute(api_url=api_url, ingest_url=ingest_url, version="0.86.0")
218+
config = CUSTOM_VARS_CONFIG.substitute(api_url=api_url, ingest_url=ingest_url, version="0.126.0")
219219
run_puppet_apply(container, config)
220-
verify_package_version(container, "splunk-otel-collector", "0.86.0")
220+
verify_package_version(container, "splunk-otel-collector", "0.126.0")
221221
verify_env_file(container, api_url, ingest_url, "fake-hec-token")
222222
verify_config_file(container, SPLUNK_ENV_PATH, "SPLUNK_LISTEN_INTERFACE", "0.0.0.0")
223223
verify_config_file(container, SPLUNK_ENV_PATH, "OTELCOL_OPTIONS", "--discovery")

packaging/tests/deployments/salt/salt_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def test_salt_default(distro):
204204
splunk_ingest_url: 'https://fake-ingest.com'
205205
splunk_api_url: 'https://fake-api.com'
206206
splunk_hec_token: 'fake-hec-token'
207-
collector_version: '0.86.0'
207+
collector_version: '0.126.0'
208208
splunk_service_user: 'test-user'
209209
splunk_service_group: 'test-user'
210210
splunk_listen_interface: '0.0.0.0'

packaging/tests/installer_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def test_installer_custom(distro, arch):
265265
if distro == "opensuse-12" and arch == "arm64":
266266
pytest.skip("opensuse-12 arm64 no longer supported")
267267

268-
collector_version = "0.75.0"
268+
collector_version = "0.126.0"
269269
service_owner = "test-user"
270270
custom_config = "/etc/my-custom-config.yaml"
271271

0 commit comments

Comments
 (0)