Fix an issue with the arguments passed to get_version_from_binary

SumoLogic · Dec 3, 2024 · 4217617 · 4217617
1 parent ea9c936
commit 4217617
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
@@ -193,7 +193,7 @@ jobs:
         run: |
           binary=${{ steps.set-binary-name.outputs.binary_name }}
           binary_path=otelcolbuilder/cmd/${binary}
-          ./ci/get_version_from_binary.sh otc "${binary_path}"
+          ./ci/get_version_from_binary.sh core "${binary_path}"
           ./ci/get_version_from_binary.sh sumo "${binary_path}"
 
       - uses: apple-actions/import-codesign-certs@v3

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated.
 |                 [apache][apachereceiver]                 |       [cumulativetodelta][cumulativetodeltaprocessor]        |          [file][fileexporter]          | [bearertokenauth][bearertokenauthextension]  |    [failover][failoverconnector]    |
 |          [awscloudwatch][awscloudwatchreceiver]          |             [deltatorate][deltatorateprocessor]              |         [kafka][kafkaexporter]         |           [db_storage][dbstorage]            |  [roundrobin][roundrobinconnector]  |
 |    [awscontainerinsight][awscontainerinsightreceiver]    | [experimental_metricsgeneration][metricsgenerationprocessor] | [loadbalancing][loadbalancingexporter] |      [docker_observer][dockerobserver]       |     [routing][routingconnector]     |
-| [awsecscontainermetrics][awsecscontainermetricsreceiver] |                  [filter][filterprocessor]                   |      [ecs_observer][ecsobserver]       |    [servicegraph][servicegraphconnector]     |
+| [awsecscontainermetrics][awsecscontainermetricsreceiver] |                  [filter][filterprocessor]                   |      [ecs_observer][ecsobserver]       |    [servicegraph][servicegraphconnector]     |                                     |
 |            [awsfirehose][awsfirehosereceiver]            |            [groupbyattrs][groupbyattrsprocessor]             |          [otlp][otlpexporter]          |     [ecs_task_observer][ecstaskobserver]     | [spanmetrics][spanmetricsconnector] |
 |                [awsxray][awsxrayreceiver]                |            [groupbytrace][groupbytraceprocessor]             |      [otlphttp][otlphttpexporter]      |         [file_storage][filestorage]          |                                     |
 |          [azureeventhub][azureeventhubreceiver]          |                 [`k8s_tagger`][k8sprocessor]                 |    [prometheus][prometheusexporter]    |   [headerssetter][headerssetterextension]    |                                     |
@@ -82,7 +82,7 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated.
 |                 [chrony][chronyreceiver]                 |           [memory_limiter][memorylimiterprocessor]           |           [nop][nopexporter]           |       [http_forwarder][httpforwarder]        |                                     |
 |             [cloudflare][cloudflarereceiver]             |        [`metric_frequency`][metricfrequencyprocessor]        |                                        | [jaegerremotesampling][jaegerremotesampling] |                                     |
 |           [cloudfoundry][cloudfoundryreceiver]           |        [metricstransform][metricstransformprocessor]         |                                        |         [k8s_observer][k8sobserver]          |                                     |
-|               [collectd][collectdreceiver]               |    [probabilistic_sampler][probabilisticsamplerprocessor]    |                                        |
+|               [collectd][collectdreceiver]               |    [probabilistic_sampler][probabilisticsamplerprocessor]    |                                        |                                              |                                     |
 |                [couchdb][couchdbreceiver]                |               [redaction][redactionprocessor]                |                                        |  [oauth2client][oauth2clientauthextension]   |                                     |
 |                [datadog][datadogreceiver]                |               [remotetap][remotetapprocessor]                |                                        |          [oidc][oidcauthextension]           |                                     |
 |           [docker_stats][dockerstatsreceiver]            |                [resource][resourceprocessor]                 |                                        |           [pprof][pprofextension]            |                                     |

diff --git a/ci/get_version_from_binary.sh b/ci/get_version_from_binary.sh
@@ -53,7 +53,7 @@ parse_version() {
 
     output="$(${binary_path} --version)"
 
-    regex="otelcol-sumo version ([0-9]+)\.([0-9]+)\.([0-9]+)\-sumo\-([0-9]+).*"
+    regex="otelcol-sumo version v?([0-9]+)\.([0-9]+)\.([0-9]+)\-sumo\-([0-9]+).*"
 
     if [[ $output =~ $regex ]]; then
         major_version="${BASH_REMATCH[1]}"