Merge pull request #21 from DataDog/mackjmr/add-ds-gateway-deploy-to-…

…staging

Deploy demo to ng-6 (Daemonset => Gateway)

.gitlab-ci.yml

@@ -246,4 +246,15 @@ staging-deploy-gateway-demo-eks:
     SCRIPT: ./ci/scripts/ci-deploy-demo-staging.sh
     CLUSTER_NAME: dd-otel
     CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
-    REGION: us-east-1
+    REGION: us-east-1
+# Demo env:otel-ds-gateway
+staging-deploy-ds-gateway-demo-eks:
+  !!merge <<: *staging-deploy
+  variables:
+    NAMESPACE: otel-ds-gateway
+    VALUES: ./ci/values-ds-gateway.yaml
+    NODE_GROUP: ng-6
+    SCRIPT: ./ci/scripts/ci-deploy-demo-staging.sh
+    CLUSTER_NAME: dd-otel
+    CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
+    REGION: us-east-1

ci/values-ds-gateway.yaml

@@ -0,0 +1,4 @@
+default:
+  schedulingRules:
+    nodeSelector:
+      alpha.eksctl.io/nodegroup-name: ng-6

src/productcatalogservice/main.go

@@ -20,6 +20,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"go.opentelemetry.io/contrib/instrumentation/runtime"
+	"go.opentelemetry.io/otel/sdk/instrumentation"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 
@@ -98,11 +99,33 @@ func initMeterProvider() *sdkmetric.MeterProvider {
 	mp := sdkmetric.NewMeterProvider(
 		sdkmetric.WithReader(sdkmetric.NewPeriodicReader(exporter)),
 		sdkmetric.WithResource(initResource()),
+		sdkmetric.WithView(			
+			sdkmetric.NewView(
+				sdkmetric.Instrument{Scope: instrumentation.Scope{Name: "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"}},
+				sdkmetric.Stream{
+					AttributeFilter: disallowedAttr(
+						"net.sock.peer.port",
+						"net.sock.peer.addr",
+					),
+				},
+			),
+		),
 	)
 	otel.SetMeterProvider(mp)
 	return mp
 }
 
+func disallowedAttr(v ...string) attribute.Filter {
+	m := make(map[string]struct{}, len(v))
+	for _, s := range v {
+		m[s] = struct{}{}
+	}
+	return func(kv attribute.KeyValue) bool {
+		_, ok := m[string(kv.Key)]
+		return !ok
+	}
+}
+
 func main() {
 	tp := initTracerProvider()
 	defer func() {