update metadata

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

subscriber.go

@@ -38,9 +38,6 @@ type httpSubscriber struct {
 
 func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	options := server.NewSubscriberOptions(opts...)
-	for _, o := range opts {
-		o(&options)
-	}
 
 	var endpoints []*registry.Endpoint
 	var handlers []*handler
@@ -59,15 +56,14 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 		}
 
 		handlers = append(handlers, h)
-
-		endpoints = append(endpoints, &registry.Endpoint{
-			Name:    "Func",
-			Request: registry.ExtractSubValue(typ),
-			Metadata: map[string]string{
-				"topic":      topic,
-				"subscriber": "true",
-			},
-		})
+		ep := &registry.Endpoint{
+			Name:     "Func",
+			Request:  registry.ExtractSubValue(typ),
+			Metadata: metadata.New(2),
+		}
+		ep.Metadata.Set("topic", topic)
+		ep.Metadata.Set("subscriber", "true")
+		endpoints = append(endpoints, ep)
 	} else {
 		hdlr := reflect.ValueOf(sub)
 		name := reflect.Indirect(hdlr).Type().Name()
@@ -87,15 +83,14 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 			}
 
 			handlers = append(handlers, h)
-
-			endpoints = append(endpoints, &registry.Endpoint{
-				Name:    name + "." + method.Name,
-				Request: registry.ExtractSubValue(method.Type),
-				Metadata: map[string]string{
-					"topic":      topic,
-					"subscriber": "true",
-				},
-			})
+			ep := &registry.Endpoint{
+				Name:     name + "." + method.Name,
+				Request:  registry.ExtractSubValue(method.Type),
+				Metadata: metadata.New(2),
+			}
+			ep.Metadata.Set("topic", topic)
+			ep.Metadata.Set("subscriber", "true")
+			endpoints = append(endpoints, ep)
 		}
 	}
 
@@ -119,10 +114,7 @@ func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) b
 			return err
 		}
 
-		hdr := make(map[string]string)
-		for k, v := range msg.Header {
-			hdr[k] = v
-		}
+		hdr := metadata.Copy(msg.Header)
 		delete(hdr, "Content-Type")
 		ctx := metadata.NewContext(context.Background(), hdr)