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

Fix the 1.18.2 release #491

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Fix the 1.18.2 release #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ TOOLS_MOD_DIR := ./tools
# All source code and documents. Used in spell check.
ALL_DOCS := $(shell find . -name '*.md' -type f | sort)
# All directories with go.mod files related to opentelemetry library. Used for building, testing and linting.
ALLINCLUSIVE_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort )
ALL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort))
ALL_MODULES := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' ))
ALL_COVERAGE_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | egrep -v '^./example|^$(TOOLS_MOD_DIR)' | sort)
Expand All @@ -42,6 +43,7 @@ GOTEST_WITH_COVERAGE = $(GOTEST) -coverprofile=coverage.txt -covermode=atomic -c

TOOLS_DIR := $(abspath ./.tools)


$(TOOLS_DIR)/golangci-lint: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go
cd $(TOOLS_MOD_DIR) && \
go build -o $(TOOLS_DIR)/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
Expand Down Expand Up @@ -163,6 +165,12 @@ else
@echo 'ver not defined. call make ver=<version eg 1.2.3> version'
endif

.PHONY: gotidy
gotidy:
@set -e; for dir in $(ALLINCLUSIVE_MODULES); do \
(echo Tidying "$${dir}" && cd $${dir} && go mod tidy ); \
done

.PHONY: add-tag
add-tag:
@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/knadh/koanf v1.5.0 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/lightstep/otel-launcher-go/lightstep/instrumentation v1.18.2 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v0.0.0-00010101000000-000000000000 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
Expand Down
2 changes: 1 addition & 1 deletion lightstep/sdk/metric/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v0.0.0-00010101000000-000000000000 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion lightstep/sdk/metric/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/lightstep/go-expohisto v1.0.0
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v0.0.0-00010101000000-000000000000
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.79.0
go.opentelemetry.io/collector/component v0.79.0
Expand Down
2 changes: 1 addition & 1 deletion lightstep/sdk/trace/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
github.com/f5/otel-arrow-adapter v0.0.0-20230612212022-445aac7c6ae8
github.com/google/go-cmp v0.5.9
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v0.0.0-00010101000000-000000000000
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.79.0
go.opentelemetry.io/collector/component v0.79.0
Expand Down
2 changes: 1 addition & 1 deletion pipelines/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ require (
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v0.0.0-00010101000000-000000000000 // indirect
github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions tools/tag_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ sed -i '' "s/const version.*/const version = \"$VERSION\"/" ./launcher/version.g

(cd pipelines && go get github.com/lightstep/otel-launcher-go/lightstep/sdk/metric@v$VERSION)
(cd pipelines && go get github.com/lightstep/otel-launcher-go/lightstep/instrumentation@v$VERSION)
(cd lightstep/sdk/metric && go get github.com/lightstep/otel-launcher-go/lightstep/sdk/internal@v$VERSION)
(cd lightstep/sdk/trace && go get github.com/lightstep/otel-launcher-go/lightstep/sdk/internal@v$VERSION)
(cd lightstep/sdk/metric/example && go get github.com/lightstep/otel-launcher-go/lightstep/sdk/metric@v$VERSION)

go get github.com/lightstep/otel-launcher-go/pipelines@v$VERSION