Merge branch 'main' into fix-ci

ADOPTERS.md

@@ -1,3 +1,5 @@
+* Alauda
+  * Official site: [en](https://www.alauda.io/), [cn](https://www.alauda.cn/)
 * [Base CRM](https://getbase.com/)
 * [Circonus](https://www.circonus.com/)
 * [ContaAzul](https://contaazul.com/)

cmd/agent/app/builder_test.go

@@ -223,6 +223,7 @@ func TestCreateCollectorProxy(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run("", func(t *testing.T) {
+			t.Parallel()
 			flags := &flag.FlagSet{}
 			grpc.AddFlags(flags)
 			reporter.AddFlags(flags)

cmd/agent/app/reporter/grpc/builder_test.go

@@ -300,10 +300,12 @@ func TestProxyClientTLS(t *testing.T) {
 			expectError: false,
 		},
 	}
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
 			var opts []grpc.ServerOption
 			if test.serverTLS.Enabled {
 				tlsCfg, err := test.serverTLS.Config(zap.NewNop())

pkg/jtracer/jtracer.go

@@ -5,6 +5,8 @@ package jtracer
 
 import (
 	"context"
+	"os"
+	"strings"
 	"sync"
 
 	"go.opentelemetry.io/otel"
@@ -109,9 +111,17 @@ func otelResource(ctx context.Context, svc string) (*resource.Resource, error) {
 	)
 }
 
+func defaultGRPCOptions() []otlptracegrpc.Option {
+	var options []otlptracegrpc.Option
+	if !(strings.HasPrefix(os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT"), "https://") || strings.ToLower(os.Getenv("OTEL_EXPORTER_OTLP_INSECURE")) == "false") {
+		options = append(options, otlptracegrpc.WithInsecure())
+	}
+	return options
+}
+
 func otelExporter(ctx context.Context) (sdktrace.SpanExporter, error) {
 	client := otlptracegrpc.NewClient(
-		otlptracegrpc.WithInsecure(),
+		defaultGRPCOptions()...,
 	)
 	return otlptrace.New(ctx, client)
 }