Remove Grafana Cloud endpoint configuration (#32)

* Remove Grafana Cloud endpoint configuration

* Fix sdk_inject after merge

* Fix linter

Author: mariomac

contrib/example-service.yaml

@@ -5,13 +5,6 @@ trace_printer: text
 ebpf:
   wakeup_len: 100
 
-grafana:
-  otlp:
-    cloud_zone: <my-cloud-zone>
-    cloud_instance_id: <my-instance-id>
-    cloud_submit:
-      - metrics
-      - traces
 routes:
   unmatched: heuristic
 

pkg/beyla/config.go

@@ -53,12 +53,6 @@ var DefaultConfig = Config{
 		ContextPropagationEnabled: false,
 		ContextPropagation:        config.ContextPropagationDisabled,
 	},
-	Grafana: otel.GrafanaConfig{
-		OTLP: otel.GrafanaOTLP{
-			// by default we will only submit traces, assuming span2metrics will do the metrics conversion
-			Submit: []string{"traces"},
-		},
-	},
 	NameResolver: &transform.NameResolverConfig{
 		Sources:  []string{"k8s"},
 		CacheLen: 1024,
@@ -142,10 +136,6 @@ type Config struct {
 	// NetworkFlows configuration for Network Observability feature
 	NetworkFlows NetworkConfig `yaml:"network"`
 
-	// Grafana overrides some values of the otel.MetricsConfig and otel.TracesConfig below
-	// for a simpler submission of OTEL metrics to Grafana Cloud
-	Grafana otel.GrafanaConfig `yaml:"grafana"`
-
 	Filters filter.AttributesConfig `yaml:"filter"`
 
 	Attributes Attributes `yaml:"attributes"`
@@ -270,10 +260,10 @@ func (c *Config) Validate() error {
 		return ConfigError("OTEL_EBPF_KUBE_INFORMERS_SYNC_TIMEOUT duration must be greater than 0s")
 	}
 
-	if c.Enabled(FeatureNetO11y) && !c.Grafana.OTLP.MetricsEnabled() && !c.Metrics.Enabled() &&
+	if c.Enabled(FeatureNetO11y) && !c.Metrics.Enabled() &&
 		!c.Prometheus.Enabled() && !c.NetworkFlows.Print {
 		return ConfigError("enabling network metrics requires to enable at least the OpenTelemetry" +
-			" metrics exporter: grafana, otel_metrics_export or prometheus_export sections in the YAML configuration file; or the" +
+			" metrics exporter: otel_metrics_export or prometheus_export sections in the YAML configuration file; or the" +
 			" OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_METRICS_ENDPOINT or OTEL_EBPF_PROMETHEUS_PORT environment variables. For debugging" +
 			" purposes, you can also set OTEL_EBPF_NETWORK_PRINT_FLOWS=true")
 	}
@@ -283,11 +273,10 @@ func (c *Config) Validate() error {
 	}
 
 	if c.Enabled(FeatureAppO11y) && !c.TracePrinter.Enabled() &&
-		!c.Grafana.OTLP.MetricsEnabled() && !c.Grafana.OTLP.TracesEnabled() &&
 		!c.Metrics.Enabled() && !c.Traces.Enabled() &&
 		!c.Prometheus.Enabled() && !c.TracePrinter.Enabled() {
 		return ConfigError("you need to define at least one exporter: trace_printer," +
-			" grafana, otel_metrics_export, otel_traces_export or prometheus_export")
+			" otel_metrics_export, otel_traces_export or prometheus_export")
 	}
 
 	if len(c.Routes.WildcardChar) > 1 {
@@ -297,7 +286,7 @@ func (c *Config) Validate() error {
 	if c.InternalMetrics.Exporter == imetrics.InternalMetricsExporterOTEL && c.InternalMetrics.Prometheus.Port != 0 {
 		return ConfigError("you can't enable both OTEL and Prometheus internal metrics")
 	}
-	if c.InternalMetrics.Exporter == imetrics.InternalMetricsExporterOTEL && !c.Metrics.Enabled() && !c.Grafana.OTLP.MetricsEnabled() {
+	if c.InternalMetrics.Exporter == imetrics.InternalMetricsExporterOTEL && !c.Metrics.Enabled() {
 		return ConfigError("you can't enable OTEL internal metrics without enabling OTEL metrics")
 	}
 
@@ -309,7 +298,7 @@ func (c *Config) promNetO11yEnabled() bool {
 }
 
 func (c *Config) otelNetO11yEnabled() bool {
-	return (c.Metrics.Enabled() || c.Grafana.OTLP.MetricsEnabled()) && c.Metrics.NetworkMetricsEnabled()
+	return c.Metrics.Enabled() && c.Metrics.NetworkMetricsEnabled()
 }
 
 func (c *Config) willUseTC() bool {

pkg/beyla/config_test.go

@@ -83,7 +83,6 @@ discovery:
 	t.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "localhost:3131")
 	t.Setenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", "localhost:3232")
 	t.Setenv("OTEL_EBPF_INTERNAL_METRICS_PROMETHEUS_PORT", "3210")
-	t.Setenv("GRAFANA_CLOUD_SUBMIT", "metrics,traces")
 	t.Setenv("KUBECONFIG", "/foo/bar")
 	t.Setenv("OTEL_EBPF_NAME_RESOLVER_SOURCES", "k8s,dns")
 
@@ -125,11 +124,6 @@ discovery:
 			ContextPropagationEnabled: false,
 			ContextPropagation:        config.ContextPropagationDisabled,
 		},
-		Grafana: otel.GrafanaConfig{
-			OTLP: otel.GrafanaOTLP{
-				Submit: []string{"metrics", "traces"},
-			},
-		},
 		NetworkFlows: nc,
 		Metrics: otel.MetricsConfig{
 			OTELIntervalMS:    60_000,
@@ -340,7 +334,7 @@ func TestConfigValidate_TracePrinter(t *testing.T) {
 		},
 		{
 			env:      envMap{"OTEL_EBPF_EXECUTABLE_PATH": "foo"},
-			errorMsg: "you need to define at least one exporter: trace_printer, grafana, otel_metrics_export, otel_traces_export or prometheus_export",
+			errorMsg: "you need to define at least one exporter: trace_printer, otel_metrics_export, otel_traces_export or prometheus_export",
 		},
 	}
 

pkg/components/beyla.go

@@ -159,7 +159,6 @@ func buildCommonContextInfo(
 	switch {
 	case config.InternalMetrics.Exporter == imetrics.InternalMetricsExporterOTEL:
 		var err error
-		config.Metrics.Grafana = &config.Grafana.OTLP
 		slog.Debug("reporting internal metrics as OpenTelemetry")
 		ctxInfo.Metrics, err = otel.NewInternalMetricsReporter(ctx, ctxInfo, &config.Metrics)
 		if err != nil {

pkg/export/otel/common.go

@@ -489,7 +489,7 @@ func ResourceAttrsFromEnv(svc *svc.Attrs) []attribute.KeyValue {
 	return otelResourceAttrs
 }
 
-func ResolveOTLPEndpoint(endpoint, common string, grafana *GrafanaOTLP) (string, bool) {
+func ResolveOTLPEndpoint(endpoint, common string) (string, bool) {
 	if endpoint != "" {
 		return endpoint, false
 	}
@@ -498,10 +498,6 @@ func ResolveOTLPEndpoint(endpoint, common string, grafana *GrafanaOTLP) (string,
 		return common, true
 	}
 
-	if grafana != nil && grafana.CloudZone != "" && grafana.Endpoint() != "" {
-		return grafana.Endpoint(), true
-	}
-
 	return "", false
 }
 

pkg/export/otel/common_test.go

@@ -183,14 +183,6 @@ func TestParseOTELEnvVar_nil(t *testing.T) {
 }
 
 func TestResolveOTLPEndpoint(t *testing.T) {
-	grafana1 := GrafanaOTLP{
-		CloudZone: "foo",
-	}
-
-	const grafanaEndpoint = "https://otlp-gateway-foo.grafana.net/otlp"
-
-	grafana2 := GrafanaOTLP{}
-
 	type expected struct {
 		e      string
 		common bool
@@ -199,24 +191,19 @@ func TestResolveOTLPEndpoint(t *testing.T) {
 	type testCase struct {
 		endpoint string
 		common   string
-		grafana  *GrafanaOTLP
 		expected expected
 	}
 
 	testCases := []testCase{
-		{endpoint: "e1", common: "c1", grafana: nil, expected: expected{e: "e1", common: false}},
-		{endpoint: "e1", common: "", grafana: nil, expected: expected{e: "e1", common: false}},
-		{endpoint: "", common: "c1", grafana: nil, expected: expected{e: "c1", common: true}},
-		{endpoint: "", common: "", grafana: nil, expected: expected{e: "", common: false}},
-		{endpoint: "e1", common: "c1", grafana: &grafana1, expected: expected{e: "e1", common: false}},
-		{endpoint: "", common: "c1", grafana: &grafana1, expected: expected{e: "c1", common: true}},
-		{endpoint: "", common: "", grafana: &grafana1, expected: expected{e: grafanaEndpoint, common: true}},
-		{endpoint: "", common: "", grafana: &grafana2, expected: expected{e: "", common: false}},
+		{endpoint: "e1", common: "c1", expected: expected{e: "e1", common: false}},
+		{endpoint: "e1", common: "", expected: expected{e: "e1", common: false}},
+		{endpoint: "", common: "c1", expected: expected{e: "c1", common: true}},
+		{endpoint: "", common: "", expected: expected{e: "", common: false}},
 	}
 
 	for _, tc := range testCases {
 		t.Run(fmt.Sprint(tc), func(t *testing.T) {
-			ep, common := ResolveOTLPEndpoint(tc.endpoint, tc.common, tc.grafana)
+			ep, common := ResolveOTLPEndpoint(tc.endpoint, tc.common)
 
 			assert.Equal(t, ep, tc.expected.e)
 			assert.Equal(t, common, tc.expected.common)

pkg/export/otel/grafana.go

@@ -120,9 +120,6 @@ type MetricsConfig struct {
 	TTL time.Duration `yaml:"ttl" env:"OTEL_EBPF_OTEL_METRICS_TTL"`
 
 	AllowServiceGraphSelfReferences bool `yaml:"allow_service_graph_self_references" env:"OTEL_EBPF_OTEL_ALLOW_SERVICE_GRAPH_SELF_REFERENCES"`
-
-	// Grafana configuration needs to be explicitly set up before building the graph
-	Grafana *GrafanaOTLP `yaml:"-"`
 }
 
 func (m *MetricsConfig) GetProtocol() Protocol {
@@ -159,7 +156,7 @@ func (m *MetricsConfig) GuessProtocol() Protocol {
 }
 
 func (m *MetricsConfig) OTLPMetricsEndpoint() (string, bool) {
-	return ResolveOTLPEndpoint(m.MetricsEndpoint, m.CommonEndpoint, m.Grafana)
+	return ResolveOTLPEndpoint(m.MetricsEndpoint, m.CommonEndpoint)
 }
 
 // EndpointEnabled specifies that the OTEL metrics node is enabled if and only if
@@ -168,7 +165,7 @@ func (m *MetricsConfig) OTLPMetricsEndpoint() (string, bool) {
 // Reason to disable linting: it requires to be a value despite it is considered a "heavy struct".
 // This method is invoked only once during startup time so it doesn't have a noticeable performance impact.
 func (m *MetricsConfig) EndpointEnabled() bool {
-	return m.CommonEndpoint != "" || m.MetricsEndpoint != "" || m.Grafana.MetricsEnabled()
+	return m.CommonEndpoint != "" || m.MetricsEndpoint != ""
 }
 
 func (m *MetricsConfig) SpanMetricsEnabled() bool {
@@ -1085,7 +1082,6 @@ func getHTTPMetricEndpointOptions(cfg *MetricsConfig) (otlpOptions, error) {
 		opts.SkipTLSVerify = cfg.InsecureSkipVerify
 	}
 
-	cfg.Grafana.setupOptions(&opts)
 	maps.Copy(opts.Headers, HeadersFromEnv(envHeaders))
 	maps.Copy(opts.Headers, HeadersFromEnv(envMetricsHeaders))
 
@@ -1113,7 +1109,6 @@ func getGRPCMetricEndpointOptions(cfg *MetricsConfig) (otlpOptions, error) {
 		opts.SkipTLSVerify = true
 	}
 
-	cfg.Grafana.setupOptions(&opts)
 	maps.Copy(opts.Headers, HeadersFromEnv(envHeaders))
 	maps.Copy(opts.Headers, HeadersFromEnv(envMetricsHeaders))
 

pkg/export/otel/metrics.go

@@ -138,21 +138,18 @@ func TestNetMetricsConfig_Enabled(t *testing.T) {
 	assert.True(t, NetMetricsConfig{Metrics: &MetricsConfig{
 		Features: []string{FeatureNetwork, FeatureApplication}, MetricsEndpoint: "foo",
 	}}.Enabled())
-	assert.True(t, NetMetricsConfig{Metrics: &MetricsConfig{
-		Features: []string{FeatureNetwork}, Grafana: &GrafanaOTLP{Submit: []string{"traces", "metrics"}, InstanceID: "33221"},
-	}}.Enabled())
 }
 
 func TestNetMetricsConfig_Disabled(t *testing.T) {
 	fa := []string{FeatureApplication}
 	fn := []string{FeatureNetwork}
 	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Features: fn}}.Enabled())
-	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Features: fn, Grafana: &GrafanaOTLP{Submit: []string{"traces"}, InstanceID: "33221"}}}.Enabled())
-	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Features: fn, Grafana: &GrafanaOTLP{Submit: []string{"metrics"}}}}.Enabled())
+	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Features: fn}}.Enabled())
+	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Features: fn}}.Enabled())
 	// network feature is not enabled
 	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{CommonEndpoint: "foo"}}.Enabled())
 	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{MetricsEndpoint: "foo", Features: fa}}.Enabled())
-	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{Grafana: &GrafanaOTLP{Submit: []string{"traces", "metrics"}, InstanceID: "33221"}}}.Enabled())
+	assert.False(t, NetMetricsConfig{Metrics: &MetricsConfig{}}.Enabled())
 }
 
 func TestGetFilteredNetworkResourceAttrs(t *testing.T) {