From 59a743cb24d98e51133d3806774fb89706bed8cd Mon Sep 17 00:00:00 2001
From: Christer Edvartsen <christer.edvartsen@nav.no>
Date: Mon, 12 Feb 2024 10:32:59 +0100
Subject: [PATCH] remove otel injection as the libraries does it for us

---
 internal/google_token_source/builder.go                   | 4 +---
 internal/reconcilers/google/gar/reconciler.go             | 3 +--
 internal/reconcilers/google/gcp/reconciler.go             | 2 --
 internal/reconcilers/google/workspace_admin/reconciler.go | 3 +--
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/internal/google_token_source/builder.go b/internal/google_token_source/builder.go
index f3dd2e2..3e68481 100644
--- a/internal/google_token_source/builder.go
+++ b/internal/google_token_source/builder.go
@@ -4,12 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"golang.org/x/oauth2"
 	admin_directory "google.golang.org/api/admin/directory/v1"
 	"google.golang.org/api/cloudresourcemanager/v3"
 	"google.golang.org/api/impersonate"
-	"google.golang.org/api/option"
 )
 
 type Builder struct {
@@ -41,7 +39,7 @@ func (g Builder) impersonateTokenSource(ctx context.Context, delegate bool, scop
 		impersonateConfig.Subject = g.subjectEmail
 	}
 
-	return impersonate.CredentialsTokenSource(ctx, impersonateConfig, option.WithHTTPClient(otelhttp.DefaultClient))
+	return impersonate.CredentialsTokenSource(ctx, impersonateConfig)
 }
 
 func (g Builder) Admin(ctx context.Context) (oauth2.TokenSource, error) {
diff --git a/internal/reconcilers/google/gar/reconciler.go b/internal/reconcilers/google/gar/reconciler.go
index 4f1dec7..0b969b2 100644
--- a/internal/reconcilers/google/gar/reconciler.go
+++ b/internal/reconcilers/google/gar/reconciler.go
@@ -17,7 +17,6 @@ import (
 	"github.com/nais/api/pkg/protoapi"
 	"github.com/sirupsen/logrus"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iam/v1"
 	"google.golang.org/api/option"
@@ -80,7 +79,7 @@ func New(ctx context.Context, googleManagementProjectID, tenantDomain, workloadI
 		}
 
 		if r.iamService == nil {
-			iamService, err := iam.NewService(ctx, option.WithTokenSource(ts), option.WithHTTPClient(otelhttp.DefaultClient))
+			iamService, err := iam.NewService(ctx, option.WithTokenSource(ts))
 			if err != nil {
 				return nil, err
 			}
diff --git a/internal/reconcilers/google/gcp/reconciler.go b/internal/reconcilers/google/gcp/reconciler.go
index a730f43..ef0c8f4 100644
--- a/internal/reconcilers/google/gcp/reconciler.go
+++ b/internal/reconcilers/google/gcp/reconciler.go
@@ -19,7 +19,6 @@ import (
 	"github.com/nais/api/pkg/apiclient/iterator"
 	"github.com/nais/api/pkg/protoapi"
 	"github.com/sirupsen/logrus"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"google.golang.org/api/cloudbilling/v1"
 	"google.golang.org/api/cloudresourcemanager/v3"
 	"google.golang.org/api/compute/v1"
@@ -555,7 +554,6 @@ func createGcpServices(ctx context.Context, googleManagementProjectID, tenantDom
 
 	opts := []option.ClientOption{
 		option.WithTokenSource(ts),
-		option.WithHTTPClient(otelhttp.DefaultClient),
 	}
 
 	cloudResourceManagerService, err := cloudresourcemanager.NewService(ctx, opts...)
diff --git a/internal/reconcilers/google/workspace_admin/reconciler.go b/internal/reconcilers/google/workspace_admin/reconciler.go
index 7d3323d..c03241c 100644
--- a/internal/reconcilers/google/workspace_admin/reconciler.go
+++ b/internal/reconcilers/google/workspace_admin/reconciler.go
@@ -11,7 +11,6 @@ import (
 	"github.com/nais/api/pkg/apiclient"
 	"github.com/nais/api/pkg/protoapi"
 	"github.com/sirupsen/logrus"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	admin_directory_v1 "google.golang.org/api/admin/directory/v1"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/option"
@@ -62,7 +61,7 @@ func New(ctx context.Context, googleManagementProjectID, tenantDomain string, op
 			return nil, fmt.Errorf("get delegated token source: %w", err)
 		}
 
-		srv, err := admin_directory_v1.NewService(ctx, option.WithTokenSource(ts), option.WithHTTPClient(otelhttp.DefaultClient))
+		srv, err := admin_directory_v1.NewService(ctx, option.WithTokenSource(ts))
 		if err != nil {
 			return nil, fmt.Errorf("retrieve directory client: %w", err)
 		}