Skip to content

Commit 6e690f4

Browse files
adecaroadecaro
committed
rebase fix
Signed-off-by: Angelo De Caro <[email protected]>
1 parent 417dce1 commit 6e690f4

File tree

8 files changed

+25
-52
lines changed

8 files changed

+25
-52
lines changed

‎platform/view/sdk/dig/sdk.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
dig2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/sdk/dig"
1616
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1717
digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
18-
tracing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/tracing"
19-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/web"
2018
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/hash"
2119
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
2220
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm"
@@ -31,8 +29,6 @@ import (
3129
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id/kms/driver/file"
3230
metrics2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
3331
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics/operations"
34-
view3 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view"
35-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view/protos"
3632
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/sig"
3733
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/auditinfo"
3834
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/binding"
@@ -124,26 +120,11 @@ func (p *SDK) Install() error {
124120

125121
// View Manager
126122
p.Container().Provide(view.NewRegistry),
127-
p.Container().Provide(view3.NewResponseMarshaler, dig.As(new(view3.Marshaller))),
128-
p.Container().Provide(func(o *operations.Options, l operations.OperationsLogger) metrics2.Provider {
129-
return operations.NewMetricsProvider(o.Metrics, l, true)
130-
}),
131-
p.Container().Provide(func(metricsProvider metrics2.Provider, configService driver.ConfigService) (trace.TracerProvider, error) {
132-
base, err := tracing2.NewTracerProvider(configService)
133-
if err != nil {
134-
return nil, err
135-
}
136-
return tracing2.NewWrappedTracerProvider(tracing.NewTracerProviderWithBackingProvider(base, metricsProvider)), nil
137-
}),
138-
p.Container().Provide(view3.NewMetrics),
139-
p.Container().Provide(view3.NewAccessControlChecker, dig.As(new(view3.PolicyChecker))),
140-
p.Container().Provide(view3.NewViewServiceServer, dig.As(new(view3.Service))),
141123
p.Container().Provide(view.NewManager),
142124
p.Container().Provide(
143125
digutils.Identity[*view.Manager](),
144-
dig.As(new(StartableViewManager), new(server2.ViewManager)),
126+
dig.As(new(server2.ViewManager)),
145127
),
146-
p.Container().Provide(digutils.Identity[*view.Manager](), dig.As(new(view3.Manager))),
147128

148129
// Comm service
149130
p.Container().Provide(provider.NewHostProvider),

‎platform/view/sdk/dig/servers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics/operations"
2020
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/kvs"
2121
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
22-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/grpc/server/view"
22+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
2323
web2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/web"
2424
web "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/web/server"
2525
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"

‎platform/view/sdk/dig/vm.go

Whitespace-only changes.

‎platform/view/services/view/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func runViewOn(v view.View, opts []view.RunViewOption, parent localContext) (res
388388
initiator = v
389389
}
390390

391-
logger.DebugfContext(ctx.Context(), "Start view %s", GetName(v))
391+
logger.DebugfContext(parent.Context(), "Start view %s", GetName(v))
392392

393393
// traces
394394
newCtx, span := parent.StartSpanFrom(

‎platform/view/services/view/grpc/server/view.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ import (
1212
"log"
1313
"reflect"
1414

15-
protos2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view/protos"
1615
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
1716
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/grpc/server/protos"
18-
view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1917
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
2018
"github.com/pkg/errors"
2119
"go.opentelemetry.io/otel/trace"

‎platform/view/services/view/manager.go

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ const (
2929
InitiatorViewLabel tracing.LabelName = "initiator_view"
3030
)
3131

32-
type (
33-
ServiceProvider = services.Provider
34-
)
35-
3632
var logger = logging.MustGetLogger()
3733

3834
type Manager struct {
@@ -52,7 +48,7 @@ type Manager struct {
5248
}
5349

5450
func NewManager(
55-
serviceProvider ServiceProvider,
51+
serviceProvider services.Provider,
5652
commLayer CommLayer,
5753
endpointService EndpointService,
5854
identityProvider IdentityProvider,
@@ -138,13 +134,13 @@ func (m *Manager) InitiateViewWithIdentity(parent context.Context, view view.Vie
138134
m.contextsSync.Unlock()
139135
defer m.deleteContext(id, childContext.ID())
140136

141-
logger.DebugfContext(c, "[%s] InitiateView [view:%s], [ContextID:%s]", id, logging.Identifier(view), childContext.ID())
137+
logger.DebugfContext(parent, "[%s] InitiateView [view:%s], [ContextID:%s]", id, logging.Identifier(view), childContext.ID())
142138
res, err := childContext.RunView(view)
143139
if err != nil {
144-
logger.DebugfContext(c, "[%s] InitiateView [view:%s], [ContextID:%s] failed [%s]", id, logging.Identifier(view), childContext.ID(), err)
140+
logger.DebugfContext(parent, "[%s] InitiateView [view:%s], [ContextID:%s] failed [%s]", id, logging.Identifier(view), childContext.ID(), err)
145141
return nil, err
146142
}
147-
logger.DebugfContext(c, "[%s] InitiateView [view:%s], [ContextID:%s] terminated", id, logging.Identifier(view), childContext.ID())
143+
logger.DebugfContext(parent, "[%s] InitiateView [view:%s], [ContextID:%s] terminated", id, logging.Identifier(view), childContext.ID())
148144
return res, nil
149145
}
150146

@@ -168,16 +164,16 @@ func (m *Manager) InitiateContextFrom(parent context.Context, view view.View, id
168164
parent = m.ctx
169165
}
170166
viewContext, err := NewContextForInitiator(
167+
parent,
171168
contextID,
172-
ctx,
173-
cm.serviceProvider,
174-
cm.commLayer,
175-
cm.endpointService,
176-
cm.identityProvider,
169+
m.serviceProvider,
170+
m.commLayer,
171+
m.endpointService,
172+
m.identityProvider,
177173
id,
178174
view,
179-
cm.tracer,
180-
cm.localIdentityChecker,
175+
m.tracer,
176+
m.localIdentityChecker,
181177
)
182178
if err != nil {
183179
return nil, err
@@ -188,7 +184,7 @@ func (m *Manager) InitiateContextFrom(parent context.Context, view view.View, id
188184
m.metrics.Contexts.Set(float64(len(m.contexts)))
189185
m.contextsSync.Unlock()
190186

191-
logger.DebugfContext(ctx, "[%s] InitiateContext [view:%s], [ContextID:%s]\n", id, logging.Identifier(view), childContext.ID())
187+
logger.DebugfContext(parent, "[%s] InitiateContext [view:%s], [ContextID:%s]\n", id, logging.Identifier(view), childContext.ID())
192188

193189
return childContext, nil
194190
}
@@ -399,15 +395,15 @@ func (m *Manager) me() view.Identity {
399395
return m.identityProvider.DefaultIdentity()
400396
}
401397

402-
func (cm *Manager) getCurrentContext() context.Context {
403-
cm.contextsSync.Lock()
404-
ctx := cm.ctx
405-
cm.contextsSync.Unlock()
398+
func (m *Manager) getCurrentContext() context.Context {
399+
m.contextsSync.Lock()
400+
ctx := m.ctx
401+
m.contextsSync.Unlock()
406402
return ctx
407403
}
408404

409-
func (cm *Manager) setCurrentContext(ctx context.Context) {
410-
cm.contextsSync.Lock()
411-
cm.ctx = ctx
412-
cm.contextsSync.Unlock()
405+
func (m *Manager) setCurrentContext(ctx context.Context) {
406+
m.contextsSync.Lock()
407+
m.ctx = ctx
408+
m.contextsSync.Unlock()
413409
}

‎platform/view/services/view/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func getContext(t *testing.T, wg *sync.WaitGroup, m *manager) {
177177
assert.Error(t, err)
178178
}
179179

180-
func start(t *testing.T, wg *sync.WaitGroup, m Manager, ctx context.Context) {
180+
func start(t *testing.T, wg *sync.WaitGroup, m manager, ctx context.Context) {
181181
m.Start(ctx)
182182
wg.Done()
183183
}

‎platform/view/services/view/web/view.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import (
1111
"encoding/json"
1212
"net/http"
1313

14-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view"
15-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view/protos"
1614
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
17-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/grpc/server"
15+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
1816
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view/grpc/server/protos"
1917
server2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/web/server"
2018
view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/view"

0 commit comments

Comments
 (0)