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

Update OTel libraries to v0.100.0 #208

Merged
merged 13 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 1 addition & 9 deletions .github/header-checker-lint.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
allowedLicenses:
- Apache-2.0
ignoreFiles:
- receiver/**/generated_metrics.go
- receiver/**/generated_metrics_test.go
- receiver/**/generated_config.go
- receiver/**/generated_config_test.go
- receiver/**/generated_status.go
- receiver/**/generated_resource.go
- receiver/**/generated_resource_test.go
- "**/**/generated_*.go"
igorpeshansky marked this conversation as resolved.
Show resolved Hide resolved
- receiver/mongodbreceiver/**/*.go
- receiver/prometheusreceiver/**/*.go
- exporter/googlemanagedprometheusexporter/**/*.go
sourceFileExtensions:
- go
- ps1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
env:
# Default minimum version of Go to support.
DEFAULT_GO_VERSION: 1.20.2
DEFAULT_GO_VERSION: 1.21.10
jobs:
build:
strategy:
Expand Down
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,14 @@ coverage.html
# Wix
*.wixobj
*.wixpdb

## Unwanted Files

# GPU receiver generated component tests

# These generated test files do not work with the "default off" build tag
# approach we use for the GPU receivers. As such we'll simply eschew these
# generated files and copy them manually into files with proper build tags.
# - @braydonk, 2024-05-22
receiver/nvmlreceiver/generated_component_test.go
receiver/dcgmreceiver/generated_component_test.go
17 changes: 12 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ else
LD_FLAGS := -ldflags "${BUILD_X1} ${BUILD_X2}"
endif

GO_ALL_BUILD_TAGS=gpu

TOOLS_DIR := internal/tools

.EXPORT_ALL_VARIABLES:
Expand Down Expand Up @@ -62,14 +64,14 @@ update-components:
grep "^github.com/open-telemetry/opentelemetry-collector-contrib" | \
xargs -t -I '{}' go get {}@$(OTEL_VER)
go mod tidy
cd $(TOOLS_DIR) && go get -u github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@$(OTEL_VER)
cd $(TOOLS_DIR) && go get -u go.opentelemetry.io/collector/cmd/mdatagen@$(OTEL_VER)
cd $(TOOLS_DIR) && go mod tidy

# We can bring this target back when https://github.com/open-telemetry/opentelemetry-collector/issues/8063 is resolved.
update-opentelemetry:
$(MAKE) update-components
$(MAKE) install-tools
$(MAKE) GO_BUILD_TAGS=gpu generate
$(MAKE) generate

# --------------------------
# Tools
Expand All @@ -82,8 +84,9 @@ install-tools:
github.com/client9/misspell/cmd/misspell \
github.com/golangci/golangci-lint/cmd/golangci-lint \
github.com/google/addlicense \
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen \
github.com/google/googet/goopack
go.opentelemetry.io/collector/cmd/mdatagen \
github.com/google/googet/goopack \
golang.org/x/tools/cmd/goimports

.PHONY: addlicense
addlicense:
Expand All @@ -97,6 +100,10 @@ checklicense:
lint:
golangci-lint run --allow-parallel-runners --build-tags=$(GO_BUILD_TAGS) --timeout=20m

.PHONY: lint-fix
lint-fix:
golangci-lint run --fix --allow-parallel-runners --build-tags=$(GO_BUILD_TAGS) --timeout=20m

.PHONY: misspell
misspell:
@output=`misspell -error $(ALL_DOC)` && echo misspell finished successfully || (echo misspell errors:\\n$$output && exit 1)
Expand Down Expand Up @@ -139,7 +146,7 @@ test_verbose:

.PHONY: generate
generate:
go generate ./...
go generate -tags=$(GO_ALL_BUILD_TAGS) ./...

# --------------------
# Docker
Expand Down
1 change: 0 additions & 1 deletion exporter/googlemanagedprometheusexporter/Makefile

This file was deleted.

182 changes: 0 additions & 182 deletions exporter/googlemanagedprometheusexporter/README.md

This file was deleted.

87 changes: 0 additions & 87 deletions exporter/googlemanagedprometheusexporter/config.go

This file was deleted.

Loading
Loading