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.

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

Move tools to internal, create module to avoid dependency problems #2131

Merged
merged 5 commits into from
Nov 19, 2020

Conversation

bogdandrutu
Copy link
Member

This way we avoid dependency conflicts between tools and main codebase.

Signed-off-by: Bogdan Drutu [email protected]

@bogdandrutu bogdandrutu requested a review from a team November 12, 2020 14:34
@codecov
Copy link

codecov bot commented Nov 12, 2020

Codecov Report

Merging #2131 (f1b5712) into master (7761a6e) will decrease coverage by 0.20%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2131      +/-   ##
==========================================
- Coverage   92.23%   92.02%   -0.21%     
==========================================
  Files         280      270      -10     
  Lines       16977    15809    -1168     
==========================================
- Hits        15658    14549    -1109     
+ Misses        904      859      -45     
+ Partials      415      401      -14     
Impacted Files Coverage Δ
translator/conventions/opentelemetry.go 100.00% <ø> (ø)
translator/trace/jaeger/jaegerproto_to_traces.go 90.86% <33.33%> (ø)
internal/goldendataset/resource_generator.go 98.26% <100.00%> (-0.03%) ⬇️
receiver/hostmetricsreceiver/factory.go 86.84% <100.00%> (+0.17%) ⬆️
receiver/receiverhelper/scrapercontroller.go 98.93% <100.00%> (+0.04%) ⬆️
translator/internaldata/oc_to_resource.go 100.00% <100.00%> (ø)
translator/internaldata/resource_to_oc.go 91.54% <100.00%> (+2.81%) ⬆️
internal/collector/telemetry/telemetry.go 90.00% <0.00%> (-4.45%) ⬇️
cmd/mdatagen/metricdata.go
internal/data/testdata/resource.go
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 612c5ba...f1b5712. Read the comment docs.

@@ -15,6 +16,8 @@ ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))))
ALL_DOC := $(shell find . \( -name "*.md" -o -name "*.yaml" \) \
-type f | sort)

TOOLS_MOD_DIR := ./internal/tools
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use TOOLS_MOD_DIR in line 4?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit ugly to have "$(TOOLS_MOD_DIR)/*". Your call, we can do a separate PR.

@tigrannajaryan tigrannajaryan self-assigned this Nov 18, 2020
This way we avoid dependency conflicts between tools and main codebase.

Signed-off-by: Bogdan Drutu <[email protected]>
Signed-off-by: Bogdan Drutu <[email protected]>
Signed-off-by: Bogdan Drutu <[email protected]>
@bogdandrutu bogdandrutu merged commit d885cb2 into open-telemetry:master Nov 19, 2020
@bogdandrutu bogdandrutu deleted the internaltools branch November 19, 2020 17:12
MovieStoreGuy pushed a commit to atlassian-forks/opentelemetry-collector that referenced this pull request Nov 11, 2021
…#2131)

* Fix Jaeger exporter agent port default value and docs

* Update changelog

* Revert example
hughesjj pushed a commit to hughesjj/opentelemetry-collector that referenced this pull request Apr 27, 2023
…#2131)

Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.5.4 to 1.6.0.
- [Release notes](https://github.com/fsnotify/fsnotify/releases)
- [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md)
- [Commits](fsnotify/fsnotify@v1.5.4...v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/fsnotify/fsnotify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants