Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor for Collector changes #1340

Merged
merged 3 commits into from
May 22, 2024
Merged

Refactor for Collector changes #1340

merged 3 commits into from
May 22, 2024

Conversation

nslaughter
Copy link
Contributor

@nslaughter nslaughter commented May 21, 2024 •
edited
Loading

This PR refactors collector/internal/collector/collector.go to use the most recently updated confmap module, so we can keep deps current.

You'll find all substantive changes in collector.go. The rest of the updates bump versions on the Collector (and contrib) modules.

dependabot bot and others added 2 commits May 21, 2024 19:50
@dependabot
---
5a7e5f4 
updated-dependencies:
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/component
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/converter/expandconverter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/envprovider
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/fileprovider
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/httpprovider
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/yamlprovider
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/otelcol
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/loggingexporter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/otlpexporter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/otlphttpexporter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/extension
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor/batchprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor/memorylimiterprocessor
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/receiver
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/receiver/otlpreceiver
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/consumer
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/component
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/converter/expandconverter
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/envprovider
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/fileprovider
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/httpprovider
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap/provider/yamlprovider
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/otelcol
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/loggingexporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/otlpexporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/exporter/otlphttpexporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/extension
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor/batchprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor/memorylimiterprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/receiver
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/receiver/otlpreceiver
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/consumer
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/component
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/consumer
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/component
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/confmap
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/processor
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/consumer
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
- dependency-name: go.opentelemetry.io/collector
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry-deps-collector
...

Signed-off-by: dependabot[bot] <support@github.com>
@nslaughter
refactor for Collector changes
f60ce72
@nslaughter nslaughter requested a review from a team May 21, 2024 22:32
@tylerbenson tylerbenson merged commit 4955e0c into open-telemetry:main May 22, 2024
12 checks passed
@tylerbenson tylerbenson added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rapphil rapphil rapphil approved these changes

@tylerbenson tylerbenson tylerbenson approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file go Pull requests that update Go code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nslaughter @tylerbenson @rapphil