Merge branch 'main' into remote-eol-ubuntu

.github/workflows/ansible.yml

@@ -36,8 +36,7 @@ jobs:
 
   lint:
     name: Lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -56,8 +55,8 @@ jobs:
   linux-test:
     name: Linux Test
     needs: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    # Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
+    runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
     strategy:
       fail-fast: false
       matrix:
@@ -70,8 +69,6 @@ jobs:
           - amazonlinux2023
           - centos8
           - centos9
-          - debian9
-          - debian10
           - debian11
           - debian12
           - opensuse12
@@ -190,8 +187,7 @@ jobs:
   push-release-tag:
     name: Push Release Tag
     needs: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main' 
     steps:
       - name: Checkout

.github/workflows/puppet-test.yml

@@ -72,7 +72,7 @@ jobs:
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           puppet_release='"6","7","8"'
           with_instrumentation='"true","false"'
-          exclude='{"DISTRO": "debian-stretch", "PUPPET_RELEASE": "8"}, {"DISTRO": "ubuntu-xenial", "PUPPET_RELEASE": "8"}'  # puppet 8 not supported for these distros
+          exclude='{"DISTRO": "ubuntu-xenial", "PUPPET_RELEASE": "8"}'  # puppet 8 not supported for this distro
           matrix="{\"DISTRO\": [${distro%,}], \"PUPPET_RELEASE\": [${puppet_release}], \"WITH_INSTRUMENTATION\": [${with_instrumentation}], \"exclude\": [${exclude}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT

deployments/ansible/molecule/config/docker.yml

@@ -14,7 +14,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
-    cgroupns: host
+    cgroupns_mode: host
     pre_build_image: false
 
 provisioner:

deployments/ansible/molecule/config/vagrant.yml

@@ -13,8 +13,8 @@ platforms:
     box: ubuntu/focal64
   - name: centos8
     box: centos/8
-  - name: buster64
-    box: debian/buster64
+  - name: bookworm64
+    box: debian/bookworm64
   - name: amazonlinux
     box: bento/amazonlinux-2
 provisioner:

deployments/ansible/molecule/default/Dockerfile.j2

@@ -1,9 +1,5 @@
 {% if item.image not in ["opensuse12", "opensuse15", "centos9"] %}
 FROM geerlingguy/docker-{{ item.image }}-ansible:latest
-{% if item.image == "debian9" %}
-RUN sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
-{% endif %}
 {% elif item.image == "centos9" %}
 FROM quay.io/centos/centos:stream9
 ENV container docker

deployments/ansible/roles/collector/README.md

@@ -174,8 +174,7 @@ which allows setting up a proxy to download the collector binaries.
   (**default:** `false`)
 
 - `td_agent_version`: Version of td-agent (fluentd package) that will be 
-  installed (**default:** `3.7.1` for Debian stretch and `4.3.2` for other
-  distros)
+  installed (**default:** `4.3.2`)
 
 - `splunk_fluentd_config`: Path to the fluentd config file on the remote host.
   (**default:** `/etc/otel/collector/fluentd/fluent.conf` on Linux, 

deployments/ansible/roles/collector/defaults/main.yml

@@ -40,7 +40,7 @@ start_service: true
 splunk_skip_repo: false
 
 # Explicitly set version of td-agent,
-# By default: 3.7.1 for Debian stretch and 4.3.2 for other distros.
+# By default: 4.3.2
 td_agent_version: ""
 
 # Default path on Linux: "/etc/otel/collector/fluentd/fluent.conf".

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

@@ -6,8 +6,6 @@
     td_agent_version: |-
       {%- if td_agent_version -%}
         {{ td_agent_version }}
-      {%- elif ansible_distribution_release == "stretch" -%}
-        3.7.1-0
       {%- elif ansible_os_family == "Debian" -%}
         4.3.2-1
       {%- else -%}

deployments/chef/README.md

@@ -160,8 +160,7 @@ required `splunk_access_token` attribute and some optional attributes:
 
 - `fluentd_version`: Version of the [td-agent](
   https://www.fluentd.org/download) (Fluentd) package to install (**default:**
-  `3.7.1` for Debian stretch, and `4.3.1` for all other Linux distros and
-  Windows)
+  `4.3.1` for all Linux distros and Windows)
 
 - `fluentd_config_source`: Source path to the Fluentd config file. This file
   will be copied to the `fluentd_config_dest` path on the node. See the

deployments/chef/attributes/default.rb

@@ -26,12 +26,7 @@
 
 default['splunk_otel_collector']['with_fluentd'] = false
 default['splunk_otel_collector']['fluentd_version'] = if platform_family?('debian')
-                                                        case node['lsb']['codename']
-                                                        when 'stretch'
-                                                          '3.7.1-0'
-                                                        else
-                                                          '4.3.2-1'
-                                                        end
+                                                        '4.3.2-1'
                                                       else
                                                         '4.3.2'
                                                       end

deployments/chef/kitchen.yml

@@ -41,19 +41,6 @@ platforms:
       image: dokken/rockylinux-9
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: debian-9
-    driver:
-      image: dokken/debian-9
-      intermediate_instructions: |
-        RUN sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list
-        RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
-      pid_one_command: /bin/systemd
-
-  - name: debian-10
-    driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
-
   - name: debian-11
     driver:
       image: dokken/debian-11

