Merge branch 'main' into remove-url-rewrite-hack

.changelog/1530.changed.txt

@@ -0,0 +1 @@
+chore: update otelcol core to v0.97.0

.github/workflows/dev_builds.yml

@@ -139,7 +139,7 @@ jobs:
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -260,7 +260,7 @@ jobs:
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -349,6 +349,28 @@ jobs:
           path: ./packaging/msi/wix/bin/${{ matrix.platform }}/en-US/*.msi
           if-no-files-found: error
 
+  install-script:
+    name: Store install script
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: SumoLogic/sumologic-otel-collector-packaging
+
+      - name: Store Linux install script as action artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: install.sh
+          path: ./install-script/install.sh
+          if-no-files-found: error
+
+      - name: Store Windows install script as action artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: install.ps1
+          path: ./install-script/install.ps1
+          if-no-files-found: error
+
   trigger-packaging:
     name: Trigger Packaging
     needs:

.github/workflows/pull_requests.yml

@@ -104,7 +104,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-20.04
     env:
-      SHELLCHECK_VERSION: 0.8.0
+      SHELLCHECK_VERSION: 0.10.0
     steps:
       - uses: actions/checkout@v4
       - name: install shellcheck
@@ -318,7 +318,7 @@ jobs:
       - name: Set up Buildx
         if: steps.changed-files.outputs.any_changed == 'true'
         id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Show Buildx platforms
         if: steps.changed-files.outputs.any_changed == 'true'

.github/workflows/release_builds.yml

@@ -320,7 +320,7 @@ jobs:
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -408,7 +408,7 @@ jobs:
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.3.0
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -513,14 +513,19 @@ jobs:
           path: ./packaging/msi/wix/bin/${{ matrix.platform }}/en-US/*.msi
           if-no-files-found: error
 
+
+  # Store the install script from the packaging repository as a release artifact.
+  # Originally, this script was stored in this repository, and the official download url pointed
+  # to the most recent release here. The script has since been moved to the packaging repository.
+  # It is kept here for backwards compatibility. Once the download count for this artifact
+  # reaches 0 for new releases, this can be removed.
   install-script:
     name: Store install script
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Fetch current branch
-        run: ./ci/fetch_current_branch.sh
+        with:
+          repository: SumoLogic/sumologic-otel-collector-packaging
 
       - name: Store Linux install script as action artifact
         uses: actions/upload-artifact@v4

.github/workflows/workflow-trigger-packaging.yml

@@ -22,9 +22,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - name: Fetch tags
-        run: git fetch --tags origin
+        with:
+          fetch-depth: 0
+          filter: 'tree:0'
 
       - name: Determine version core
         id: version-core

Makefile

@@ -45,7 +45,7 @@ markdown-link-check:
 	./ci/markdown_link_check.sh
 
 shellcheck:
-	./ci/shellcheck.sh
+	shellcheck --severity=info ci/*.sh scripts/install.sh
 
 .PHONY: install-pre-commit
 install-pre-commit:

ci/build-push-multiplatform.sh

@@ -31,7 +31,7 @@ if [[ -z "${REPO_URL}" ]]; then
     exit 1
 fi
 
-if [[ ! -z "${BASE_IMAGE_TAG}" ]]; then
+if [[ -n "${BASE_IMAGE_TAG}" ]]; then
     BASE_IMAGE_TAG="-${BASE_IMAGE_TAG}"
 fi
 

ci/get_version.sh

@@ -32,7 +32,6 @@ bad_usage() {
     echo "${1}"
     echo
     usage
-    exit 1
 }
 
 parse_params() {
@@ -54,6 +53,7 @@ parse_params() {
 }
 
 parse_version_tag() {
+    # shellcheck disable=SC2153
     version_tag="${VERSION_TAG}"
     if [ -z "${version_tag}" ]; then
         version_tag=$(git tag -l --sort -version:refname | head -n 1)

ci/push_docker_multiplatform_manifest.sh

@@ -3,7 +3,7 @@
 set -eo pipefail
 
 # check for arm support only if we try to build it
-if echo "${PLATFORM}" | grep -q arm && ! docker buildx ls | grep -q arm ; then
+if echo "${PLATFORMS}" | grep -q arm && ! docker buildx ls | grep -q arm ; then
     echo "Your Buildx seems to lack ARM architecture support"
     echo
     docker buildx ls

docs/configuration.md

@@ -164,7 +164,7 @@ to persist the position in the files it reads between restarts.
 
 See section below on [Collecting logs from files](#collecting-logs-from-files) for details on configuring the Filelog receiver.
 
-[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.96.0/extension/storage/filestorage
+[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.97.0/extension/storage/filestorage
 
 ### Basic configuration for metrics
 
@@ -195,7 +195,7 @@ service:
       exporters: [sumologic]
 ```
 
-[hostmetricsreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.96.0/receiver/hostmetricsreceiver/README.md
+[hostmetricsreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.97.0/receiver/hostmetricsreceiver/README.md
 
 ### Basic configuration for traces
 
@@ -224,7 +224,7 @@ service:
       exporters: [sumologic]
 ```
 
-[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.96.0/receiver/otlpreceiver
+[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.97.0/receiver/otlpreceiver
 
 ### Putting it all together
 
@@ -325,7 +325,7 @@ More information about this feature can be found in the [extension's documentati
 [sumologic_webpage]: https://www.sumologic.com/
 [sumologicextension]: ../pkg/extension/sumologicextension/
 [sumologicexporter]: ../pkg/exporter/sumologicexporter/
-[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.96.0/receiver/hostmetricsreceiver
+[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.97.0/receiver/hostmetricsreceiver
 [sumologicextension_configuration]: ../pkg/extension/sumologicextension#configuration
 [sumologicextension_store_credentials]: ../pkg/extension/sumologicextension/README.md#storing-credentials
 
@@ -531,8 +531,8 @@ Flags: 0
 Example configuration with example log can be found in [/examples/otelcolconfigs/logs_json/](/examples/otelcolconfigs/logs_json/) directory.
 
 [json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
-[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.96.0/receiver/filelogreceiver
-[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.96.0/exporter/debugexporter
+[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.97.0/receiver/filelogreceiver
+[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.97.0/exporter/debugexporter
 
 ## Setting source category
 
@@ -649,7 +649,7 @@ The first example creates a `_sourceCategory` label with a hardcoded value of `d
 The second example creates a `_sourceCategory` label by copying to it the value of Prometheus' `job` label,
 which contains the name of the job - in this case, `otelcol-metrics`.
 
-[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.96.0/receiver/prometheusreceiver/README.md
+[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.97.0/receiver/prometheusreceiver/README.md
 [prometheus_website]: https://prometheus.io/
 [prometheus_relabel_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
 
@@ -705,7 +705,7 @@ service:
       - statsd/another-app
 ```
 
-[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.96.0/processor/resourceprocessor/README.md
+[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.97.0/processor/resourceprocessor/README.md
 
 ## Setting source host
 
@@ -777,8 +777,8 @@ Only the first Resource processor's action is required to correctly set the `_so
 The other two actions perform an optional metadata cleanup - they delete the unneeded attributes.
 
 [sumologic_source_host_docs]: https://help.sumologic.com/docs/send-data/reference-information/metadata-naming-conventions#source-host
-[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.96.0/processor/resourcedetectionprocessor/README.md
-[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.96.0/processor/resourcedetectionprocessor/README.md#system-metadata
+[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.97.0/processor/resourcedetectionprocessor/README.md
+[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.97.0/processor/resourcedetectionprocessor/README.md#system-metadata
 
 ## Command-line configuration options
 
@@ -849,5 +849,5 @@ service:
 # ...
 ```
 
-[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.96.0/processor/metricstransformprocessor
+[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.97.0/processor/metricstransformprocessor
 [prometheus_data_model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels