Skip to content

Commit 4922ce3

Browse files
azure-monitor-assistant[bot]github-actions[bot]gracewehnerrashmichandrashekar
authored
build(deps): Upgrade otelcollector to v0.131.0 (#1257)
This PR upgrades the otelcollector to the latest version available for the opentelemetry-collector and opentelemetry-operator. It was automatically generated by the GitHub Actions workflow. The summary of the OSS changelog is below: # Prometheusreceiver Changes ## v0.127.0 to v0.131.0 Generated on: 2025-08-04 17:36:24 --- ### v0.131.0 - [**FEATURE**] `prometheusreceiver`: Add retry logic for connection refused errors so the collector doesn't crash at startup. ([#40982](open-telemetry/opentelemetry-collector-contrib#40982)) This change adds retry logic for connection refused errors. The target allocator could be busy starting up the receiver and the first connection attempt may fail. - [**FEATURE**] `receiver/prometheus`: Add support for otel_scope_schema_url label mapping to OpenTelemetry ScopeMetrics schema URL field ([#41488](open-telemetry/opentelemetry-collector-contrib#41488)) - [**FEATURE**] `receiver/prometheusremotewrite`: Add support for Native Histogram Custom Buckets (NHCB). ([#41043](open-telemetry/opentelemetry-collector-contrib#41043)) - [**BUG FIX**] `receiver/prometheus`: Fix otel_scope_name and otel_scope_version labels not being dropped from metric attributes ([#41456](open-telemetry/opentelemetry-collector-contrib#41456)) ### v0.130.0 - [**BUG FIX**] `receiver/prometheusreceiver`: Fixes masking of authentication credentials in Prometheus receiver, when reloading the Prometheus config. ([#40520](open-telemetry/opentelemetry-collector-contrib#40520), [#40916](open-telemetry/opentelemetry-collector-contrib#40916)) - [**BUG FIX**] `receiver/prometheusremotewrite`: Handle metrics with unspecified types without panicking. ([#41005](open-telemetry/opentelemetry-collector-contrib#41005)) ### v0.129.0 - [**FEATURE**] `prometheusreceiver`: Promote the receiver.prometheusreceiver.RemoveLegacyResourceAttributes featuregate to stable ([#40572](open-telemetry/opentelemetry-collector-contrib#40572)) It has been beta since v0.126.0 - [**BUG FIX**] `prometheusreceiver`: Fix invalid metric name validation error in scrape start from target allocator. ([#35459](open-telemetry/opentelemetry-collector-contrib#35459), [#40788](open-telemetry/opentelemetry-collector-contrib#40788)) Prometheus made setting metric_name_validation_scheme, metric_name_escaping_scheme mandatory mandatory, use sane defaults. ## Summary | Category | Count | |----------|-------| | Breaking Changes | 0 | | Features | 4 | | Bug Fixes | 4 | | Other Changes | 0 | | **Total** | **8** | # Target-allocator Changes ## v0.127.0 to v0.131.0 Generated on: 2025-08-04 17:36:38 --- ### 0.131.0 - [**FEATURE**] `manager, target-allocator, opamp-bridge, must-gather`: add -trimpath when building binaries ([#4078](open-telemetry/opentelemetry-operator#4078)) - [**FEATURE**] `collector, targer allocator, opamp`: Require Go 1.24+ to build the collector, target allocator, and opamp. ([#4173](open-telemetry/opentelemetry-operator#4173)) - [**BUG FIX**] `target allocator`: check CRD availability before registering informers ([#3987](open-telemetry/opentelemetry-operator#3987)) - [**BUG FIX**] `target allocator`: Allow collector to use TLS Config from Target Allocator with ScrapeConfig ([#3724](open-telemetry/opentelemetry-operator#3724)) This change allows the target allocator to configure TLS Config for a collector using the ScrapeConfig. ### 0.129.1 - [**BREAKING**] `targetallocator, collector`: Remove stable feature gate PrometheusOperatorIsAvailable ([#4141](open-telemetry/opentelemetry-operator#4141)) - [**FEATURE**] `target allocator`: Adds support for HTML output in the target allocator. ([#3622](open-telemetry/opentelemetry-operator#3622)) - [**BUG FIX**] `target allocator`: ensure stable iteration order of target labels when generating hash ([#4082](open-telemetry/opentelemetry-operator#4082)) - [**BUG FIX**] `target allocator`: Fix OpenShift must-gather for Target Allocator ([#4084](open-telemetry/opentelemetry-operator#4084)) ## Summary | Category | Count | |----------|-------| | Breaking Changes | 1 | | Features | 3 | | Bug Fixes | 4 | | Other Changes | 0 | | **Total** | **8** | --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Grace Wehner <[email protected]> Co-authored-by: rashmichandrashekar <[email protected]>
1 parent 5c05631 commit 4922ce3

File tree

108 files changed

+5910
-3086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+5910
-3086
lines changed

‎.pipelines/azure-pipeline-build.yml‎

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ variables:
2727
IS_OTEL_UPGRADE_BRANCH: $[startsWith(variables['Build.SourceBranchName'], 'otelcollector-upgrade-')]
2828
BUILD_WINDOWS: true
2929
Codeql.Enabled: true
30-
GOLANG_VERSION: '1.23.12'
31-
FLUENTBIT_GOLANG_VERSION: '1.24.4'
30+
GOLANG_VERSION: '1.24.6'
31+
FLUENTBIT_GOLANG_VERSION: '1.24.6'
3232
TESTKUBE_GOLANG_VERSION: '1.23.10'
3333
FLUENT_BIT_VERSION: '3.2.2'
3434
PROMETHEUS_VERSION: '3.2.1'
@@ -2173,7 +2173,7 @@ extends:
21732173
echo "Images are not published to mcr within the timeout"
21742174
exit 1
21752175
displayName: "Check images are pushed to dev MCR"
2176-
retryCountOnTaskFailure: 5
2176+
retryCountOnTaskFailure: 2
21772177
- bash: |
21782178
export AKS_REGION="eastus"
21792179
export AKS_RESOURCE_ID="/subscriptions/9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb/resourceGroups/ci-dev-aks-mac-eus-rg/providers/Microsoft.ContainerService/managedClusters/ci-dev-aks-mac-eus"
@@ -2259,7 +2259,7 @@ extends:
22592259
echo "Images are not published to mcr within the timeout"
22602260
exit 1
22612261
displayName: "Check images are pushed to dev MCR"
2262-
retryCountOnTaskFailure: 5
2262+
retryCountOnTaskFailure: 2
22632263
- bash: |
22642264
export AKS_REGION="centralus"
22652265
export AKS_RESOURCE_ID="/subscriptions/9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb/resourcegroups/ci-dev-aks-tests/providers/Microsoft.ContainerService/managedClusters/ci-dev-aks-tests"
@@ -2332,7 +2332,7 @@ extends:
23322332
echo "Images are not published to mcr within the timeout"
23332333
exit 1
23342334
displayName: "Check images are pushed to dev MCR"
2335-
retryCountOnTaskFailure: 5
2335+
retryCountOnTaskFailure: 2
23362336
- bash: |
23372337
export AKS_REGION="westus3"
23382338
export AKS_RESOURCE_ID="/subscriptions/9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb/resourceGroups/ciprom-dev-aks-otlp/providers/Microsoft.ContainerService/managedClusters/ciprom-dev-aks-otlp"
@@ -2374,7 +2374,7 @@ extends:
23742374
- deployment: Deploy_AKS_Chart_OTel_Upgrade_Cluster
23752375
displayName: "Deploy: AKS OTel Upgrade cluster"
23762376
environment: Prometheus-Collector
2377-
condition: eq(variables.IS_OTEL_UPGRADE_BRANCH, true)
2377+
condition: and(succeeded(), eq(variables.IS_OTEL_UPGRADE_BRANCH, true))
23782378
variables:
23792379
HELM_CHART_NAME: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.HELM_CHART_NAME'] ]
23802380
HELM_SEMVER: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.SEMVER'] ]
@@ -2384,6 +2384,13 @@ extends:
23842384
IMAGE_TAG_TARGET_ALLOCATOR: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.TARGET_ALLOCATOR_IMAGE_TAG'] ]
23852385
IMAGE_TAG_CONFIG_READER: $[ stageDependencies.Build.Image_Tags_and_Ev2_Artifacts.outputs['setup.LINUX_CONFIG_READER_IMAGE_TAG'] ]
23862386
skipComponentGovernanceDetection: true
2387+
templateContext:
2388+
type: releaseJob
2389+
isProduction: false
2390+
inputs:
2391+
- input: pipelineArtifact
2392+
artifactName: dev-cluster-helm-chart
2393+
targetPath: $(Pipeline.Workspace)
23872394
strategy:
23882395
runOnce:
23892396
deploy:
@@ -2393,13 +2400,6 @@ extends:
23932400
inputs:
23942401
helmVersionToInstall: 3.12.3
23952402
- bash: |
2396-
2397-
RETINA_VERSION=$( curl -sL https://api.github.com/repos/microsoft/retina/releases/latest | jq -r .name)
2398-
echo "##vso[task.setvariable variable=RETINA_VERSION]$RETINA_VERSION"
2399-
echo $RETINA_VERSION
2400-
helm pull oci://ghcr.io/microsoft/retina/charts/retina --version $RETINA_VERSION --untar --untardir $(Build.SourcesDirectory)/otelcollector/deploy/retina/chart
2401-
mv $(Build.SourcesDirectory)/otelcollector/deploy/retina/custom-files/network-observability-service.yaml $(Build.SourcesDirectory)/otelcollector/deploy/retina/chart/retina/templates/
2402-
24032403
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
24042404
do
24052405
sleep 30
@@ -2417,14 +2417,14 @@ extends:
24172417
echo "Images are not published to mcr within the timeout"
24182418
exit 1
24192419
displayName: "Check images are pushed to dev MCR"
2420-
retryCountOnTaskFailure: 5
2420+
retryCountOnTaskFailure: 2
24212421
- bash: |
24222422
export AKS_REGION="westus3"
24232423
export AKS_RESOURCE_ID="/subscriptions/9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb/resourceGroups/ciprom-upgrade-bot/providers/Microsoft.ContainerService/managedClusters/ciprom-upgrade-bot"
24242424
export ARC_EXTENSION="false"
2425-
envsubst < $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart-template.yaml > $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml && envsubst < $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml > $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml
2426-
ls $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon
2427-
cd $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon
2425+
envsubst < $(Pipeline.Workspace)/azure-monitor-metrics-addon/Chart-template.yaml > $(Pipeline.Workspace)/azure-monitor-metrics-addon/Chart.yaml && envsubst < $(Pipeline.Workspace)/azure-monitor-metrics-addon/values-template.yaml > $(Pipeline.Workspace)/azure-monitor-metrics-addon/values.yaml
2426+
ls $(Pipeline.Workspace)/azure-monitor-metrics-addon
2427+
cd $(Pipeline.Workspace)/azure-monitor-metrics-addon
24282428
helm dependency update
24292429
displayName: "Build: substitute chart version for 3p in Chart.yaml and values.yaml"
24302430
- task: HelmDeploy@0
@@ -2437,10 +2437,10 @@ extends:
24372437
namespace: 'default'
24382438
command: 'upgrade'
24392439
chartType: 'FilePath'
2440-
chartPath: '$(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/'
2440+
chartPath: '$(Pipeline.Workspace)/azure-monitor-metrics-addon/'
24412441
releaseName: 'ama-metrics'
24422442
waitForExecution: false
2443-
arguments: --dependency-update --values $(Build.SourcesDirectory)/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml
2443+
arguments: --dependency-update --values $(Pipeline.Workspace)/azure-monitor-metrics-addon/values.yaml
24442444
- task: HelmDeploy@1
24452445
displayName: "Deploy: retina onto ciprom-upgrade-bot cluster"
24462446
inputs:
@@ -2451,10 +2451,10 @@ extends:
24512451
namespace: 'kube-system'
24522452
command: 'upgrade'
24532453
chartType: 'FilePath'
2454-
chartPath: '$(Build.SourcesDirectory)/otelcollector/deploy/retina/chart/retina'
2454+
chartPath: '$(Pipeline.Workspace)/retina'
24552455
releaseName: 'retina'
24562456
waitForExecution: false
2457-
arguments: --install --values $(Build.SourcesDirectory)/otelcollector/deploy/retina/chart/retina/values.yaml --skip-crds --version $(RETINA_VERSION) --set operator.enabled=true --set enabledPlugin_linux="\[dropreason\,packetforward\,linuxutil\,dns\,packetparser\]" --set logLevel=info --set operator.enableRetinaEndpoint=true --set image.tag=$(RETINA_VERSION) --set operator.tag=$(RETINA_VERSION) --set tolerations[0].key=CriticalAddonsOnly --set tolerations[0].operator=Exists --set tolerations[1].operator=Exists --set tolerations[1].effect=NoExecute --set tolerations[2].operator=Exists --set tolerations[2].effect=NoSchedule
2457+
arguments: --install --values $(Pipeline.Workspace)/retina/values.yaml --skip-crds --version $(RETINA_VERSION) --set operator.enabled=true --set enabledPlugin_linux="\[dropreason\,packetforward\,linuxutil\,dns\,packetparser\]" --set logLevel=info --set operator.enableRetinaEndpoint=true --set image.tag=$(RETINA_VERSION) --set operator.tag=$(RETINA_VERSION) --set tolerations[0].key=CriticalAddonsOnly --set tolerations[0].operator=Exists --set tolerations[1].operator=Exists --set tolerations[1].effect=NoExecute --set tolerations[2].operator=Exists --set tolerations[2].effect=NoSchedule
24582458

24592459
- deployment: Testkube
24602460
displayName: "Test: AKS testkube tests"
@@ -2490,6 +2490,7 @@ extends:
24902490
export BUILD_BUILDID="$(Build.BuildId)"
24912491
export SYSTEM_JOBID="$(System.JobId)"
24922492
export SYSTEM_TASKINSTANCEID="$(System.TaskInstanceId)"
2493+
chmod +x ./testkube/run-testkube-workflow.sh
24932494
./testkube/run-testkube-workflow.sh \
24942495
"https://ci-dev-aks-eus-mac-mih6.eastus.prometheus.monitor.azure.com" \
24952496
"c7f895bb-c4f6-45af-be82-2273a424e237" \
@@ -2498,7 +2499,7 @@ extends:
24982499
"" \
24992500
"" \
25002501
"AKS"
2501-
workingDirectory: $(Pipeline.Workspace)/testkube-test-files
2502+
workingDirectory: $(Pipeline.Workspace)
25022503
displayName: "Run TestKube workflow"
25032504
continueOnError: true
25042505
- bash: |
@@ -2549,6 +2550,7 @@ extends:
25492550
export BUILD_BUILDID="$(Build.BuildId)"
25502551
export SYSTEM_JOBID="$(System.JobId)"
25512552
export SYSTEM_TASKINSTANCEID="$(System.TaskInstanceId)"
2553+
chmod +x ./testkube/run-testkube-workflow.sh
25522554
./testkube/run-testkube-workflow.sh \
25532555
"https://ci-prom-dev-aks-otlp-geaqdgeuapfeh8b2.westus3.prometheus.monitor.azure.com" \
25542556
"6b8f6333-ecd0-4579-b05d-afc98a103a59" \
@@ -2608,6 +2610,7 @@ extends:
26082610
export BUILD_BUILDID="$(Build.BuildId)"
26092611
export SYSTEM_JOBID="$(System.JobId)"
26102612
export SYSTEM_TASKINSTANCEID="$(System.TaskInstanceId)"
2613+
chmod +x ./testkube/run-testkube-workflow.sh
26112614
./testkube/run-testkube-workflow.sh \
26122615
"https://ci-dev-arc-amw-p3eu.eastus.prometheus.monitor.azure.com" \
26132616
"5f13547e-a4e2-4efd-85fe-a2b03d5b8661" \
@@ -2616,7 +2619,7 @@ extends:
26162619
"" \
26172620
"" \
26182621
"ARC"
2619-
workingDirectory: $(Pipeline.Workspace)/testkube-test-files
2622+
workingDirectory: $(Pipeline.Workspace)
26202623
displayName: "Run TestKube workflow"
26212624
continueOnError: true
26222625
- bash: |
@@ -2663,10 +2666,12 @@ extends:
26632666
scriptLocation: 'inlineScript'
26642667
inlineScript: 'az aks get-credentials --resource-group ciprom-upgrade-bot --name ciprom-upgrade-bot'
26652668
- bash: |
2669+
echo "bot/$(Build.SourceBranchName)"
26662670
export BUILD_ARTIFACTSTAGINGDIRECTORY="$(Build.ArtifactStagingDirectory)"
26672671
export BUILD_BUILDID="$(Build.BuildId)"
26682672
export SYSTEM_JOBID="$(System.JobId)"
26692673
export SYSTEM_TASKINSTANCEID="$(System.TaskInstanceId)"
2674+
chmod +x ./testkube/run-testkube-workflow.sh
26702675
./testkube/run-testkube-workflow.sh \
26712676
"https://ciprom-upgrade-bot-e4c4gvcgcqd7awhw.westus3.prometheus.monitor.azure.com" \
26722677
"3bf21bd6-3dd9-449d-8f17-5f3b1a61ecd6" \
@@ -2675,14 +2680,14 @@ extends:
26752680
"" \
26762681
"" \
26772682
"OTelCollector-Upgrade" \
2678-
"$(System.PullRequest.SourceBranch)"
2679-
workingDirectory: $(Pipeline.Workspace)/testkube-test-files
2683+
"bot/$(Build.SourceBranchName)"
2684+
workingDirectory: $(Pipeline.Workspace)
26802685
displayName: "Run TestKube workflow"
26812686
continueOnError: true
26822687
- bash: |
2683-
if [ -f "$(Build.ArtifactStagingDirectory)/testkube-results-Otel-Upgrade.json" ]; then
2688+
if [ -f "$(Build.ArtifactStagingDirectory)/testkube-results-OTelCollector-Upgrade.json" ]; then
26842689
# Read the JSON content and set it as a pipeline variable
2685-
TESTKUBE_RESULTS_UPGRADE=$(cat "$(Build.ArtifactStagingDirectory)/testkube-results-Otel-Upgrade.json" | jq -c .)
2690+
TESTKUBE_RESULTS_UPGRADE=$(cat "$(Build.ArtifactStagingDirectory)/testkube-results-OTelCollector-Upgrade.json" | jq -c .)
26862691
echo "##vso[task.setvariable variable=TESTKUBE_RESULTS_UPGRADE;isoutput=true]$TESTKUBE_RESULTS_UPGRADE"
26872692
echo "TestKube Upgrade results set as pipeline variable"
26882693
else
@@ -2708,6 +2713,13 @@ extends:
27082713
TESTKUBE_RESULTS_ARC: $[ dependencies.Testkube_ARC.outputs['testkube_results.TESTKUBE_RESULTS_ARC'] ]
27092714
TESTKUBE_RESULTS_AKS: $[ dependencies.Testkube.outputs['testkube_results.TESTKUBE_RESULTS_AKS'] ]
27102715
TESTKUBE_RESULTS_OTEL: $[ dependencies.Testkube_OTel.outputs['testkube_results.TESTKUBE_RESULTS_OTEL'] ]
2716+
templateContext:
2717+
type: releaseJob
2718+
isProduction: false
2719+
inputs:
2720+
- input: pipelineArtifact
2721+
artifactName: testkube-test-files
2722+
targetPath: $(Pipeline.Workspace)
27112723
steps:
27122724
- bash: |
27132725
# Create results directory and write pipeline variables to JSON files
@@ -2747,8 +2759,9 @@ extends:
27472759
export BUILD_SOURCEVERSIONMESSAGE="$(Build.SourceVersionMessage)"
27482760
export BUILD_SOURCEBRANCHNAME="$(Build.SourceBranchName)"
27492761
export BUILD_BUILDNUMBER="$(Build.BuildNumber)"
2762+
chmod +x ./testkube/send-testkube-summary.sh
27502763
./testkube/send-testkube-summary.sh $(TEAMS_WEBHOOK_URL) $(Pipeline.Workspace)/testkube-results
2751-
workingDirectory: $(Pipeline.Workspace)/testkube-test-files
2764+
workingDirectory: $(Pipeline.Workspace)
27522765
displayName: "Send TestKube Summary Notification"
27532766
27542767
- job: TestKube_Notification_OTelCollector_Upgrade
@@ -2763,6 +2776,13 @@ extends:
27632776
variables:
27642777
skipComponentGovernanceDetection: true
27652778
TESTKUBE_RESULTS_UPGRADE: $[ dependencies.Testkube_OTel_Upgrade.outputs['testkube_results.TESTKUBE_RESULTS_UPGRADE'] ]
2779+
templateContext:
2780+
type: releaseJob
2781+
isProduction: false
2782+
inputs:
2783+
- input: pipelineArtifact
2784+
artifactName: testkube-test-files
2785+
targetPath: $(Pipeline.Workspace)
27662786
steps:
27672787
- bash: |
27682788
# Create results directory and write pipeline variables to JSON files
@@ -2786,6 +2806,7 @@ extends:
27862806
export BUILD_SOURCEVERSIONMESSAGE="$(Build.SourceVersionMessage)"
27872807
export BUILD_SOURCEBRANCHNAME="$(Build.SourceBranchName)"
27882808
export BUILD_BUILDNUMBER="$(Build.BuildNumber)"
2809+
chmod +x ./testkube/send-testkube-summary.sh
27892810
./testkube/send-testkube-summary.sh $(TEAMS_WEBHOOK_URL) $(Pipeline.Workspace)/testkube-results
2790-
workingDirectory: $(Pipeline.Workspace)/testkube-test-files
2811+
workingDirectory: $(Pipeline.Workspace)
27912812
displayName: "Send TestKube Summary Notification"

‎.trivyignore‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1+
# This file contains CVEs to be ignored by Trivy
2+
# Auto-generated on Mon Aug 4 17:43:16 UTC 2025
3+
14
# CRITICAL
25

36
# HIGH
47
# kube-state-metrics
5-
CVE-2024-33599
6-
CVE-2024-33601
8+
CVE-2024-33599 #
9+
CVE-2024-33601 #
710

811
# MEDIUM
9-
# prometheusui
10-
CVE-2025-22872 # golang.org/x/net
11-
GHSA-fv92-fjc5-jj9h
1212
# kube-state-metrics
13-
CVE-2023-4527
14-
CVE-2023-4806
15-
CVE-2024-33600
13+
CVE-2023-4527 #
14+
CVE-2023-4806 #
15+
CVE-2024-33600 #
16+
# otelcollector
17+
CVE-2025-54388 # github.com/docker/docker
18+
# promconfigvalidator
19+
CVE-2025-54388 # github.com/docker/docker
20+
21+
# LOW
22+
# kube-state-metrics
1623

17-
# LOW

‎OPENTELEMETRY_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.127.0
1+
v0.131.0

‎TARGETALLOCATOR_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.127.0
1+
v0.131.0

‎internal/otel-upgrade-scripts/upgrade.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,25 @@ echo "PrometheusUI Test Prometheus dependencies updated successfully."
433433

434434
cd "$CURRENT_DIR"
435435

436+
# Step 7.3: Run go mod tidy in all test/ginkgo-e2e subdirectories
437+
echo "Running go mod tidy in all test/ginkgo-e2e subdirectories..."
438+
439+
# Start with utils directory
440+
echo "Running go mod tidy in utils directory..."
441+
cd "$CURRENT_DIR/otelcollector/test/ginkgo-e2e/utils"
442+
go mod tidy
443+
cd "$CURRENT_DIR"
444+
445+
# Get all subdirectories except utils
446+
for dir in $(find "$CURRENT_DIR/otelcollector/test/ginkgo-e2e" -maxdepth 1 -type d | grep -v "/utils$" | grep -v "^$CURRENT_DIR/otelcollector/test/ginkgo-e2e$"); do
447+
echo "Running go mod tidy in $(basename $dir) directory..."
448+
cd "$dir"
449+
go mod tidy
450+
cd "$CURRENT_DIR"
451+
done
452+
453+
echo "Completed go mod tidy in all test/ginkgo-e2e subdirectories"
454+
436455
# Step 8: Update golang version in azure-pipeline-build.yaml using highest version
437456
echo "Updating golang version in azure-pipeline-build.yaml..."
438457

‎otelcollector/configuration-reader-builder/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
4848
github.com/onsi/gomega v1.36.2 // indirect
4949
github.com/prometheus/client_model v0.6.2 // indirect
50-
github.com/prometheus/common v0.64.0 // indirect
50+
github.com/prometheus/common v0.65.0 // indirect
5151
github.com/x448/float16 v0.8.4 // indirect
5252
golang.org/x/net v0.40.0 // indirect
5353
golang.org/x/oauth2 v0.30.0 // indirect

‎otelcollector/configuration-reader-builder/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
6060
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
6161
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
6262
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
63-
github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
64-
github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
63+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
64+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
6565
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
6666
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
6767
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=

0 commit comments

Comments
 (0)