Squashed commit of the following:

commit 1e57218 Author: Sebastian Poxhofer <[email protected]> Date: Wed Nov 1 19:23:03 2023 +0100 ci: migrate Renovate config (open-telemetry#1207) Co-authored-by: Austin Parker <[email protected]> commit 526a8d3 Author: Pierre Tessier <[email protected]> Date: Wed Nov 1 12:19:37 2023 -0400 [go services]: workaround: disable grpc metrics (open-telemetry#1205) * workaround: disable grpc metrics Signed-off-by: Pierre Tessier <[email protected]> * workaround: disable grpc metrics Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
roc-muto · Nov 2, 2023 · ee0a056 · ee0a056
1 parent 3a00b49
commit ee0a056
Show file tree

Hide file tree

Showing 6 changed files with 397 additions and 134 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,8 @@ release.
   ([#1151](https://github.com/open-telemetry/opentelemetry-demo/pull/1151))
 * [opensearch] Add Grafana dashboard panels for OpenSearch log data
   ([#1193](https://github.com/open-telemetry/opentelemetry-demo/pull/1193))
+* [go-sdk] Workaround: disable gRPC metrics in Go services
+  ([#1205](https://github.com/open-telemetry/opentelemetry-demo/pull/1205))
 
 ## 1.5.0
 

diff --git a/renovate.json5 b/renovate.json5
@@ -1,114 +1,98 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
+
   "schedule": "every weekend",
+
+  // double PR and branch limits
+  prConcurrentLimit: 20,
+  branchConcurrentLimit: 20,
+  labels: ['dependencies'],
+
+  // put by default dependency update all in one group
+  groupName: "config-no-service",
+
+  "assigneesFromCodeOwners": true,
+
   "packageRules": [
     {
-      "matchPaths": ["*"],
-      "ignorePaths": ["src/"],
-      "groupName": "config-no-service"
-    },
-    { 
-      "matchPaths": ["src/accountingservice"],
+      "matchFileNames": ["src/accountingservice/**"],
       "groupName": "accountingservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/adservice"],
+    {
+      "matchFileNames": ["src/adservice/**"],
       "groupName": "adservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/cartservice"],
+    {
+      "matchFileNames": ["src/cartservice/**"],
       "groupName": "cartservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/checkoutservice"],
+    {
+      "matchFileNames": ["src/checkoutservice/**"],
       "groupName": "checkoutservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/currencyservice"],
+    {
+      "matchFileNames": ["src/currencyservice/**"],
       "groupName": "currencyservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/emailservice"],
+    {
+      "matchFileNames": ["src/emailservice/**"],
       "groupName": "emailservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/featureflagservice"],
+    {
+      "matchFileNames": ["src/featureflagservice/**"],
       "groupName": "featureflagservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/frauddetectionservice"],
+    {
+      "matchFileNames": ["src/frauddetectionservice/**"],
       "groupName": "frauddetectionservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/frontend"],
+    {
+      "matchFileNames": ["src/frontend/**"],
       "groupName": "frontend",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/frontendproxy"],
+    {
+      "matchFileNames": ["src/frontendproxy/**"],
       "groupName": "frontendproxy",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/grafana"],
+    {
+      "matchFileNames": ["src/grafana/**"],
       "groupName": "grafana",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/kakfa"],
-      "groupName": "kakfa",
-      "assigneesFromCodeOwners": true
+    {
+      "matchFileNames": ["src/kafka/**"],
+      "groupName": "kafka",
     },
-    { 
-      "matchPaths": ["src/loadgenerator"],
+    {
+      "matchFileNames": ["src/loadgenerator/**"],
       "groupName": "loadgenerator",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/otelcollector"],
+    {
+      "matchFileNames": ["src/otelcollector/**"],
       "groupName": "otelcollector",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/paymentservice"],
+    {
+      "matchFileNames": ["src/paymentservice/**"],
       "groupName": "paymentservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/productcatalogservice"],
+    {
+      "matchFileNames": ["src/productcatalogservice/**"],
       "groupName": "productcatalogservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/prometheus"],
+    {
+      "matchFileNames": ["src/prometheus/**"],
       "groupName": "prometheus",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/quoteservice"],
+    {
+      "matchFileNames": ["src/quoteservice/**"],
       "groupName": "quoteservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/recommendationservice"],
+    {
+      "matchFileNames": ["src/recommendationservice/**"],
       "groupName": "recommendationservice",
-      "assigneesFromCodeOwners": true
     },
-    { 
-      "matchPaths": ["src/shippingservice"],
+    {
+      "matchFileNames": ["src/shippingservice/**"],
       "groupName": "shippingservice",
-      "assigneesFromCodeOwners": true
     },
     {
       // intentionally using Java 11 in some examples

diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"go.opentelemetry.io/otel/sdk/instrumentation"
 	semconv "go.opentelemetry.io/otel/semconv/v1.19.0"
 	"net"
 	"net/http"
@@ -110,6 +111,10 @@ 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/google.golang.org/grpc/otelgrpc"}},
+			sdkmetric.Stream{Aggregation: sdkmetric.AggregationDrop{}},
+		)),
 	)
 	otel.SetMeterProvider(mp)
 	return mp

diff --git a/src/productcatalogservice/go.mod b/src/productcatalogservice/go.mod
@@ -5,39 +5,37 @@ go 1.17
 require (
 	github.com/golang/protobuf v1.5.3
 	github.com/sirupsen/logrus v1.9.3
-	golang.org/x/net v0.11.0 // indirect
-	google.golang.org/grpc v1.56.1
+	golang.org/x/net v0.17.0 // indirect
+	google.golang.org/grpc v1.59.0
 )
 
 require (
-	go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0
-	go.opentelemetry.io/otel/sdk v1.16.0
-	go.opentelemetry.io/otel/sdk/metric v0.39.0
-	go.opentelemetry.io/otel/trace v1.16.0
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
+	go.opentelemetry.io/otel/sdk v1.19.0
+	go.opentelemetry.io/otel/sdk/metric v1.19.0
+	go.opentelemetry.io/otel/trace v1.19.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.20.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 )
 
 require (
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
-	go.opentelemetry.io/otel v1.16.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0
+	go.opentelemetry.io/otel v1.19.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 )