Skip to content

Commit 9adee45

Browse files
authored
Deprecate SPLUNK_TRACE_URL env var and don't use it in default configs (#5672)
Deprecate `SPLUNK_TRACE_URL` environment variable and replace with `${SPLUNK_INGEST_URL}/v2/trace`in the default configs. `SPLUNK_TRACE_URL` is still automatically set in the binary computed from on `SPLUNK_REALM` or `SPLUNK_INGEST_URL` environment variables to not break existing configurations. However, it is recommended to update the configurations to use `${SPLUNK_INGEST_URL}/v2/trace` instead. Also, packaging and mass deployment solutions were update to not provide the option to set the Trace URL since it's not being used anymore in the default configs.
1 parent 7f963ba commit 9adee45

File tree

51 files changed

+200
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+200
-215
lines changed

.github/workflows/scripts/win-test-services.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ $expected_svc_env_vars = @{
4444
"SPLUNK_REALM" = "$realm";
4545
"SPLUNK_API_URL" = "$api_url";
4646
"SPLUNK_INGEST_URL" = "$ingest_url";
47-
"SPLUNK_TRACE_URL" = "${ingest_url}/v2/trace";
4847
"SPLUNK_HEC_URL" = "${ingest_url}/v1/log";
4948
"SPLUNK_HEC_TOKEN" = "$access_token";
5049
"SPLUNK_BUNDLE_DIR" = "${env:PROGRAMFILES}\Splunk\OpenTelemetry Collector\agent-bundle";

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
## Unreleased
44

5+
### 🚩Deprecations 🚩
6+
7+
- (Splunk) `SPLUNK_TRACE_URL` environment variable is deprecated. It's replaced with `${SPLUNK_INGEST_URL}/v2/trace`
8+
in the default configs. Default value for `SPLUNK_TRACE_URL` is still set in the binary from `SPLUNK_REALM` or
9+
`SPLUNK_INGEST_URL` environment variables to not break existing configurations. However, it is recommended to
10+
update the configurations to use `${SPLUNK_INGEST_URL}/v2/trace` instead. ([#5672](https://github.com/signalfx/splunk-otel-collector/pull/5672)).
11+
12+
### 🛑 Breaking changes 🛑
13+
14+
- (Splunk) Given that `SPLUNK_TRACE_URL` environment variable is deprecated and replaced with
15+
`${SPLUNK_INGEST_URL}/v2/trace` in the default configurations, the option to set the Trace URL has been removed from
16+
all packaging and mass deployment solutions to an avoid confusion. ([#5672](https://github.com/signalfx/splunk-otel-collector/pull/5672)).
17+
518
### 🧰 Bug fixes 🧰
619

720
- (Splunk) `receiver/journald`: Upgrade journald client libraries in the Collector docker image by taking them from latest Debian image.

cmd/otelcol/config/collector/agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
1111
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
1212
# - SPLUNK_LISTEN_INTERFACE: The network interface the agent receivers listen on.
13-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1413

1514
extensions:
1615
health_check:
@@ -129,7 +128,7 @@ exporters:
129128
# Traces
130129
sapm:
131130
access_token: "${SPLUNK_ACCESS_TOKEN}"
132-
endpoint: "${SPLUNK_TRACE_URL}"
131+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
133132
# Metrics + Events
134133
signalfx:
135134
access_token: "${SPLUNK_ACCESS_TOKEN}"

cmd/otelcol/config/collector/upstream_agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# - SPLUNK_HEC_TOKEN: The Splunk HEC authentication token
1313
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
1414
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
15-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1615

1716
extensions:
1817
health_check:
@@ -123,7 +122,7 @@ exporters:
123122
# Traces
124123
sapm:
125124
access_token: "${SPLUNK_ACCESS_TOKEN}"
126-
endpoint: "${SPLUNK_TRACE_URL}"
125+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
127126
# Metrics + Events
128127
signalfx:
129128
access_token: "${SPLUNK_ACCESS_TOKEN}"

cmd/otelcol/fips/config/agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
99
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
1010
# - SPLUNK_LISTEN_INTERFACE: The network interface the agent receivers listen on.
11-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1211

1312
extensions:
1413
health_check:
@@ -119,7 +118,7 @@ exporters:
119118
# Traces
120119
sapm:
121120
access_token: "${SPLUNK_ACCESS_TOKEN}"
122-
endpoint: "${SPLUNK_TRACE_URL}"
121+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
123122
# Metrics + Events
124123
signalfx:
125124
access_token: "${SPLUNK_ACCESS_TOKEN}"

deployments/ansible/molecule/custom_vars/verify.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@
3737
state: present
3838
check_mode: yes
3939

40-
- name: Assert SPLUNK_TRACE_URL env var is set
41-
ansible.builtin.lineinfile:
42-
line: SPLUNK_TRACE_URL=https://fake-splunk-ingest.com/v2/trace
43-
dest: /etc/otel/collector/splunk-otel-collector.conf
44-
state: present
45-
check_mode: yes
46-
4740
- name: Assert SPLUNK_HEC_URL env var is set
4841
ansible.builtin.lineinfile:
4942
line: SPLUNK_HEC_URL=https://fake-splunk-ingest.com/v1/log

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
SPLUNK_CONFIG: '{{ ansible_env.ProgramData }}\Splunk\OpenTelemetry Collector\custom_config.yml'
99
SPLUNK_INGEST_URL: https://fake-splunk-ingest.com
1010
SPLUNK_API_URL: https://fake-splunk-api.com
11-
SPLUNK_TRACE_URL: https://fake-splunk-ingest.com/v2/trace
1211
SPLUNK_HEC_URL: https://fake-splunk-hec.com
1312
SPLUNK_HEC_TOKEN: fake-hec-token
1413
SPLUNK_MEMORY_TOTAL_MIB: "256"

deployments/ansible/molecule/default/verify.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
state: present
4444
check_mode: yes
4545

46-
- name: Assert SPLUNK_TRACE_URL env var is set
47-
ansible.builtin.lineinfile:
48-
line: SPLUNK_TRACE_URL=https://ingest.fake-realm.signalfx.com/v2/trace
49-
dest: /etc/otel/collector/splunk-otel-collector.conf
50-
state: present
51-
check_mode: yes
52-
5346
- name: Assert SPLUNK_HEC_URL env var is set
5447
ansible.builtin.lineinfile:
5548
line: SPLUNK_HEC_URL=https://ingest.fake-realm.signalfx.com/v1/log

deployments/ansible/molecule/default/windows-verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
SPLUNK_HEC_TOKEN: fake-token
1313
SPLUNK_HEC_URL: https://ingest.fake-realm.signalfx.com/v1/log
1414
SPLUNK_INGEST_URL: https://ingest.fake-realm.signalfx.com
15-
SPLUNK_TRACE_URL: https://ingest.fake-realm.signalfx.com/v2/trace
1615
tasks:
1716
- name: Check splunk-otel-collector service
1817
ansible.windows.win_service:

deployments/ansible/molecule/with_instrumentation/windows-verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
SPLUNK_HEC_TOKEN: fake-token
1313
SPLUNK_HEC_URL: https://ingest.fake-realm.signalfx.com/v1/log
1414
SPLUNK_INGEST_URL: https://ingest.fake-realm.signalfx.com
15-
SPLUNK_TRACE_URL: https://ingest.fake-realm.signalfx.com/v2/trace
1615
iis_reg_values:
1716
COR_ENABLE_PROFILING: "1"
1817
COR_PROFILER: "{B4C89B0F-9908-4F73-9F59-0D77C5A06874}"

0 commit comments

Comments
 (0)