Set otel export url (#184)

dependabot · Oct 25, 2023 · b8df176 · b8df176
1 parent dfcbba8
commit b8df176
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/internal/infra/open_telemetry.go b/internal/infra/open_telemetry.go
@@ -8,6 +8,7 @@ import (
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/moby/moby/client"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -23,6 +24,7 @@ const sslCertificates = "/etc/ssl/certs/ca-certificates.crt"
 type Collector struct {
 	cli         *client.Client
 	containerID string
+	url         string
 }
 
 // NewCollector starts the OpenTelemetry collector container.
@@ -87,6 +89,17 @@ func NewCollector(ctx context.Context, cli *client.Client, net *Networks, params
 		return nil, fmt.Errorf("failed to start collector container: %w", err)
 	}
 
+	containerInfo, err := cli.ContainerInspect(ctx, collector.containerID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to inspect collector container: %w", err)
+	}
+	if net != nil {
+		collector.url = fmt.Sprintf("http://%s:4318", containerInfo.NetworkSettings.Networks[net.noInternetName].IPAddress)
+	} else {
+		// This should only happen during testing, adding a warning in case
+		log.Println("Warning: no-internet network not found")
+	}
+
 	return collector, nil
 
 }

diff --git a/internal/infra/run.go b/internal/infra/run.go
@@ -363,15 +363,16 @@ func runContainers(ctx context.Context, params RunParams, api *server.API) error
 		go prox.TailLogs(ctx, cli)
 	}
 
+	var collector *Collector
 	if params.CollectorConfigPath != "" {
-		collector, err := NewCollector(ctx, cli, networks, &params, prox)
+		collector, err = NewCollector(ctx, cli, networks, &params, prox)
 		if err != nil {
 			return err
 		}
 		defer collector.Close()
 	}
 
-	updater, err := NewUpdater(ctx, cli, networks, &params, prox)
+	updater, err := NewUpdater(ctx, cli, networks, &params, prox, collector)
 	if err != nil {
 		return err
 	}

diff --git a/internal/infra/updater.go b/internal/infra/updater.go
@@ -46,7 +46,7 @@ const (
 )
 
 // NewUpdater starts the update container interactively running /bin/sh, so it does not stop.
-func NewUpdater(ctx context.Context, cli *client.Client, net *Networks, params *RunParams, prox *Proxy) (*Updater, error) {
+func NewUpdater(ctx context.Context, cli *client.Client, net *Networks, params *RunParams, prox *Proxy, collector *Collector) (*Updater, error) {
 	containerCfg := &container.Config{
 		User:  dependabot,
 		Image: params.UpdaterImage,
@@ -55,7 +55,12 @@ func NewUpdater(ctx context.Context, cli *client.Client, net *Networks, params *
 	}
 
 	if params.CollectorConfigPath != "" {
-		containerCfg.Env = append(containerCfg.Env, "OTEL_ENABLED=true")
+		containerCfg.Env = append(
+			containerCfg.Env,
+			[]string{
+				"OTEL_ENABLED=true",
+				fmt.Sprintf("OTEL_EXPORTER_OTLP_ENDPOINT=%s", collector.url),
+			}...)
 	}
 
 	hostCfg := &container.HostConfig{}