Merge branch 'main' into prepare_v0.121.0_changelog

Author: crobert-1

.github/workflows/dotnet-instr-deployer-add-on.yml

@@ -4,13 +4,27 @@ on:
   push:
     paths:
       - 'packaging/dotnet-instr-deployer-add-on/**'
+      - '.github/workflows/dotnet-instr-deployer-add-on.yml'
   pull_request:
     paths:
       - 'packaging/dotnet-instr-deployer-add-on/**'
+      - '.github/workflows/dotnet-instr-deployer-add-on.yml'
   workflow_dispatch:
+    inputs:
+      splunk_uf_version:
+        description: 'Splunk UF version'
+        required: false
+        default: '9.4.0'
+      splunk_uf_build_hash:
+        description: 'Splunk UF build hash'
+        required: false
+        default: '6b4ebe426ca6'
 
 env:
   GO_VERSION: 1.23.6
+  # Provide default values for non-manually triggered executions
+  splunk_uf_version: ${{ github.event.inputs.splunk_uf_version || '9.4.0' }}
+  splunk_uf_build_hash: ${{ github.event.inputs.splunk_uf_build_hash || '6b4ebe426ca6' }}
 
 jobs:
   build-pack-test-dotnet-deployer-ta:
@@ -46,7 +60,8 @@ jobs:
 
       - name: Download the Splunk UF MSI
         shell: bash
-        run: curl https://download.splunk.com/products/universalforwarder/releases/9.4.0/windows/splunkforwarder-9.4.0-6b4ebe426ca6-windows-x64.msi -o splunkforwarder.msi
+        run: |
+          curl https://download.splunk.com/products/universalforwarder/releases/${{ env.splunk_uf_version }}/windows/splunkforwarder-${{ env.splunk_uf_version }}-${{ env.splunk_uf_build_hash }}-windows-x64.msi -o splunkforwarder.msi
 
       - name: Install Splunk UF
         run: msiexec.exe /i "$PWD\splunkforwarder.msi" /qn /l*v install-log.txt AGREETOLICENSE=Yes USE_LOCAL_SYSTEM=1

.github/workflows/lychee.yml

@@ -23,7 +23,7 @@ jobs:
         id: lychee
         uses: lycheeverse/[email protected]
         with:
-          lycheeVersion: nightly # TODO: Change to stable once v0.17.1 is released, the version that includes a retry fix
+          lycheeVersion: v0.18.1
           args: -v -n --config .lychee.toml './*.md' './**/*.md'
           fail: true
         env:

.lychee.toml

@@ -1,7 +1,3 @@
-max_concurrency = 20
-timeout = 30
-max_retires = 5
-retry_wait_time = 30
 exclude = [
     "my.host",
     "file://*",
@@ -25,3 +21,7 @@ exclude = [
     "https://github.com/.*/(pull|issues)/[0-9]+", # We have too many PR and issues links in CHANGELOG.md that we allways run out of the rate limit
     "https://bugs.mysql.com/*", # Failing with 403 Forbidden. Likely rejecting the user agent
 ]
+max_concurrency = 20
+max_retries = 5
+retry_wait_time = 30
+timeout = 30

CHANGELOG.md

@@ -8,6 +8,8 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem
 
 ### 🛑 Breaking changes 🛑
 
+- (Splunk) Support for Oracle Linux 7 has been dropped ([#5974](https://github.com/signalfx/splunk-otel-collector/pull/5974))
+
 - (Core) `confighttp`: Make the client config options `max_idle_conns`, `max_idle_conns_per_host`, `max_conns_per_host`, and `idle_conn_timeout` integers ([#9478](https://github.com/open-telemetry/opentelemetry-collector/issues/9478))
   All four options can be set to `0` where they were previously set to `null`
 

deployments/ansible/README.md

@@ -13,7 +13,8 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
 Currently, the following Linux distributions and versions are supported:
 
 - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
-- CentOS / Red Hat / Oracle: 7, 8, 9
+- CentOS / Red Hat: 7, 8, 9
+- Oracle: 8, 9
 - Debian: 9, 10, 11
 - SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
 - Ubuntu: 16.04, 18.04, 20.04, 22.04

deployments/chef/README.md

@@ -17,7 +17,8 @@ https://www.splunk.com/en_us/observability.html).
 Currently, the following Linux distributions and versions are supported:
 
 - Amazon Linux: 2
-- CentOS / Red Hat / Oracle: 7, 8, 9
+- CentOS / Red Hat: 7, 8, 9
+- Oracle: 8, 9
 - Debian: 9, 10, 11
 - SUSE: 12, 15 (**Note:** Only for Collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
 - Ubuntu: 18.04, 20.04, 22.04

deployments/puppet/README.md

@@ -8,7 +8,8 @@ OpenTelemetry Collector.
 Currently, the following Linux distributions and versions are supported:
 
 - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
-- CentOS / Red Hat / Oracle: 7, 8, 9
+- CentOS / Red Hat: 7, 8, 9
+- Oracle: 8, 9
 - Debian: 9, 10, 11
 - SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
 - Ubuntu: 16.04, 18.04, 20.04, 22.04

deployments/salt/README.md

@@ -8,7 +8,8 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
 Currently, the following Linux distributions and versions are supported:
 
 - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
-- CentOS / Red Hat / Oracle: 7, 8, 9
+- CentOS / Red Hat: 7, 8, 9
+- Oracle: 8, 9
 - Debian: 9, 10, 11
 - SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with fluentd not currently supported.)
 - Ubuntu: 16.04, 18.04, 20.04, 22.04