From ae99b43baa3c22ee4ee9818691978ad7f7d7a81e Mon Sep 17 00:00:00 2001 From: zhang-wei Date: Wed, 11 Dec 2019 08:26:33 +0800 Subject: [PATCH] Module name modification & Change license header (#37) * update module name * update license header --- .circleci/config.yml | 2 +- .github/CONTRIBUTING.md | 2 +- Makefile | 34 +++++++++++++++---- README.md | 4 +-- doc.go | 21 +++++++----- example_trace_test.go | 25 ++++++++------ go.mod | 2 +- golangci.yml | 16 +++++++++ internal/idgen/idgen.go | 21 +++++++----- internal/tool/error.go | 21 +++++++----- internal/tool/time.go | 21 +++++++----- noop.go | 23 +++++++------ noop_test.go | 23 +++++++------ plugins/gin/doc.go | 21 +++++++----- plugins/gin/example_gin_test.go | 27 ++++++++------- plugins/gin/gin.go | 27 ++++++++------- plugins/http/client.go | 27 ++++++++------- plugins/http/doc.go | 21 +++++++----- plugins/http/example_http_test.go | 25 ++++++++------ plugins/http/server.go | 29 +++++++++------- propagation/propagation.go | 21 +++++++----- reporter/doc.go | 21 +++++++----- reporter/grpc.go | 31 +++++++++-------- reporter/grpc/common/CLR.proto | 2 +- reporter/grpc/common/JVM.proto | 2 +- reporter/grpc/common/common.proto | 2 +- reporter/grpc/common/trace-common.proto | 2 +- .../grpc/language-agent-v2/CLRMetric.pb.go | 2 +- .../grpc/language-agent-v2/CLRMetric.proto | 2 +- .../grpc/language-agent-v2/JVMMetric.pb.go | 2 +- .../grpc/language-agent-v2/JVMMetric.proto | 2 +- .../mock_trace/trace.mock.go | 4 +-- reporter/grpc/language-agent-v2/trace.pb.go | 2 +- reporter/grpc/language-agent-v2/trace.proto | 2 +- reporter/grpc/register/InstancePing.pb.go | 2 +- reporter/grpc/register/InstancePing.proto | 2 +- reporter/grpc/register/Register.pb.go | 2 +- reporter/grpc/register/Register.proto | 2 +- .../mock_register/InstancePing.mock.go | 6 ++-- .../register/mock_register/Register.mock.go | 6 ++-- reporter/grpc_test.go | 29 +++++++++------- reporter/log.go | 23 +++++++------ segment.go | 31 +++++++++-------- segment_test.go | 21 +++++++----- span.go | 29 +++++++++------- span_opts.go | 23 +++++++------ span_test.go | 23 +++++++------ trace.go | 25 ++++++++------ trace_opts.go | 21 +++++++----- trace_propagation_test.go | 21 +++++++----- trace_test.go | 23 +++++++------ 51 files changed, 450 insertions(+), 328 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce63aaa..38102a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: build: docker: - image: circleci/golang:1.12 - working_directory: /go/src/github.com/tetratelabs/go2sky + working_directory: /go/src/github.com/SkyAPM/go2sky jobs: verify: diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index aa90e5b..4d177c0 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,7 +13,7 @@ All Golang code checked into this repo must conform to: > Note that `goimports` is a strict superset of `go fmt`. Import blocks must have three sections: golang standard library imports, third party imports, and first party imports (other Go2Sky code). Each section must be separated from the others by a blank line. - This can be enforced by running it as follows (make sure you configure your IDE to automatically use this): `goimports -local github.com/tetratelabs/go2sky` + This can be enforced by running it as follows (make sure you configure your IDE to automatically use this): `goimports -local github.com/SkyAPM/go2sky` - [golangci-lint](https://github.com/golangci/golangci-lint). All linter warnings are treated as errors and code with linter warnings may not be checked in. Supressions of linter warnings is allowed at the discretion of a PR's reviewers. diff --git a/Makefile b/Makefile index 210e165..d5ad509 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,20 @@ +# +# Licensed to the SkyAPM org under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + export GO111MODULE=on export GO2SKY_GO := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) GRPC_PATH := $(GO2SKY_GO)/reporter/grpc @@ -7,7 +24,7 @@ GRPC_PATH := $(GO2SKY_GO)/reporter/grpc .PHONY: test test: - go test -v -race -cover `go list ./... | grep -v github.com/tetratelabs/go2sky/reporter/grpc` + go test -v -race -cover `go list ./... | grep -v github.com/SkyAPM/go2sky/reporter/grpc` .PHONY: proto-gen proto-gen: @@ -22,20 +39,25 @@ proto-gen: mock-gen: cd $(GRPC_PATH)/register && \ mkdir -p mock_register && \ - mockgen github.com/tetratelabs/go2sky/reporter/grpc/register RegisterClient > mock_register/Register.mock.go && \ - mockgen github.com/tetratelabs/go2sky/reporter/grpc/register ServiceInstancePingClient > mock_register/InstancePing.mock.go + mockgen github.com/SkyAPM/go2sky/reporter/grpc/register RegisterClient > mock_register/Register.mock.go && \ + mockgen github.com/SkyAPM/go2sky/reporter/grpc/register ServiceInstancePingClient > mock_register/InstancePing.mock.go cd $(GRPC_PATH)/language-agent-v2 && \ mkdir -p mock_trace && \ - mockgen github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2 TraceSegmentReportServiceClient > mock_trace/trace.mock.go + mockgen github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2 TraceSegmentReportServiceClient > mock_trace/trace.mock.go LINTER := bin/golangci-lint $(LINTER): - wget -q -O- https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.13 + wget -q -O- https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.20.1 .PHONY: lint lint: $(LINTER) ./golangci.yml ## Run the linters @echo "linting..." $(LINTER) run --config ./golangci.yml +.PHONY: fix +fix: $(LINTER) + @echo "fix..." + $(LINTER) run -v --fix ./... + .PHONY: all -all: test lint +all: test lint \ No newline at end of file diff --git a/README.md b/README.md index 952957b..f1c845a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # GO2Sky [![CircleCI](https://circleci.com/gh/SkyAPM/go2sky.svg?style=svg)](https://circleci.com/gh/SkyAPM/go2sky) -[![GoDoc](https://godoc.org/github.com/tetratelabs/go2sky?status.svg)](https://godoc.org/github.com/tetratelabs/go2sky) +[![GoDoc](https://godoc.org/github.com/SkyAPM/go2sky?status.svg)](https://godoc.org/github.com/SkyAPM/go2sky) **GO2Sky** is an instrument SDK library, written in Go, by following [Apache SkyWalking](https://github.com/apache/incubator-skywalking) tracing and metrics formats. # Installation ``` -$ go get -u github.com/tetratelabs/go2sky +$ go get -u github.com/SkyAPM/go2sky ``` The API of this project is still evolving. The use of vendoring tool is recommended. diff --git a/doc.go b/doc.go index 13e7761..a7b068f 100644 --- a/doc.go +++ b/doc.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. /* Package go2sky implements a native Apache SkyWalking agent library for Go. diff --git a/example_trace_test.go b/example_trace_test.go index 597aef5..47e3afd 100644 --- a/example_trace_test.go +++ b/example_trace_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky_test @@ -19,8 +22,8 @@ import ( "log" "time" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/reporter" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/reporter" ) func ExampleNewTracer() { diff --git a/go.mod b/go.mod index 274340a..6f95b69 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tetratelabs/go2sky +module github.com/SkyAPM/go2sky go 1.12 diff --git a/golangci.yml b/golangci.yml index 5eb9b53..361f6e3 100644 --- a/golangci.yml +++ b/golangci.yml @@ -1,3 +1,19 @@ +# Licensed to the SkyAPM org under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + linters: enable: - deadcode diff --git a/internal/idgen/idgen.go b/internal/idgen/idgen.go index 57fcc9f..431e203 100644 --- a/internal/idgen/idgen.go +++ b/internal/idgen/idgen.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package idgen diff --git a/internal/tool/error.go b/internal/tool/error.go index 1f296b7..bb6dbc6 100644 --- a/internal/tool/error.go +++ b/internal/tool/error.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package tool diff --git a/internal/tool/time.go b/internal/tool/time.go index 2af371f..b1a4cd1 100644 --- a/internal/tool/time.go +++ b/internal/tool/time.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package tool diff --git a/noop.go b/noop.go index ed83fa5..9660d3b 100644 --- a/noop.go +++ b/noop.go @@ -1,23 +1,26 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky import ( "time" - "github.com/tetratelabs/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky/reporter/grpc/common" ) type NoopSpan struct { diff --git a/noop_test.go b/noop_test.go index 6a57b46..8e9b837 100644 --- a/noop_test.go +++ b/noop_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky @@ -20,7 +23,7 @@ import ( "testing" "time" - "github.com/tetratelabs/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky/reporter/grpc/common" ) type createFunc func() (Span, context.Context, error) diff --git a/plugins/gin/doc.go b/plugins/gin/doc.go index 848b12d..48c51fc 100644 --- a/plugins/gin/doc.go +++ b/plugins/gin/doc.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. //Package Gin is a HTTP web framework written in Go (Golang) plugin which can be used for integration with Gin http server. package gin diff --git a/plugins/gin/example_gin_test.go b/plugins/gin/example_gin_test.go index 986d29e..cb889ec 100644 --- a/plugins/gin/example_gin_test.go +++ b/plugins/gin/example_gin_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package gin @@ -20,10 +23,10 @@ import ( "net/http" "sync" + "github.com/SkyAPM/go2sky" + h "github.com/SkyAPM/go2sky/plugins/http" + "github.com/SkyAPM/go2sky/reporter" "github.com/gin-gonic/gin" - "github.com/tetratelabs/go2sky" - h "github.com/tetratelabs/go2sky/plugins/http" - "github.com/tetratelabs/go2sky/reporter" ) func ExampleMiddleware() { diff --git a/plugins/gin/gin.go b/plugins/gin/gin.go index 4a1a857..5e57ac5 100644 --- a/plugins/gin/gin.go +++ b/plugins/gin/gin.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. //Package Gin is a HTTP web framework written in Go (Golang) plugin which can be used for integration with Gin http server. @@ -21,10 +24,10 @@ import ( "sync" "time" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/propagation" + "github.com/SkyAPM/go2sky/reporter/grpc/common" "github.com/gin-gonic/gin" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/propagation" - "github.com/tetratelabs/go2sky/reporter/grpc/common" ) const ( diff --git a/plugins/http/client.go b/plugins/http/client.go index b07bad5..5d107ef 100644 --- a/plugins/http/client.go +++ b/plugins/http/client.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package http @@ -19,9 +22,9 @@ import ( "strconv" "time" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/propagation" - "github.com/tetratelabs/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/propagation" + "github.com/SkyAPM/go2sky/reporter/grpc/common" ) const httpClientComponentID int32 = 2 diff --git a/plugins/http/doc.go b/plugins/http/doc.go index 76028a5..3713dca 100644 --- a/plugins/http/doc.go +++ b/plugins/http/doc.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. /* Package http contains several client/server http plugin which can be used for integration with net/http. diff --git a/plugins/http/example_http_test.go b/plugins/http/example_http_test.go index 51c72d9..ab4db23 100644 --- a/plugins/http/example_http_test.go +++ b/plugins/http/example_http_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package http @@ -23,8 +26,8 @@ import ( "github.com/gorilla/mux" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/reporter" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/reporter" ) func ExampleNewServerMiddleware() { diff --git a/plugins/http/server.go b/plugins/http/server.go index 9214448..1bba6d4 100644 --- a/plugins/http/server.go +++ b/plugins/http/server.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package http @@ -20,10 +23,10 @@ import ( "strconv" "time" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/internal/tool" - "github.com/tetratelabs/go2sky/propagation" - "github.com/tetratelabs/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/internal/tool" + "github.com/SkyAPM/go2sky/propagation" + "github.com/SkyAPM/go2sky/reporter/grpc/common" ) const ( diff --git a/propagation/propagation.go b/propagation/propagation.go index d7a9657..b648917 100644 --- a/propagation/propagation.go +++ b/propagation/propagation.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. /* Package propagation holds the required function signatures for Injection and diff --git a/reporter/doc.go b/reporter/doc.go index 7f72e16..421f0db 100644 --- a/reporter/doc.go +++ b/reporter/doc.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. /* Package reporter holds reporters contain official reporter implementations. diff --git a/reporter/grpc.go b/reporter/grpc.go index 15c2e02..ef032df 100644 --- a/reporter/grpc.go +++ b/reporter/grpc.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package reporter @@ -26,11 +29,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/internal/tool" - "github.com/tetratelabs/go2sky/reporter/grpc/common" - v2 "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2" - "github.com/tetratelabs/go2sky/reporter/grpc/register" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/internal/tool" + "github.com/SkyAPM/go2sky/reporter/grpc/common" + v2 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2" + "github.com/SkyAPM/go2sky/reporter/grpc/register" ) const ( diff --git a/reporter/grpc/common/CLR.proto b/reporter/grpc/common/CLR.proto index f2c216f..2e65910 100644 --- a/reporter/grpc/common/CLR.proto +++ b/reporter/grpc/common/CLR.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/common"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/common"; import "common/common.proto"; diff --git a/reporter/grpc/common/JVM.proto b/reporter/grpc/common/JVM.proto index 96583c8..c7cd4da 100644 --- a/reporter/grpc/common/JVM.proto +++ b/reporter/grpc/common/JVM.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/common"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/common"; import "common/common.proto"; diff --git a/reporter/grpc/common/common.proto b/reporter/grpc/common/common.proto index 09282b0..6587b66 100644 --- a/reporter/grpc/common/common.proto +++ b/reporter/grpc/common/common.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.common"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/common"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/common"; message KeyStringValuePair { string key = 1; diff --git a/reporter/grpc/common/trace-common.proto b/reporter/grpc/common/trace-common.proto index 9ebdbe0..2ad3662 100644 --- a/reporter/grpc/common/trace-common.proto +++ b/reporter/grpc/common/trace-common.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/common"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/common"; message UpstreamSegment { repeated UniqueId globalTraceIds = 1; diff --git a/reporter/grpc/language-agent-v2/CLRMetric.pb.go b/reporter/grpc/language-agent-v2/CLRMetric.pb.go index 876a19b..a3b0d58 100644 --- a/reporter/grpc/language-agent-v2/CLRMetric.pb.go +++ b/reporter/grpc/language-agent-v2/CLRMetric.pb.go @@ -6,8 +6,8 @@ package language_agent_v2 import ( context "context" fmt "fmt" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" proto "github.com/golang/protobuf/proto" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/reporter/grpc/language-agent-v2/CLRMetric.proto b/reporter/grpc/language-agent-v2/CLRMetric.proto index a07e870..835904d 100644 --- a/reporter/grpc/language-agent-v2/CLRMetric.proto +++ b/reporter/grpc/language-agent-v2/CLRMetric.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2"; import "common/common.proto"; import "common/CLR.proto"; diff --git a/reporter/grpc/language-agent-v2/JVMMetric.pb.go b/reporter/grpc/language-agent-v2/JVMMetric.pb.go index d9e36a9..748b301 100644 --- a/reporter/grpc/language-agent-v2/JVMMetric.pb.go +++ b/reporter/grpc/language-agent-v2/JVMMetric.pb.go @@ -6,8 +6,8 @@ package language_agent_v2 import ( context "context" fmt "fmt" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" proto "github.com/golang/protobuf/proto" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/reporter/grpc/language-agent-v2/JVMMetric.proto b/reporter/grpc/language-agent-v2/JVMMetric.proto index b598b0b..a74da2f 100644 --- a/reporter/grpc/language-agent-v2/JVMMetric.proto +++ b/reporter/grpc/language-agent-v2/JVMMetric.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2"; import "common/common.proto"; diff --git a/reporter/grpc/language-agent-v2/mock_trace/trace.mock.go b/reporter/grpc/language-agent-v2/mock_trace/trace.mock.go index 49e9cb2..45c374c 100644 --- a/reporter/grpc/language-agent-v2/mock_trace/trace.mock.go +++ b/reporter/grpc/language-agent-v2/mock_trace/trace.mock.go @@ -1,13 +1,13 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2 (interfaces: TraceSegmentReportServiceClient) +// Source: github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2 (interfaces: TraceSegmentReportServiceClient) // Package mock_language_agent_v2 is a generated GoMock package. package mock_language_agent_v2 import ( context "context" + language_agent_v2 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2" gomock "github.com/golang/mock/gomock" - language_agent_v2 "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2" grpc "google.golang.org/grpc" reflect "reflect" ) diff --git a/reporter/grpc/language-agent-v2/trace.pb.go b/reporter/grpc/language-agent-v2/trace.pb.go index 0a640c0..bb008e5 100644 --- a/reporter/grpc/language-agent-v2/trace.pb.go +++ b/reporter/grpc/language-agent-v2/trace.pb.go @@ -6,8 +6,8 @@ package language_agent_v2 import ( context "context" fmt "fmt" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" proto "github.com/golang/protobuf/proto" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/reporter/grpc/language-agent-v2/trace.proto b/reporter/grpc/language-agent-v2/trace.proto index f4f31fc..e329510 100644 --- a/reporter/grpc/language-agent-v2/trace.proto +++ b/reporter/grpc/language-agent-v2/trace.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2"; import "common/common.proto"; import "common/trace-common.proto"; diff --git a/reporter/grpc/register/InstancePing.pb.go b/reporter/grpc/register/InstancePing.pb.go index 46f0fe4..ff86d9c 100644 --- a/reporter/grpc/register/InstancePing.pb.go +++ b/reporter/grpc/register/InstancePing.pb.go @@ -6,8 +6,8 @@ package register import ( context "context" fmt "fmt" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" proto "github.com/golang/protobuf/proto" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/reporter/grpc/register/InstancePing.proto b/reporter/grpc/register/InstancePing.proto index c08eb0f..fd06a2a 100644 --- a/reporter/grpc/register/InstancePing.proto +++ b/reporter/grpc/register/InstancePing.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.register.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/register"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/register"; import "common/common.proto"; diff --git a/reporter/grpc/register/Register.pb.go b/reporter/grpc/register/Register.pb.go index c01d876..6383124 100644 --- a/reporter/grpc/register/Register.pb.go +++ b/reporter/grpc/register/Register.pb.go @@ -6,8 +6,8 @@ package register import ( context "context" fmt "fmt" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" proto "github.com/golang/protobuf/proto" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/reporter/grpc/register/Register.proto b/reporter/grpc/register/Register.proto index 19ceaf1..c6ce21e 100644 --- a/reporter/grpc/register/Register.proto +++ b/reporter/grpc/register/Register.proto @@ -21,7 +21,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.register.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "github.com/tetratelabs/go2sky/reporter/grpc/register"; +option go_package = "github.com/SkyAPM/go2sky/reporter/grpc/register"; import "common/common.proto"; diff --git a/reporter/grpc/register/mock_register/InstancePing.mock.go b/reporter/grpc/register/mock_register/InstancePing.mock.go index 5f8e752..6d433f8 100644 --- a/reporter/grpc/register/mock_register/InstancePing.mock.go +++ b/reporter/grpc/register/mock_register/InstancePing.mock.go @@ -1,14 +1,14 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/tetratelabs/go2sky/reporter/grpc/register (interfaces: ServiceInstancePingClient) +// Source: github.com/SkyAPM/go2sky/reporter/grpc/register (interfaces: ServiceInstancePingClient) // Package mock_register is a generated GoMock package. package mock_register import ( context "context" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" + register "github.com/SkyAPM/go2sky/reporter/grpc/register" gomock "github.com/golang/mock/gomock" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" - register "github.com/tetratelabs/go2sky/reporter/grpc/register" grpc "google.golang.org/grpc" reflect "reflect" ) diff --git a/reporter/grpc/register/mock_register/Register.mock.go b/reporter/grpc/register/mock_register/Register.mock.go index 36374c9..b0243c9 100644 --- a/reporter/grpc/register/mock_register/Register.mock.go +++ b/reporter/grpc/register/mock_register/Register.mock.go @@ -1,14 +1,14 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/tetratelabs/go2sky/reporter/grpc/register (interfaces: RegisterClient) +// Source: github.com/SkyAPM/go2sky/reporter/grpc/register (interfaces: RegisterClient) // Package mock_register is a generated GoMock package. package mock_register import ( context "context" + common "github.com/SkyAPM/go2sky/reporter/grpc/common" + register "github.com/SkyAPM/go2sky/reporter/grpc/register" gomock "github.com/golang/mock/gomock" - common "github.com/tetratelabs/go2sky/reporter/grpc/common" - register "github.com/tetratelabs/go2sky/reporter/grpc/register" grpc "google.golang.org/grpc" reflect "reflect" ) diff --git a/reporter/grpc_test.go b/reporter/grpc_test.go index 4fa41ce..cf60223 100644 --- a/reporter/grpc_test.go +++ b/reporter/grpc_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package reporter @@ -25,10 +28,10 @@ import ( "github.com/golang/mock/gomock" - "github.com/tetratelabs/go2sky" - "github.com/tetratelabs/go2sky/reporter/grpc/common" - "github.com/tetratelabs/go2sky/reporter/grpc/register" - "github.com/tetratelabs/go2sky/reporter/grpc/register/mock_register" + "github.com/SkyAPM/go2sky" + "github.com/SkyAPM/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky/reporter/grpc/register" + "github.com/SkyAPM/go2sky/reporter/grpc/register/mock_register" ) const header string = "1-MTU1NTY0NDg4Mjk2Nzg2ODAwMC4wLjU5NDYzNzUyMDYzMzg3NDkwODc=" + diff --git a/reporter/log.go b/reporter/log.go index 285bf85..7b53f1d 100644 --- a/reporter/log.go +++ b/reporter/log.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package reporter @@ -19,7 +22,7 @@ import ( "log" "os" - "github.com/tetratelabs/go2sky" + "github.com/SkyAPM/go2sky" ) const ( diff --git a/segment.go b/segment.go index 2efcecd..56e6986 100644 --- a/segment.go +++ b/segment.go @@ -1,27 +1,30 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky import ( "sync/atomic" - "github.com/tetratelabs/go2sky/internal/idgen" - "github.com/tetratelabs/go2sky/internal/tool" - "github.com/tetratelabs/go2sky/propagation" - "github.com/tetratelabs/go2sky/reporter/grpc/common" - v2 "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2" + "github.com/SkyAPM/go2sky/internal/idgen" + "github.com/SkyAPM/go2sky/internal/tool" + "github.com/SkyAPM/go2sky/propagation" + "github.com/SkyAPM/go2sky/reporter/grpc/common" + v2 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2" ) func newSegmentSpan(defaultSpan *defaultSpan, parentSpan segmentSpan) (s segmentSpan) { diff --git a/segment_test.go b/segment_test.go index 8e1a245..ff3634f 100644 --- a/segment_test.go +++ b/segment_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky diff --git a/span.go b/span.go index 9d8f802..54b04ca 100644 --- a/span.go +++ b/span.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky @@ -18,10 +21,10 @@ import ( "math" "time" - "github.com/tetratelabs/go2sky/internal/tool" - "github.com/tetratelabs/go2sky/propagation" - "github.com/tetratelabs/go2sky/reporter/grpc/common" - v2 "github.com/tetratelabs/go2sky/reporter/grpc/language-agent-v2" + "github.com/SkyAPM/go2sky/internal/tool" + "github.com/SkyAPM/go2sky/propagation" + "github.com/SkyAPM/go2sky/reporter/grpc/common" + v2 "github.com/SkyAPM/go2sky/reporter/grpc/language-agent-v2" ) // SpanType is used to identify entry, exit and local diff --git a/span_opts.go b/span_opts.go index 31d4976..354487b 100644 --- a/span_opts.go +++ b/span_opts.go @@ -1,20 +1,23 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky -import "github.com/tetratelabs/go2sky/propagation" +import "github.com/SkyAPM/go2sky/propagation" // WithContext setup trace sc from propagation func WithContext(sc *propagation.SpanContext) SpanOption { diff --git a/span_test.go b/span_test.go index 4fb36a4..b34b70a 100644 --- a/span_test.go +++ b/span_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky @@ -19,7 +22,7 @@ import ( "testing" "time" - "github.com/tetratelabs/go2sky/reporter/grpc/common" + "github.com/SkyAPM/go2sky/reporter/grpc/common" ) func Test_defaultSpan_SetOperationName(t *testing.T) { diff --git a/trace.go b/trace.go index 5eea289..81e44e7 100644 --- a/trace.go +++ b/trace.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky @@ -23,8 +26,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/tetratelabs/go2sky/internal/tool" - "github.com/tetratelabs/go2sky/propagation" + "github.com/SkyAPM/go2sky/internal/tool" + "github.com/SkyAPM/go2sky/propagation" ) const errParameter = tool.Error("parameter are nil") diff --git a/trace_opts.go b/trace_opts.go index 5d60633..d845313 100644 --- a/trace_opts.go +++ b/trace_opts.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky diff --git a/trace_propagation_test.go b/trace_propagation_test.go index 9f1958d..dc87222 100644 --- a/trace_propagation_test.go +++ b/trace_propagation_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky diff --git a/trace_test.go b/trace_test.go index 1303243..12d4b0f 100644 --- a/trace_test.go +++ b/trace_test.go @@ -1,16 +1,19 @@ -// Copyright 2019 Tetrate Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. +// Licensed to SkyAPM org under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. SkyAPM org licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package go2sky @@ -22,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/tetratelabs/go2sky/propagation" + "github.com/SkyAPM/go2sky/propagation" ) var ( -- GitLab