Merge branch 'main' of github.com:open-telemetry/opentelemetry-operator into feature/3149

Author: iblancasa

.chloggen/add-ip-families.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'enhancement'
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: 'collector'
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Enabling ipFamilies and ipFamilyPolicy to be configured via OpenTelemetryCollector"
+
+# One or more tracking issues related to the change
+issues: [2958]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

Makefile

@@ -35,6 +35,9 @@ TARGETALLOCATOR_IMG ?= ${IMG_PREFIX}/${TARGETALLOCATOR_IMG_REPO}:$(addprefix v,$
 OPERATOROPAMPBRIDGE_IMG_REPO ?= operator-opamp-bridge
 OPERATOROPAMPBRIDGE_IMG ?= ${IMG_PREFIX}/${OPERATOROPAMPBRIDGE_IMG_REPO}:$(addprefix v,${VERSION})
 
+BRIDGETESTSERVER_IMG_REPO ?= e2e-test-app-bridge-server
+BRIDGETESTSERVER_IMG ?= ${IMG_PREFIX}/${BRIDGETESTSERVER_IMG_REPO}:ve2e
+
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -319,7 +322,7 @@ e2e-upgrade: undeploy chainsaw
 	$(CHAINSAW) test --test-dir ./tests/e2e-upgrade
 
 .PHONY: prepare-e2e
-prepare-e2e: chainsaw set-image-controller add-image-targetallocator add-image-opampbridge container container-target-allocator container-operator-opamp-bridge start-kind cert-manager install-metrics-server install-targetallocator-prometheus-crds load-image-all deploy
+prepare-e2e: chainsaw set-image-controller add-image-targetallocator add-image-opampbridge container container-target-allocator container-operator-opamp-bridge container-bridge-test-server start-kind cert-manager install-metrics-server install-targetallocator-prometheus-crds load-image-all deploy
 
 .PHONY: scorecard-tests
 scorecard-tests: operator-sdk
@@ -357,6 +360,11 @@ container-operator-opamp-bridge: GOOS = linux
 container-operator-opamp-bridge: operator-opamp-bridge
 	docker build -t ${OPERATOROPAMPBRIDGE_IMG} cmd/operator-opamp-bridge
 
+.PHONY: container-bridge-test-server
+container-bridge-test-server: GOOS = linux
+container-bridge-test-server:
+	docker build -t ${BRIDGETESTSERVER_IMG} tests/test-e2e-apps/bridge-server
+
 .PHONY: start-kind
 start-kind: kind
 ifeq (true,$(START_KIND_CLUSTER))
@@ -373,7 +381,7 @@ install-targetallocator-prometheus-crds:
 	./hack/install-targetallocator-prometheus-crds.sh
 
 .PHONY: load-image-all
-load-image-all: load-image-operator load-image-target-allocator load-image-operator-opamp-bridge
+load-image-all: load-image-operator load-image-target-allocator load-image-operator-opamp-bridge load-image-bridge-test-server
 
 .PHONY: load-image-operator
 load-image-operator: container kind
@@ -392,6 +400,9 @@ else
 	$(MAKE) container-target-allocator-push
 endif
 
+.PHONY: load-image-bridge-test-server
+load-image-bridge-test-server: container-bridge-test-server kind
+	$(KIND) load --name $(KIND_CLUSTER_NAME) docker-image ${BRIDGETESTSERVER_IMG}
 
 .PHONY: load-image-operator-opamp-bridge
 load-image-operator-opamp-bridge: container-operator-opamp-bridge kind
@@ -499,7 +510,7 @@ operator-sdk: $(LOCALBIN)
 # Generate bundle manifests and metadata, then validate generated files.
 .PHONY: generate-bundle
 generate-bundle: kustomize operator-sdk manifests set-image-controller api-docs
-	sed -i 's/minKubeVersion: .*/minKubeVersion: $(MIN_KUBERNETES_VERSION)/' config/manifests/$(BUNDLE_VARIANT)/bases/opentelemetry-operator.clusterserviceversion.yaml
+	sed -e 's/minKubeVersion: .*/minKubeVersion: $(MIN_KUBERNETES_VERSION)/' config/manifests/$(BUNDLE_VARIANT)/bases/opentelemetry-operator.clusterserviceversion.yaml
 
 	$(OPERATOR_SDK) generate kustomize manifests -q --input-dir $(MANIFESTS_DIR) --output-dir $(MANIFESTS_DIR)
 	cd $(BUNDLE_DIR) && cp ../../PROJECT . && $(KUSTOMIZE) build ../../$(MANIFESTS_DIR) | $(OPERATOR_SDK) generate bundle $(BUNDLE_BUILD_GEN_FLAGS) && rm PROJECT

apis/v1alpha1/opampbridge_types.go

@@ -107,6 +107,12 @@ type OpAMPBridgeSpec struct {
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
 	PodDNSConfig v1.PodDNSConfig `json:"podDnsConfig,omitempty"`
+	// IPFamily represents the IP Family (IPv4 or IPv6). This type is used
+	// to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
+	// +optional
+	IpFamilies []v1.IPFamily `json:"ipFamilies,omitempty"`
+	// IPFamilyPolicy represents the dual-stack-ness requested or required by a Service
+	IpFamilyPolicy *v1.IPFamilyPolicy `json:"ipFamilyPolicy,omitempty"`
 }
 
 // OpAMPBridgeStatus defines the observed state of OpAMPBridge.

apis/v1alpha1/zz_generated.deepcopy.go

@@ -226,6 +226,14 @@ type OpenTelemetryCommonFields struct {
 	AdditionalContainers []v1.Container `json:"additionalContainers,omitempty"`
 	// PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
 	PodDNSConfig v1.PodDNSConfig `json:"podDnsConfig,omitempty"`
+	// IPFamily represents the IP Family (IPv4 or IPv6). This type is used
+	// to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
+	// +optional
+	IpFamilies []v1.IPFamily `json:"ipFamilies,omitempty"`
+	// IPFamilyPolicy represents the dual-stack-ness requested or required by a Service
+	// +kubebuilder:default:=SingleStack
+	// +optional
+	IpFamilyPolicy *v1.IPFamilyPolicy `json:"ipFamilyPolicy,omitempty"`
 }
 
 type StatefulSetCommonFields struct {

apis/v1beta1/common.go

@@ -592,6 +592,12 @@ spec:
                 type: string
               imagePullPolicy:
                 type: string
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

apis/v1beta1/zz_generated.deepcopy.go

@@ -6739,6 +6739,13 @@ spec:
                   - name
                   type: object
                 type: array
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                default: SingleStack
+                type: string
               lifecycle:
                 properties:
                   postStart:

bundle/community/manifests/opentelemetry.io_opampbridges.yaml

@@ -99,7 +99,7 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2024-07-18T14:09:56Z"
+    createdAt: "2024-07-20T18:51:11Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -501,6 +501,7 @@ spec:
                 - --enable-nginx-instrumentation=true
                 - --enable-go-instrumentation=true
                 - --enable-multi-instrumentation=true
+                - --openshift-create-dashboard=true
                 - --feature-gates=+operator.observability.prometheus
                 env:
                 - name: SERVICE_ACCOUNT_NAME

bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml

@@ -592,6 +592,12 @@ spec:
                 type: string
               imagePullPolicy:
                 type: string
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -6739,6 +6739,13 @@ spec:
                   - name
                   type: object
                 type: array
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                default: SingleStack
+                type: string
               lifecycle:
                 properties:
                   postStart:

bundle/openshift/manifests/opentelemetry.io_opampbridges.yaml

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oklog/ulid/v2"
+	"github.com/google/uuid"
 	"github.com/open-telemetry/opamp-go/client"
 	"github.com/open-telemetry/opamp-go/client/types"
 	"github.com/open-telemetry/opamp-go/protobufs"
@@ -44,7 +44,7 @@ type Agent struct {
 	startTime   uint64
 	lastHash    []byte
 
-	instanceId         ulid.ULID
+	instanceId         uuid.UUID
 	agentDescription   *protobufs.AgentDescription
 	remoteConfigStatus *protobufs.RemoteConfigStatus
 
@@ -211,7 +211,7 @@ func (agent *Agent) Start() error {
 	settings := types.StartSettings{
 		OpAMPServerURL: agent.config.Endpoint,
 		Header:         agent.config.Headers.ToHTTPHeader(),
-		InstanceUid:    agent.instanceId.String(),
+		InstanceUid:    types.InstanceUid(agent.instanceId),
 		Callbacks: types.CallbacksStruct{
 			OnConnectFunc:              agent.onConnect,
 			OnConnectFailedFunc:        agent.onConnectFailed,
@@ -274,7 +274,7 @@ func (agent *Agent) runHeartbeat() {
 
 // updateAgentIdentity receives a new instanced Id from the remote server and updates the agent's instanceID field.
 // The meter will be reinitialized by the onMessage function.
-func (agent *Agent) updateAgentIdentity(instanceId ulid.ULID) {
+func (agent *Agent) updateAgentIdentity(instanceId uuid.UUID) {
 	agent.logger.V(3).Info("Agent identity is being changed",
 		"old instanceId", agent.instanceId.String(),
 		"new instanceid", instanceId.String())
@@ -416,12 +416,12 @@ func (agent *Agent) onMessage(ctx context.Context, msg *types.MessageData) {
 	// The instance id is updated prior to the meter initialization so that the new meter will report using the updated
 	// instanceId.
 	if msg.AgentIdentification != nil {
-		newInstanceId, err := ulid.Parse(msg.AgentIdentification.NewInstanceUid)
+		uid, err := uuid.FromBytes(msg.AgentIdentification.NewInstanceUid)
 		if err != nil {
 			agent.logger.Error(err, "couldn't parse instance UID")
 			return
 		}
-		agent.updateAgentIdentity(newInstanceId)
+		agent.updateAgentIdentity(uid)
 	}
 
 	if msg.OwnMetricsConnSettings != nil {

bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml

@@ -16,15 +16,14 @@ package agent
 
 import (
 	"context"
-	"crypto/rand"
 	"fmt"
 	"os"
 	"sort"
 	"testing"
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oklog/ulid/v2"
+	"github.com/google/uuid"
 	"github.com/open-telemetry/opamp-go/client"
 	"github.com/open-telemetry/opamp-go/client/types"
 	"github.com/open-telemetry/opamp-go/protobufs"
@@ -883,15 +882,20 @@ func Test_CanUpdateIdentity(t *testing.T) {
 	defer agent.Shutdown()
 	require.NoError(t, err, "should be able to start agent")
 	previousInstanceId := agent.instanceId.String()
-	entropy := ulid.Monotonic(rand.Reader, 0)
-	newId := ulid.MustNew(ulid.MaxTime(), entropy)
+	newId, err := uuid.NewV7()
+	require.NoError(t, err)
+	marshalledId, err := newId.MarshalBinary()
+	require.NoError(t, err)
 	agent.onMessage(context.Background(), &types.MessageData{
 		AgentIdentification: &protobufs.AgentIdentification{
-			NewInstanceUid: newId.String(),
+			NewInstanceUid: marshalledId,
 		},
 	})
 	assert.NotEqual(t, previousInstanceId, newId.String())
 	assert.Equal(t, agent.instanceId, newId)
+	parsedUUID, err := uuid.FromBytes(marshalledId)
+	require.NoError(t, err)
+	assert.Equal(t, newId, parsedUUID)
 }
 
 func getMessageDataFromConfigFile(filemap map[string]string) (*types.MessageData, error) {

cmd/operator-opamp-bridge/agent/agent.go

@@ -15,7 +15,6 @@
 package config
 
 import (
-	"crypto/rand"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -25,7 +24,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oklog/ulid/v2"
+	"github.com/google/uuid"
 	opampclient "github.com/open-telemetry/opamp-go/client"
 	"github.com/open-telemetry/opamp-go/protobufs"
 	"github.com/spf13/pflag"
@@ -186,9 +185,13 @@ func keyValuePair(key string, value string) *protobufs.KeyValue {
 	}
 }
 
-func (c *Config) GetNewInstanceId() ulid.ULID {
-	entropy := ulid.Monotonic(rand.Reader, 0)
-	return ulid.MustNew(ulid.Timestamp(time.Now()), entropy)
+func (c *Config) GetNewInstanceId() uuid.UUID {
+	u, err := uuid.NewV7()
+	if err != nil {
+		// This really should never happen and if it does we should fail.
+		panic(err)
+	}
+	return u
 }
 
 func (c *Config) RemoteConfigEnabled() bool {

cmd/operator-opamp-bridge/agent/agent_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/oklog/ulid/v2"
+	"github.com/google/uuid"
 	"github.com/open-telemetry/opamp-go/protobufs"
 	"github.com/shirou/gopsutil/process"
 	"go.opentelemetry.io/otel/attribute"
@@ -53,7 +53,7 @@ type MetricReporter struct {
 // NewMetricReporter creates an OTLP/HTTP client to the destination address supplied by the server.
 // TODO: do more validation on the endpoint, allow for gRPC.
 // TODO: set global provider and add more metrics to be reported.
-func NewMetricReporter(logger logr.Logger, dest *protobufs.TelemetryConnectionSettings, agentType string, agentVersion string, instanceId ulid.ULID) (*MetricReporter, error) {
+func NewMetricReporter(logger logr.Logger, dest *protobufs.TelemetryConnectionSettings, agentType string, agentVersion string, instanceId uuid.UUID) (*MetricReporter, error) {
 
 	if dest.DestinationEndpoint == "" {
 		return nil, fmt.Errorf("metric destination must specify DestinationEndpoint")

cmd/operator-opamp-bridge/config/config.go

@@ -589,6 +589,12 @@ spec:
                 type: string
               imagePullPolicy:
                 type: string
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

cmd/operator-opamp-bridge/metrics/reporter.go

@@ -6725,6 +6725,13 @@ spec:
                   - name
                   type: object
                 type: array
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                default: SingleStack
+                type: string
               lifecycle:
                 properties:
                   postStart:

config/crd/bases/opentelemetry.io_opampbridges.yaml

@@ -1929,6 +1929,13 @@ spec:
                   - name
                   type: object
                 type: array
+              ipFamilies:
+                items:
+                  type: string
+                type: array
+              ipFamilyPolicy:
+                default: SingleStack
+                type: string
               lifecycle:
                 properties:
                   postStart:

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

@@ -8,4 +8,5 @@
     - --enable-nginx-instrumentation=true
     - '--enable-go-instrumentation=true'
     - '--enable-multi-instrumentation=true'
+    - '--openshift-create-dashboard=true'
     - '--feature-gates=+operator.observability.prometheus'