polish license (#736)

Co-authored-by: liujiapeng.ljp <liujiapeng.ljp@alibaba-inc.com>
alibaba · Mar 22, 2023 · 28bfd10 · 28bfd10
1 parent 5f36f58
commit 28bfd10
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -264,7 +264,8 @@ replace (
 	github.com/elastic/beats/v7 => ./external/github.com/elastic/beats/v7
 	github.com/jeromer/syslogparser => ./external/github.com/jeromer/syslogparser
 	github.com/pingcap/parser => github.com/iLogtail/parser v0.0.0-20210415081931-48e7f467fd74-ilogtail
-	github.com/pyroscope-io/pyroscope => github.com/evanljp/pyroscope v0.35.1-ilogtail
+	github.com/pyroscope-io/jfr-parser => github.com/iLogtail/jfr-parser v0.6.0
+	github.com/pyroscope-io/pyroscope => github.com/iLogtail/pyroscope-lib v0.35.1-ilogtail
 	github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
 	github.com/siddontang/go-mysql => github.com/iLogtail/go-mysql v0.0.0-20180725024449-535abe8f2eba-ilogtail
 )
diff --git a/go.sum b/go.sum
@@ -520,8 +520,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanljp/pyroscope v0.35.1-ilogtail h1:LF2eyQvWH8IQqOgJK/skiioHGO8+lvoPhYP12gqGMt0=
-github.com/evanljp/pyroscope v0.35.1-ilogtail/go.mod h1:0XCJ3eS5qviq+PNhjBB5T/MPE54OUejhsxdL0405mOQ=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -908,10 +906,14 @@ github.com/iLogtail/VictoriaMetrics v1.83.3-ilogtail h1:s+EJg7iLTsnnrD1ivVl7YtGM
 github.com/iLogtail/VictoriaMetrics v1.83.3-ilogtail/go.mod h1:JagjwAO58g1WNpyr6x/lrQqMTf99d/WU/yxjADxBz8E=
 github.com/iLogtail/go-mysql v0.0.0-20180725024449-535abe8f2eba-ilogtail h1:iCXW1UHQjf2nokNAG3qjzHLdkkobIjUWhD67wVprauI=
 github.com/iLogtail/go-mysql v0.0.0-20180725024449-535abe8f2eba-ilogtail/go.mod h1:YImGVfNUet1+WXaKgnSIoS+qFSmnlB5SpDshXbgrPsU=
+github.com/iLogtail/jfr-parser v0.6.0 h1:dNaQ0Ng2BLE5uxrhUQwtx1q7O9LIQFpMthl3SV326AU=
+github.com/iLogtail/jfr-parser v0.6.0/go.mod h1:ZMcbJjfDkOwElEK8CvUJbpetztRWRXszCmf5WU0erV8=
 github.com/iLogtail/metrics v1.23.0-ilogtail h1:WHhiXtMy5+HWiPpDwO7a0zkMjPd7IPa5euF07LH5h6g=
 github.com/iLogtail/metrics v1.23.0-ilogtail/go.mod h1:rAr/llLpEnAdTehiNlUxKgnjcOuROSzpw0GvjpEbvFc=
 github.com/iLogtail/parser v0.0.0-20210415081931-48e7f467fd74-ilogtail h1:HTafOET9UvmNpjFY/Z/E1YvLFpku4HSKP9V4PrzaWwE=
 github.com/iLogtail/parser v0.0.0-20210415081931-48e7f467fd74-ilogtail/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw=
+github.com/iLogtail/pyroscope-lib v0.35.1-ilogtail h1:ykz2XWHVp5ZBvb7OZ1xWSJ5HHeX/WcU6IybRopc3dGw=
+github.com/iLogtail/pyroscope-lib v0.35.1-ilogtail/go.mod h1:0XCJ3eS5qviq+PNhjBB5T/MPE54OUejhsxdL0405mOQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -1418,8 +1420,6 @@ github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0ua
 github.com/prometheus/prometheus v1.8.2-0.20201119142752-3ad25a6dc3d9 h1:F2A86PGVYqn3P7oWbrSmSlJHae9y6wwpAdoWb/pZi6Q=
 github.com/prometheus/prometheus v1.8.2-0.20201119142752-3ad25a6dc3d9/go.mod h1:1MDE/bXgu4gqd5w/otko6WQpXZX9vu8QX4KbitCmaPg=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pyroscope-io/jfr-parser v0.6.0 h1:4cQqs+9edZMbZ1ogJ0XDGtgM+PoII4kybJOunVMeD9I=
-github.com/pyroscope-io/jfr-parser v0.6.0/go.mod h1:ZMcbJjfDkOwElEK8CvUJbpetztRWRXszCmf5WU0erV8=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

diff --git a/licenses/LICENSE_OF_ILOGTAIL_DEPENDENCIES.md b/licenses/LICENSE_OF_ILOGTAIL_DEPENDENCIES.md
@@ -4,8 +4,6 @@ When distributed in a binary form, iLogtail may contain portions of the followin
 
 ## Apache 2.0 licenses
 
-- [github.com/pyroscope-io/jfr-parser](https://pkg.go.dev/github.com/pyroscope-io/jfr-parser?tab=licenses)
-- [github.com/pyroscope-io/pyroscope](https://pkg.go.dev/github.com/pyroscope-io/pyroscope?tab=licenses)
 - [cloud.google.com/go/compute/metadata](https://pkg.go.dev/cloud.google.com/go/compute/metadata?tab=licenses)
 - [github.com/aliyun/alibaba-cloud-sdk-go](https://pkg.go.dev/github.com/aliyun/alibaba-cloud-sdk-go?tab=licenses)
 - [github.com/containerd/cgroups](https://pkg.go.dev/github.com/containerd/cgroups?tab=licenses)
@@ -56,7 +54,6 @@ When distributed in a binary form, iLogtail may contain portions of the followin
 - [github.com/opencontainers/runtime-spec](https://pkg.go.dev/github.com/opencontainers/runtime-spec?tab=licenses)
 - [github.com/opencontainers/selinux](https://pkg.go.dev/github.com/opencontainers/selinux?tab=licenses)
 - [github.com/pingcap/log](https://pkg.go.dev/github.com/pingcap/log?tab=licenses)
-- [github.com/pingcap/parser](https://pkg.go.dev/github.com/pingcap/parser?tab=licenses)
 - [github.com/prometheus/client\_golang](https://pkg.go.dev/github.com/prometheus/client_golang?tab=licenses)
 - [github.com/prometheus/client\_model](https://pkg.go.dev/github.com/prometheus/client_model?tab=licenses)
 - [github.com/prometheus/common](https://pkg.go.dev/github.com/prometheus/common?tab=licenses)
@@ -150,7 +147,6 @@ When distributed in a binary form, iLogtail may contain portions of the followin
 - [github.com/Microsoft/hcsshim](https://pkg.go.dev/github.com/Microsoft/hcsshim?tab=licenses)
 - [github.com/Shopify/sarama](https://pkg.go.dev/github.com/Shopify/sarama?tab=licenses)
 - [github.com/VictoriaMetrics/fasthttp](https://pkg.go.dev/github.com/VictoriaMetrics/fasthttp?tab=licenses)
-- [github.com/VictoriaMetrics/metrics](https://pkg.go.dev/github.com/VictoriaMetrics/metrics?tab=licenses)
 - [github.com/aliyun/aliyun-log-go-sdk](https://pkg.go.dev/github.com/aliyun/aliyun-log-go-sdk?tab=licenses)
 - [github.com/bsm/sarama-cluster](https://pkg.go.dev/github.com/bsm/sarama-cluster?tab=licenses)
 - [github.com/buger/jsonparser](https://pkg.go.dev/github.com/buger/jsonparser?tab=licenses)
@@ -240,8 +236,9 @@ When distributed in a binary form, iLogtail may contain portions of the followin
 ## EPL V2 licenses
 
 ## iLogtail used or modified source code from these projects
-
-- [github.com/elastic/beats](./LICENSE-beats)
-- [github.com/jeromer/syslogparser](./LICENSE-syslogparser)
-- [github.com/siddontang/go-mysql](./LICENSE-go-mysql)
-- [github.com/VictoriaMetrics/VictoriaMetrics](./LICENSE-VictoriaMetrics)
+- [github.com/iLogtail/VictoriaMetrics](http://github.com/iLogtail/VictoriaMetrics)
+- [github.com/iLogtail/jfr-parser](http://github.com/iLogtail/jfr-parser)
+- [github.com/iLogtail/parser](http://github.com/iLogtail/parser)
+- [github.com/iLogtail/pyroscope-lib](http://github.com/iLogtail/pyroscope-lib)
+- [github.com/iLogtail/go-mysql](http://github.com/iLogtail/go-mysql)
+- [github.com/iLogtail/metrics](http://github.com/iLogtail/metrics)
diff --git a/scripts/dependency_licenses.sh b/scripts/dependency_licenses.sh
@@ -34,9 +34,19 @@ function find_go_dependencies() {
   		*) continue;;
   	esac
     cd  $main_path
-  	GOOS=${target%%/*} GOARCH=${target##*/} go list -deps -f '{{with .Module}}{{.Path}}{{end}}' . >> "${output_file}"
+  	GOOS=${target%%/*} GOARCH=${target##*/} go list -deps -f '{{with .Module}}{{.Path}}@@@{{.Replace}}{{end}}' . >> "${output_file}-temp"
   	cd -
   done
+  for dep in $(LC_ALL=C sort -u "${output_file}-temp"); do
+   module=`echo $dep|awk -F '@@@' '{print $1}'`
+   replace=`echo $dep|awk -F '@@@' '{print $2}'|awk '{print $1}'`
+   if [[ "$replace" = '<nil>' ]]; then
+       echo "$module" >>"${output_file}"
+   elif [[ "$replace" != ./external* ]]; then
+        echo "$replace" >>"${output_file}"
+   fi
+  done
+   rm -f "${output_file}-temp"
 }
 
 
@@ -48,9 +58,10 @@ function filter_dependencies() {
   	case "${dep}" in
   		# ignore ourselves
   		github.com/alibaba/ilogtail) continue;;
-  		github.com/alibaba/ilogtail/pkg) continue;;
   		github.com/alibaba/ilogtail/test) continue;;
-      github.com/aliyun/alibaba-cloud-sdk-go/services/sls_inner) continue;;
+  		./pkg) continue;;
+  		../pkg) continue;;
+  		../) continue;;
   	esac
     dep="${dep%%/v[0-9]}"
     dep="${dep%%/v[0-9][0-9]}"
@@ -70,15 +81,27 @@ function find_licenses() {
   tmpdir="$(mktemp -d)"
   cat $input_file | while read line
   do
-    url="https://pkg.go.dev/$line?tab=licenses"
+    if [[ $line == *iLogtail* ]]; then
+        url="http://$line"
+    else
+       url="https://pkg.go.dev/$line?tab=licenses"
+    fi
     wget $url -O "$tmpdir"/LICENSE
     if [ ! -s "$tmpdir"/LICENSE ]; then
        echo "NOT_SUPPORT_SEARCH: - $line"
        echo "NOT_SUPPORT_SEARCH: - $line"  >> "$output_file_prefix-NOT_FOUND"
        continue
     fi
-    license_type=`cat "$tmpdir"/LICENSE|grep "#lic-0"|cut -f 2 -d ">"|cut -f 1 -d "<"`
+
     line=$(echo $line | sed 's/_/\\_/g')
+    if [[ $line == *iLogtail* ]]; then
+      license_type=`cat "$tmpdir"/LICENSE|grep "license"|sort|uniq|grep -v "\""| awk '{print $1}'`
+    else
+      license_type=`cat "$tmpdir"/LICENSE|grep "#lic-0"|cut -f 2 -d ">"|cut -f 1 -d "<"`
+    fi
+
+
+
     echo "- [$line]($url)" >> "$output_file_prefix-$license_type"
   done
 }