From 9f38415aa864ba0dd35b46df52a034dffa0089de Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Mon, 21 Oct 2024 10:46:45 -0400 Subject: [PATCH 1/2] Remove service --- apps/manual-container-metrics/app/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/manual-container-metrics/app/main.go b/apps/manual-container-metrics/app/main.go index c6d4e99..4d5c0aa 100644 --- a/apps/manual-container-metrics/app/main.go +++ b/apps/manual-container-metrics/app/main.go @@ -63,7 +63,7 @@ func main() { ctx := context.Background() // Create resource. - res, err := resource.New(ctx, resource.WithFromEnv()) + res, err := resource.New(ctx, resource.WithFromEnv(), resource.WithContainer()) if err != nil { log.Fatalf("failed to create resource: ", err) } @@ -93,7 +93,7 @@ func main() { containerNetSent, err := meter.Float64UpDownCounter("container.net.sent") containerNetRcvd, err := meter.Float64UpDownCounter("container.net.rcvd") - attr := metric2.WithAttributes(attribute.String("container.name", os.Getenv("OTEL_CONTAINER_NAME")), attribute.String("container.id", os.Getenv("OTEL_K8S_CONTAINER_ID"))) + attr := metric2.WithAttributes(attribute.String("customer.attribute", "value")) containerCpuUsage.Add(ctx, 1, attr) containerCpuLimit.Add(ctx, 1, attr) containerCpuUser.Add(ctx, 1, attr) From 99c69245bd2e7e7d640fbf0c642b06ae50228893 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Mon, 21 Oct 2024 10:48:17 -0400 Subject: [PATCH 2/2] Remove service --- apps/manual-container-metrics/app/main.go | 4 ++-- apps/rest-services/golang/calendar/main.go | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/apps/manual-container-metrics/app/main.go b/apps/manual-container-metrics/app/main.go index 4d5c0aa..c6d4e99 100644 --- a/apps/manual-container-metrics/app/main.go +++ b/apps/manual-container-metrics/app/main.go @@ -63,7 +63,7 @@ func main() { ctx := context.Background() // Create resource. - res, err := resource.New(ctx, resource.WithFromEnv(), resource.WithContainer()) + res, err := resource.New(ctx, resource.WithFromEnv()) if err != nil { log.Fatalf("failed to create resource: ", err) } @@ -93,7 +93,7 @@ func main() { containerNetSent, err := meter.Float64UpDownCounter("container.net.sent") containerNetRcvd, err := meter.Float64UpDownCounter("container.net.rcvd") - attr := metric2.WithAttributes(attribute.String("customer.attribute", "value")) + attr := metric2.WithAttributes(attribute.String("container.name", os.Getenv("OTEL_CONTAINER_NAME")), attribute.String("container.id", os.Getenv("OTEL_K8S_CONTAINER_ID"))) containerCpuUsage.Add(ctx, 1, attr) containerCpuLimit.Add(ctx, 1, attr) containerCpuUser.Add(ctx, 1, attr) diff --git a/apps/rest-services/golang/calendar/main.go b/apps/rest-services/golang/calendar/main.go index 7e78768..cdd5c0b 100644 --- a/apps/rest-services/golang/calendar/main.go +++ b/apps/rest-services/golang/calendar/main.go @@ -22,13 +22,11 @@ import ( "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" "go.uber.org/zap" ) const ( defaultPort = "9090" - serviceName = "OTEL_SERVICE_NAME" PORT_STR = "PORT" ) @@ -145,17 +143,13 @@ func realMain() error { ctx := context.Background() endpoint := fmt.Sprintf(":%s", getEnv(PORT_STR, defaultPort)) - service := getEnv(serviceName, "calendar-otel") var err error - logger, err = zap.NewDevelopment(zap.Fields(zap.String("service", service))) + logger, err = zap.NewDevelopment() if err != nil { return err } // resource.WithContainer() adds container.id which the agent will leverage to fetch container tags via the tagger. - res, err := resource.New(ctx, resource.WithContainer(), - resource.WithAttributes(semconv.ServiceName(service)), - resource.WithFromEnv(), - ) + res, err := resource.New(ctx, resource.WithContainer(), resource.WithFromEnv()) if err != nil { logger.Fatal("can't create resource", zap.Error(err)) return err