Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 4, 2025

Proposed commit message

This PR replaces deprecated mitchellh dependencies.

  • github.com/mitchellh/mapstructure migrated to github.com/go-viper/mapstructure/v2
  • github.com/mitchellh/hashstructure migrated to github.com/gohugoio/hashstructure

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test

$ rg mitchellh go.mod
105:    github.com/mitchellh/gox v1.0.1
376:    github.com/mitchellh/copystructure v1.2.0 // indirect
377:    github.com/mitchellh/go-homedir v1.1.0 // indirect
378:    github.com/mitchellh/iochan v1.0.0 // indirect
379:    github.com/mitchellh/mapstructure v1.5.0 // indirect
380:    github.com/mitchellh/reflectwalk v1.0.2 // indirect

Gox is the only remaining direct dependency, but it has no blessed fork and is a tool. Turns out we don't need gox, it will be removed in #45555.

Related issues


This is an automatic backport of pull request #45376 done by [Mergify](https://mergify.com).

* chore: replace mitchellh dependencies

* replace mitchellh/hashstructure

* update NOTICE.txt

* update hashes for timeseries

(cherry picked from commit 8d8fd70)

# Conflicts:
#	go.mod
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 4, 2025
@mergify mergify bot requested review from a team as code owners August 4, 2025 13:59
@mergify mergify bot added the backport label Aug 4, 2025
@mergify mergify bot requested review from a team as code owners August 4, 2025 13:59
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Aug 4, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2025

Cherry-pick of 8d8fd70 has failed:

On branch mergify/bp/9.1/pr-45376
Your branch is up to date with 'origin/9.1'.

You are currently cherry-picking commit 8d8fd702e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   dev-tools/mage/pkgtypes.go
	modified:   filebeat/beater/crawler.go
	modified:   filebeat/fileset/factory.go
	modified:   filebeat/input/file/identifier.go
	modified:   filebeat/input/v2/compat/compat.go
	modified:   go.sum
	modified:   heartbeat/monitors/monitor.go
	modified:   heartbeat/monitors/wrappers/wrappers.go
	modified:   libbeat/cfgfile/glob_watcher.go
	modified:   libbeat/cfgfile/list.go
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel.go
	modified:   libbeat/processors/ratelimit/rate_limit.go
	modified:   libbeat/processors/timeseries/timeseries.go
	modified:   libbeat/processors/timeseries/timeseries_test.go
	modified:   metricbeat/beater/metricbeat.go
	modified:   metricbeat/helper/prometheus/ptest/ptest.go
	modified:   metricbeat/mb/testing/testdata.go
	modified:   metricbeat/module/haproxy/haproxy.go
	modified:   metricbeat/module/kubernetes/kubernetes.go
	modified:   metricbeat/module/system/service/service.go
	modified:   packetbeat/beater/processor.go
	modified:   x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go
	modified:   x-pack/filebeat/input/gcppubsub/input.go
	modified:   x-pack/libbeat/common/otelbeat/status/runner.go
	modified:   x-pack/metricbeat/module/containerd/containerd.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from faec and mauri870 and removed request for a team August 4, 2025 13:59
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 4, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@github-actions github-actions bot added Team:obs-ds-hosted-services Label for the Observability Hosted Services team cleanup Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team labels Aug 4, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@elasticmachine
Copy link
Contributor

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@elasticmachine
Copy link
Contributor

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 4, 2025
@mauri870 mauri870 merged commit 888744b into 9.1 Aug 5, 2025
205 of 208 checks passed
@mauri870 mauri870 deleted the mergify/bp/9.1/pr-45376 branch August 5, 2025 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport cleanup conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants