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

update dependencies to 0.10.0, fix release tooling #11

Merged
merged 3 commits into from
Aug 6, 2020
Merged

update dependencies to 0.10.0, fix release tooling #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
108da2f
update dependencies to 0.10.0, fix release tooling
Aug 6, 2020
3719e57
fix test
Aug 6, 2020
01d6c78
fix go.sum
Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## Unreleased

## 0.10.0

- Update OpenTelemetry dependencies to 0.10.0

## 0.0.1

- Initial release
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,11 @@ license-check:

# When releasing significant changes, make sure to update the semantic
# version number in `./VERSION`, merge changes, then run `make release_tag`.
.PHONY: version
version:
ifdef ver
@echo 'Setting version to $(ver)'
@./tag_version.sh $(ver)
@./tools/tag_version.sh $(ver)
else
@echo 'ver not defined. call make ver=<version eg 1.2.3> version'
endif
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.1
0.10.0
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ go 1.14
require (
github.com/sethvargo/go-envconfig v0.1.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.4.0
go.opentelemetry.io/otel v0.9.0
go.opentelemetry.io/otel/exporters/otlp v0.9.0
go.opentelemetry.io/collector v0.7.0
go.opentelemetry.io/otel v0.10.0
go.opentelemetry.io/otel/exporters/otlp v0.10.0
go.opentelemetry.io/otel/sdk v0.10.0
google.golang.org/grpc v1.30.0
)
1,197 changes: 604 additions & 593 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions launcher/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func TestConfigureResourcesAttributes(t *testing.T) {
kv.String("service.version", "test-version"),
kv.String("telemetry.sdk.language", "go"),
kv.String("telemetry.sdk.name", "launcher"),
kv.String("telemetry.sdk.version", "0.0.1"),
kv.String("telemetry.sdk.version", version),
}
assert.Equal(t, expected, resource.Attributes())

Expand All @@ -321,7 +321,7 @@ func TestConfigureResourcesAttributes(t *testing.T) {
kv.String("service.version", "test-version"),
kv.String("telemetry.sdk.language", "go"),
kv.String("telemetry.sdk.name", "launcher"),
kv.String("telemetry.sdk.version", "0.0.1"),
kv.String("telemetry.sdk.version", version),
}
assert.Equal(t, expected, resource.Attributes())

Expand All @@ -336,7 +336,7 @@ func TestConfigureResourcesAttributes(t *testing.T) {
kv.String("service.version", "test-version"),
kv.String("telemetry.sdk.language", "go"),
kv.String("telemetry.sdk.name", "launcher"),
kv.String("telemetry.sdk.version", "0.0.1"),
kv.String("telemetry.sdk.version", version),
}
assert.Equal(t, expected, resource.Attributes())
}
Expand Down
2 changes: 1 addition & 1 deletion launcher/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

package launcher

const version = "0.0.1"
const version = "0.10.0"
6 changes: 1 addition & 5 deletions scripts/tag_version.sh → tools/tag_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,5 @@ fi

echo $VERSION > ./VERSION

cat > launcher/version.go <<EOF
package launcher

const version = "$VERSION"
EOF
sed -i '' "s/const version.*/const version = \"$VERSION\"/" ./launcher/version.go