Remove copied references from Beyla about Beyla (#1305)

* Remove copied references from Beyla

* Make CloudHostID public

* Change CloudHostIDKey from const to var in export/otel

Author: MrAlias

bpf/generictracer/protocol_http.h

@@ -130,7 +130,7 @@ http_get_or_create_trace_info(http_connection_metadata_t *meta,
 
     u8 skip_tp_parsing = 0;
 
-    // If we receive SSL request, we know that Beyla definitely didn't
+    // If we receive SSL request, we know that OBI definitely didn't
     // inject the traceparent via the header, so if we already have
     // info about this transaction keep that, don't parse headers. Istio
     // for example can forward headers as-is, which can give us a stale

bpf/netolly/flow.h

@@ -64,7 +64,7 @@ typedef struct flow_metrics_t {
 } flow_metrics;
 
 // Attributes that uniquely identify a flow
-// TODO: remove attributes that won't be used in Beyla (e.g. MAC, maybe protocol...)
+// TODO: remove attributes that won't be used in OBI (e.g. MAC, maybe protocol...)
 typedef struct flow_id_t {
     // L3 network layer
     // IPv4 addresses are encoded as IPv6 addresses with prefix ::ffff/96

bpf/netolly/flows_common.h

@@ -125,7 +125,7 @@ static inline u8 fill_conn_initiator_key(flow_id *id, conn_initiator_key *key) {
 }
 
 // returns INITIATOR_SRC or INITIATOR_DST, but might return INITIATOR_UNKNOWN
-// if the connection initiator couldn't be found. The user-space Beyla pipeline
+// if the connection initiator couldn't be found. The user-space OBI pipeline
 // will handle this last case heuristically
 static inline u8 get_connection_initiator(flow_id *id, u16 flags) {
     conn_initiator_key initiator_key;

contrib/beyla@.service

@@ -1 +1,4 @@
-GRAFANA_CLOUD_API_KEY="<MY-CLOUD-API-KEY>"
+# Example environment variables for OBI
+# Configure OTLP endpoint for your cloud provider
+# OTEL_EXPORTER_OTLP_ENDPOINT="<YOUR-OTLP-ENDPOINT>"
+# OTEL_EXPORTER_OTLP_HEADERS="Authorization=Bearer <YOUR-API-KEY>"

contrib/example-service.env

@@ -0,0 +1,17 @@
+[Unit]
+Description=Run the OBI application for a given application
+After=network.target
+
+[Service]
+Type = simple
+Restart = always
+User = root
+Group = root
+WorkingDirectory = /etc/obi
+EnvironmentFile = /etc/obi/%i.env
+ExecStart=
+ExecStart=/usr/local/bin/obi \
+	--config=/etc/obi/%i.yaml
+
+[Install]
+WantedBy = multi-user.target

contrib/obi@.service

@@ -20,7 +20,7 @@ services:
     volumes:
       - ./configs/:/configs
       - ../../../testoutput:/coverage
-      - ../../../testoutput/run-1.16:/var/run/beyla
+      - ../../../testoutput/run-1.16:/var/run/obi
     image: hatest-obi
     privileged: true # in some environments (not GH Pull Requests) you can set it to false and then cap_add: [ SYS_ADMIN ]
     pid: "service:testserver"

internal/test/integration/docker-compose-1.16.yml

@@ -26,7 +26,7 @@ services:
     volumes:
       - ./configs/:/configs
       - ../../../testoutput:/coverage
-      - ../../../testoutput/run-1.17:/var/run/beyla
+      - ../../../testoutput/run-1.17:/var/run/obi
     image: hatest-obi
     privileged: true # in some environments (not GH Pull Requests) you can set it to false and then cap_add: [ SYS_ADMIN ]
     pid: "service:testserver"

internal/test/integration/docker-compose-1.17.yml

@@ -19,7 +19,7 @@ services:
       - ./configs/:/configs
       - ./system/sys/kernel/security:/sys/kernel/security
       - ../../../testoutput:/coverage
-      - ../../../testoutput/run-client:/var/run/beyla
+      - ../../../testoutput/run-client:/var/run/obi
     image: hatest-obi
     privileged: true # in some environments (not GH Pull Requests) you can set it to false and then cap_add: [ SYS_ADMIN ]
     pid: "service:testserver"

internal/test/integration/docker-compose-client.yml

@@ -20,7 +20,7 @@ services:
       - ./configs/:/configs
       - ./system/sys/kernel/security${SECURITY_CONFIG_SUFFIX}:/sys/kernel/security
       - ../../../testoutput:/coverage
-      - ../../../testoutput/run-base${TESTSERVER_DOCKERFILE_SUFFIX}:/var/run/beyla
+      - ../../../testoutput/run-base${TESTSERVER_DOCKERFILE_SUFFIX}:/var/run/obi
       # required for docker metadata decoration
       - /var/run/docker.sock:/var/run/docker.sock
     image: hatest-obi