Skip to content

Commit

Permalink
Use md-to-godoc (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
yurishkuro committed Nov 8, 2016
1 parent 696d52a commit 5767869
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 10 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ COLORIZE=sed ''/PASS/s//$(PASS)/'' | sed ''/FAIL/s//$(FAIL)/''
.PHONY: test-and-lint
test-and-lint: test fmt lint

.PHONY: go-gen
go-gen:
go generate ./...

.PHONY: test
test:
test: go-gen
$(GOTEST) $(PACKAGES) | $(COLORIZE)

.PHONY: fmt
Expand Down Expand Up @@ -61,6 +65,7 @@ install_ci: install
go get github.com/mattn/goveralls
go get golang.org/x/tools/cmd/cover
go get github.com/golang/lint/golint
go get github.com/sectioneight/md-to-godoc


.PHONY: test_ci
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@

http://uber.github.io/jaeger/

## Status

We are in the process of moving Jaeger backend code from internal repositories to GitHub.

## Contributing

See [CONTRIBUTING.md](./CONTRIBUTING.md).
See [CONTRIBUTING](./CONTRIBUTING.md).

## License

[The MIT License](./LICENSE)
[The MIT License](./LICENSE).

[doc-img]: https://readthedocs.org/projects/jaeger/badge/?version=latest
[doc]: http://jaeger.readthedocs.org/en/latest/
Expand Down
1 change: 0 additions & 1 deletion scripts/updateLicenses.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

set -e
#set -x

python scripts/updateLicense.py $(go list -json $(glide nv) | jq -r '.Dir + "/" + (.GoFiles | .[])')
5 changes: 3 additions & 2 deletions services/agent/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Package agent implements `jaeger-agent` sidecar service. It is meant
to run on each host that runs the services instrumented with Jaeger.
# `jaeger-agent` sidecar service

Agent is meant to run on each host that runs the services instrumented with Jaeger.
Jaeger client libraries send tracing spans to `jaeger-agent`. The agent
forwards the spans to `jaeger-collector` services for storing in the DB.
12 changes: 8 additions & 4 deletions services/agent/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

// Package agent implements jaeger-agent sidecar service. It is meant
// to run on each host that runs the services instrumented with Jaeger.
// Jaeger client libraries send tracing spans to jaeger-agent. The agent
// forwards the spans to jaeger-collector services for storing in the DB.
/*
Package agent is the jaeger-agent sidecar service.
Agent is meant to run on each host that runs the services instrumented with Jaeger.
Jaeger client libraries send tracing spans to jaeger-agent. The agent
forwards the spans to jaeger-collector services for storing in the DB.
*/
package agent
26 changes: 26 additions & 0 deletions services/agent/md2doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright (c) 2016 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

// This file only exists to generate doc.go from README.md

//go:generate md-to-godoc
//go:generate python ../../scripts/updateLicense.py doc.go

package agent

0 comments on commit 5767869

Please sign in to comment.