Merge branch 'main' into j_config_merge_override

SumoLogic · Oct 17, 2024 · b238169 · b238169
2 parents 975f321 + 8c4f441
commit b238169
Show file tree

Hide file tree

Showing 60 changed files with 2,245 additions and 2,528 deletions.
diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
@@ -91,7 +91,7 @@ jobs:
             runs-on: ubuntu-20.04
             boringcrypto: true
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: windows_amd64
             runs-on: windows-2022
     with:
@@ -112,7 +112,7 @@ jobs:
             runs-on: ubuntu-20.04
             boringcrypto: true
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
     with:
       arch_os: ${{ matrix.arch_os }}
       runs-on: ${{ matrix.runs-on }}
@@ -138,9 +138,9 @@ jobs:
             runs-on: ubuntu-20.04
             fips: true
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: windows_amd64
             runs-on: windows-2022
           - arch_os: windows_amd64
@@ -171,9 +171,9 @@ jobs:
       matrix:
         include:
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: linux_amd64
             runs-on: ubuntu-20.04
           - arch_os: linux_amd64

diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -148,7 +148,7 @@ jobs:
             runs-on: ubuntu-20.04
             boringcrypto: true
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: windows_amd64
             runs-on: windows-2022
     with:
@@ -168,7 +168,7 @@ jobs:
             runs-on: ubuntu-20.04
             boringcrypto: true
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
     with:
       arch_os: ${{ matrix.arch_os }}
       runs-on: ${{ matrix.runs-on }}
@@ -261,9 +261,9 @@ jobs:
           - arch_os: linux_arm64
             runs-on: ubuntu-20.04
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: windows_amd64
             runs-on: windows-2022
           - arch_os: windows_amd64
@@ -291,9 +291,9 @@ jobs:
       matrix:
         include:
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: linux_amd64
             runs-on: ubuntu-20.04
           - arch_os: linux_amd64

diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml
@@ -55,9 +55,9 @@ jobs:
             runs-on: ubuntu-20.04
             fips: true
           - arch_os: darwin_amd64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: darwin_arm64
-            runs-on: macos-latest
+            runs-on: macos-15
           - arch_os: windows_amd64
             runs-on: windows-2022
           - arch_os: windows_amd64

diff --git a/.github/workflows/workflow-trigger-packaging.yml b/.github/workflows/workflow-trigger-packaging.yml
@@ -65,3 +65,9 @@ jobs:
       # packaging workflow has completed.
       - name: Packaging Workflow URL
         run: echo ::notice title=Packaging Workflow URL::https://github.com/SumoLogic/sumologic-otel-collector-packaging/actions/workflows/build_packages.yml
+      - name: Workflow ID
+        run: echo ::notice title=Workflow ID::${{ inputs.workflow_id }}
+      - name: OTC Version
+        run: echo ::notice title=OTC Version::${{ steps.version-core.outputs.version }}
+      - name: OTC Sumo Version
+        run: echo ::notice title=OTC Sumo Version::${{ steps.sumo-version.outputs.version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes -->
 
+## [v0.108.0-sumo-0]
+
+### Released 2024-10-03
+
+### Changed
+
+- chore: Upgraded otel core to 0.108.0 [#1678]
+
+### Fixed
+
+- Remove unnecessary warnings from the k8s tagger [#1681]
+
+[#1678]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1678
+[#1681]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1681
+
+[v0.108.0-sumo-0]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.108.0-sumo-0
+
 ## [v0.106.1-sumo-1]
 
 ### Released 2024-09-11
@@ -16,7 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix(version): Fixing the changelog and version for otel collector [#1674]
 
 [#1674]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1674
-[v0.106.1-sumo-1]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.106.1-sumo-1## [v0.106.1-sumo-0]
+
+[v0.106.1-sumo-1]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.106.1-sumo-1
 
 ## [v0.106.1-sumo-0]
 
@@ -40,7 +58,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#1662]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1662
 [#1660]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1660
 
-[v0.106.1-sumo-0]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.106.1-sumo-0## [v0.104.0-sumo-1]
+[v0.106.1-sumo-0]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.106.1-sumo-0
+
+## [v0.104.0-sumo-1]
 
 ### Released 2024-08-12
 
@@ -59,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#1652]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1652
 [#1653]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1653
 [#1654]: https://github.com/SumoLogic/sumologic-otel-collector/pull/1654
+
 [v0.104.0-sumo-1]: https://github.com/SumoLogic/sumologic-otel-collector/releases/v0.104.0-sumo-1
 
 ## [v0.104.0-sumo-0]