Merge branch 'main' into feat/adk_backend_v2

Author: JonXSnow

adk/backend/local/local.go

@@ -464,9 +464,10 @@ func (s *Backend) ExecuteStreaming(ctx context.Context, input *filesystem.Execut
 		}()
 
 		scanner := bufio.NewScanner(stdout)
+		hasOutput := false
 		for scanner.Scan() {
+			hasOutput = true
 			line := scanner.Text() + "\n"
-
 			select {
 			case <-ctx.Done():
 				_ = cmd.Process.Kill()
@@ -500,6 +501,11 @@ func (s *Backend) ExecuteStreaming(ctx context.Context, input *filesystem.Execut
 			}
 			return
 		}
+
+		if !hasOutput {
+			w.Send(&filesystem.ExecuteResponse{ExitCode: new(int)}, nil)
+		}
+
 	}()
 
 	return sr, nil

adk/backend/local/local_test.go

@@ -661,4 +661,29 @@ func TestExecuteStreaming(t *testing.T) {
 
 		assert.Error(t, lastErr, "should receive error for invalid command")
 	})
+
+	t.Run("ExecuteStreaming with no stdout output", func(t *testing.T) {
+		req := &filesystem.ExecuteRequest{Command: "true"}
+		sr, err := s.(*backend).ExecuteStreaming(ctx, req)
+		assert.NoError(t, err)
+
+		var receivedResponse bool
+		var exitCode *int
+		for {
+			resp, err := sr.Recv()
+			if err != nil {
+				break
+			}
+			if resp != nil {
+				receivedResponse = true
+				if resp.ExitCode != nil {
+					exitCode = resp.ExitCode
+				}
+			}
+		}
+
+		assert.True(t, receivedResponse, "should receive at least one response even with no stdout")
+		assert.NotNil(t, exitCode, "should receive exit code in response")
+		assert.Equal(t, 0, *exitCode, "exit code should be 0 for successful command")
+	})
 }

callbacks/apmplus/apmplus.go

@@ -59,16 +59,36 @@ type Config struct {
 	// Default: ""
 	// Example: "v1.2.3"
 	Release string
+
+	// ResourceAttributes is custom resource attributes (Optional)
+	ResourceAttributes map[string]string
 }
 
 func NewApmplusHandler(cfg *Config) (handler callbacks.Handler, shutdown func(ctx context.Context) error, err error) {
-	p, err := opentelemetry.NewOpenTelemetryProvider(
+	resourceAttributes := []attribute.KeyValue{
+		attribute.String("apmplus.business_type", "gen_ai"),
+	}
+	if len(cfg.ResourceAttributes) > 0 {
+		for k, v := range cfg.ResourceAttributes {
+			resourceAttributes = append(resourceAttributes, attribute.String(k, v))
+		}
+	}
+	var resourceOpts []opentelemetry.Option
+	for _, attr := range resourceAttributes {
+		resourceOpts = append(resourceOpts,
+			opentelemetry.WithResourceAttribute(attr),
+		)
+	}
+
+	providerOpts := []opentelemetry.Option{
 		opentelemetry.WithServiceName(cfg.ServiceName),
 		opentelemetry.WithExportEndpoint(cfg.Host),
 		opentelemetry.WithInsecure(),
 		opentelemetry.WithHeaders(map[string]string{"x-byteapm-appkey": cfg.AppKey}),
-		opentelemetry.WithResourceAttribute(attribute.String("apmplus.business_type", "gen_ai")),
-	)
+	}
+	providerOpts = append(providerOpts, resourceOpts...)
+
+	p, err := opentelemetry.NewOpenTelemetryProvider(providerOpts...)
 	if p == nil || err != nil {
 		return nil, nil, errors.New("init opentelemetry provider failed")
 	}

callbacks/apmplus/apmplus_test.go

@@ -31,11 +31,16 @@ import (
 )
 
 func TestApmplusCallback(t *testing.T) {
+	// optional: add custom resource attributes
+	resourceAttributes := make(map[string]string)
+	resourceAttributes["attr-key"] = "attr-value"
+
 	cbh, _, _ := NewApmplusHandler(&Config{
-		Host:        "apmplus host",
-		AppKey:      "app key",
-		ServiceName: "MyService",
-		Release:     "release",
+		Host:               "apmplus host",
+		AppKey:             "app key",
+		ServiceName:        "MyService",
+		Release:            "release",
+		ResourceAttributes: resourceAttributes,
 	})
 	callbacks.AppendGlobalHandlers(cbh)
 	ctx := context.Background()

callbacks/apmplus/go.mod

@@ -11,6 +11,7 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.59.0
 	go.opentelemetry.io/otel v1.34.0
 	go.opentelemetry.io/otel/metric v1.34.0
+	go.opentelemetry.io/otel/sdk v1.34.0
 	go.opentelemetry.io/otel/trace v1.34.0
 )
 
@@ -50,7 +51,6 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	golang.org/x/arch v0.12.0 // indirect