deployments/puppet/manifests/params.pp

@@ -1,7 +1,6 @@
 # Class for default param values based on OS
 class splunk_otel_collector::params {
   $fluentd_version_default = '4.3.2'
-  $fluentd_version_stretch = '3.7.1-0'
   $collector_additional_env_vars = {}
 
   if $facts['os']['family'] == 'redhat' or $facts['os']['family'] == 'debian' or $facts['os']['family'] == 'suse' {
@@ -14,10 +13,7 @@
     $collector_config_dest = $collector_config_source
     $fluentd_base_url = 'https://packages.treasuredata.com'
     if $facts['os']['family'] == 'debian' {
-      $fluentd_version = downcase($facts['os']['distro']['codename']) ? {
-        'stretch' => $fluentd_version_stretch,
-        default   => "${fluentd_version_default}-1",
-      }
+      $fluentd_version = "${fluentd_version_default}-1"
     } else {
       $fluentd_version = $fluentd_version_default
     }

deployments/salt/README.md

@@ -126,8 +126,7 @@ splunk-otel-collector:
 
 - `td_agent_version`: Version of [td-agent](
   https://td-agent-package-browser.herokuapp.com/) (fluentd package) that will
-  be installed (**default:** `3.7.1-0` for Debian 9, and `4.3.0` for other
-  distros)
+  be installed (**default:** `4.3.0`)
 
 - `splunk_fluentd_config`: Path to the fluentd config file on the remote host.
   (**default:** `/etc/otel/collector/fluentd/fluent.conf`)

deployments/salt/splunk-otel-collector/fluentd.sls

@@ -6,8 +6,6 @@
 
 {% if td_agent_version  %}
 {{ td_agent_version }}
-{%- elif grains['oscodename'] == 'stretch' %}
-{% set td_agent_version = '3.7.1-0' %}
 {%- elif grains['os_family'] == 'Debian' %}
 {% set td_agent_version = '4.3.2-1' %}
 {%- else %}

packaging/installer/install.sh

@@ -40,12 +40,6 @@ get_distro_codename() {
 
   if [ "$distro" = "debian" ] && [ -z "$codename" ]; then
     case "$( get_distro_version )" in
-      9)
-        codename="stretch"
-        ;;
-      10)
-        codename="buster"
-        ;;
       11)
         codename="bullseye"
         ;;
@@ -97,15 +91,10 @@ default_listen_interface="0.0.0.0"
 
 default_collector_version="latest"
 default_td_agent_version="4.3.2"
-default_td_agent_version_stretch="3.7.1-0"
 
 default_service_user="splunk-otel-collector"
 default_service_group="splunk-otel-collector"
 
-if [ "$distro_codename" = "stretch" ]; then
-  default_td_agent_version="$default_td_agent_version_stretch"
-fi
-
 preload_path="/etc/ld.so.preload"
 default_instrumentation_version="latest"
 default_deployment_environment=""
@@ -753,9 +742,7 @@ install() {
       apt-get -y update
       install_apt_package "splunk-otel-collector" "$collector_version"
       if [ -n "$td_agent_version" ]; then
-        if [ "$distro_codename" != "stretch" ]; then
-          td_agent_version="${td_agent_version}-1"
-        fi
+        td_agent_version="${td_agent_version}-1"
         if [ "$skip_fluentd_repo" = "false" ]; then
           install_td_agent_apt_repo "$td_agent_version"
         fi
@@ -1039,7 +1026,7 @@ distro_is_supported() {
       ;;
     debian)
       case "$distro_codename" in
-        bookworm|bullseye|buster|stretch)
+        bookworm|bullseye)
           return 0
           ;;
       esac

packaging/tests/deployments/puppet/puppet_test.py

@@ -125,7 +125,7 @@ def verify_env_file(container, api_url=SPLUNK_API_URL, ingest_url=SPLUNK_INGEST_
 
 
 def skip_if_necessary(distro, puppet_release):
-    if distro in ("debian-stretch", "ubuntu-xenial") and int(puppet_release) >= 8:
+    if distro == "ubuntu-xenial" and int(puppet_release) >= 8:
         pytest.skip(f"Puppet {puppet_release} not supported for {distro}")
 
 

packaging/tests/deployments/salt/images/Dockerfile.deb

@@ -6,11 +6,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV SALT_VERSION=latest
 ENV NODE_VERSION=16.20.2
 
-# repo update for debian:stretch
-RUN if [ ${DISTRO_IMAGE} = "debian:stretch" ]; then \
-    sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list && \
-    sed -i '/stretch-updates/d' /etc/apt/sources.list; fi
-
 RUN apt-get update && apt-get upgrade -y -o DPkg::Options::=--force-confold
 RUN apt-get install -y software-properties-common ca-certificates wget curl apt-transport-https python3-pip vim systemd procps
 

packaging/tests/deployments/salt/images/distro_docker_opts.yaml

@@ -1,7 +1,5 @@
 deb:
   debian-bullseye: ["DISTRO_IMAGE=debian:bullseye"]
-  debian-buster: ["DISTRO_IMAGE=debian:buster"]
-  debian-stretch: ["DISTRO_IMAGE=debian:stretch"]
   ubuntu-focal: ["DISTRO_IMAGE=ubuntu:20.04"]
   ubuntu-jammy: ["DISTRO_IMAGE=ubuntu:22.04"]