resolve conflict

Merge remote-tracking branch 'fork/prepare_v4' into prepare_v4
# Conflicts: # codec.go
2025-03-03 09:44:35 +03:00 · 2025-03-03 09:38:31 +03:00 · 2025-03-03 09:38:16 +03:00 · 2025-03-03 09:36:20 +03:00 · 2025-03-03 09:35:31 +03:00 · 2025-02-27 18:35:25 +03:00
1 changed files with 37 additions and 37 deletions
--- a/grpc.go
+++ b/grpc.go
@@ -428,37 +428,6 @@ func (g *grpcClient) NewRequest(service, method string, req interface{}, reqOpts
 	return newGRPCRequest(service, method, req, g.opts.ContentType, reqOpts...)
 }

-func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
-	if req == nil {
-		return errors.InternalServerError("go.micro.client", "req is nil")
-	} else if rsp == nil {
-		return errors.InternalServerError("go.micro.client", "rsp is nil")
-	}
-
-	ts := time.Now()
-	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = g.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	err := g.funcCall(ctx, req, rsp, opts...)
-	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	g.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	g.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return err
-}
-
 func (g *grpcClient) fnCall(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
 	// make a copy of call opts
 	callOpts := g.opts.CallOptions
@@ -589,7 +558,13 @@ func (g *grpcClient) fnCall(ctx context.Context, req client.Request, rsp interfa
 	return gerr
 }

-func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+	if req == nil {
+		return errors.InternalServerError("go.micro.client", "req is nil")
+	} else if rsp == nil {
+		return errors.InternalServerError("go.micro.client", "rsp is nil")
+	}
+
 	ts := time.Now()
 	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
 	var sp tracer.Span
@@ -597,21 +572,21 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 		tracer.WithSpanKind(tracer.SpanKindClient),
 		tracer.WithSpanLabels("endpoint", req.Endpoint()),
 	)
-	stream, err := g.funcStream(ctx, req, opts...)
+	err := g.funcCall(ctx, req, rsp, opts...)
 	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
 	te := time.Since(ts)
 	g.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
 	g.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())

-	if me := status.Convert(err); me == nil {
+	if me := errors.FromError(err); me == nil {
 		sp.Finish()
-		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(codes.OK))).Inc()
+		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
 	} else {
 		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code()))).Inc()
+		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
 	}

-	return stream, err
+	return err
 }

 func (g *grpcClient) fnStream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
@@ -742,6 +717,31 @@ func (g *grpcClient) fnStream(ctx context.Context, req client.Request, opts ...c
 	return nil, grr
 }

+func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+	ts := time.Now()
+	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
+	var sp tracer.Span
+	ctx, sp = g.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
+		tracer.WithSpanKind(tracer.SpanKindClient),
+		tracer.WithSpanLabels("endpoint", req.Endpoint()),
+	)
+	stream, err := g.funcStream(ctx, req, opts...)
+	g.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
+	te := time.Since(ts)
+	g.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+	g.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+
+	if me := status.Convert(err); me == nil {
+		sp.Finish()
+		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(codes.OK))).Inc()
+	} else {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		g.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code()))).Inc()
+	}
+
+	return stream, err
+}
+
 func (g *grpcClient) String() string {
 	return "grpc"
 }
Author	SHA1	Message	Date
Evstigneev Denis	36c52990ee	resolve conflict All checks were successful lint / lint (pull_request) Successful in 1m13s Details test / test (pull_request) Successful in 2m2s Details	2025-03-03 09:44:35 +03:00
Evstigneev Denis	7ad92816ef	Merge remote-tracking branch 'fork/prepare_v4' into prepare_v4 Some checks failed lint / lint (pull_request) Failing after 1m13s Details test / test (pull_request) Successful in 2m41s Details # Conflicts: # codec.go	2025-03-03 09:38:31 +03:00
Evstigneev Denis	c47d04db7f	correcting grpc.go	2025-03-03 09:38:16 +03:00
Evstigneev Denis	80a95aae8f	removed publshing	2025-03-03 09:36:20 +03:00
Evstigneev Denis	5a9b5e23fc	prepare v4	2025-03-03 09:35:31 +03:00
Evstigneev Denis	11e3ab33b5	correcting grpc.go Some checks failed lint / lint (pull_request) Failing after 1m52s Details test / test (pull_request) Successful in 3m27s Details	2025-02-27 18:35:25 +03:00
Evstigneev Denis	1f8a64c7d6	removed publshing Some checks failed lint / lint (pull_request) Failing after 1m15s Details test / test (pull_request) Successful in 2m9s Details	2025-02-26 22:06:32 +03:00
Evstigneev Denis	7969cfd8c9	prepare v4 Some checks failed lint / lint (pull_request) Failing after 1m41s Details test / test (pull_request) Successful in 3m19s Details	2025-02-25 17:15:56 +03:00
Александр Толстихин	9526345cd6	Update workflows (#135 ) All checks were successful test / test (push) Successful in 1m55s Details - Rename workflows - pr -> job_lint - build -> job_test - update golangci Co-authored-by: Aleksandr Tolstikhin <atolstikhin@mtsbank.ru> Reviewed-on: #135 Co-authored-by: Александр Толстихин <tolstihin1996@mail.ru> Co-committed-by: Александр Толстихин <tolstihin1996@mail.ru>	2024-12-11 00:31:34 +03:00
Василий Толстов	e3fe27105b	Merge pull request 'add defaultConfigService' (#133 ) from devstigneev/micro-client-grpc:issue_132 into master Some checks failed build / test (push) Successful in 1m38s Details build / lint (push) Successful in 9m26s Details codeql / analyze (go) (push) Failing after 13m37s Details Reviewed-on: #133	2024-02-29 17:07:00 +03:00