Merge pull request open-telemetry#78 from IshwarKanse/rebase-bot-main

Merge https://github.com/open-telemetry/opentelemetry-operator:main (eab0b6a) into main

.chloggen/fix-ta-with-proxy.yaml

@@ -0,0 +1,20 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# 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: target allocator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix collector to target allocator connection in clusters with proxy.
+
+# One or more tracking issues related to the change
+issues: [3187]
+
+# (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: |
+  On clusters with global proxy the collector might fail to talk to target allocator
+  because the endpoint is set to `<ta-service-name>:port` and therefore it will go to proxy
+  and request might be forwarded to internet. Clusters with proxy configure `NO_PROXY` to `.svc.cluster.local` so 
+  the calls to this endpoint will not go through the proxy.

.github/workflows/e2e.yaml

@@ -57,7 +57,7 @@ jobs:
         path: bin
         key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
     - name: Install chainsaw
-      uses: kyverno/action-install-chainsaw@v0.2.7
+      uses: kyverno/action-install-chainsaw@v0.2.8
     - name: Install tools
       run: make install-tools
     - name: Prepare e2e tests

autoinstrumentation/python/requirements.txt

@@ -1,61 +1,60 @@
-opentelemetry-distro==0.46b0
+opentelemetry-distro==0.47b0
 # We don't use the distro[otlp] option which automatically includes exporters since gRPC is not appropriate for
 # injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for.
-opentelemetry-exporter-otlp-proto-http==1.25.0
-opentelemetry-exporter-prometheus==0.46b0
+opentelemetry-exporter-otlp-proto-http==1.26.0
+opentelemetry-exporter-prometheus==0.47b0
 
-opentelemetry-propagator-b3==1.25.0
-opentelemetry-propagator-jaeger==1.25.0
+opentelemetry-propagator-b3==1.26.0
+opentelemetry-propagator-jaeger==1.26.0
 opentelemetry-propagator-aws-xray==1.0.1
 
-opentelemetry-instrumentation==0.46b0
-opentelemetry-propagator-ot-trace==0.46b0
+opentelemetry-instrumentation==0.47b0
+opentelemetry-propagator-ot-trace==0.47b0
 
 # Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation
-opentelemetry-instrumentation-aio-pika==0.46b0
-opentelemetry-instrumentation-aiohttp-client==0.46b0
-opentelemetry-instrumentation-aiopg==0.46b0
-opentelemetry-instrumentation-asgi==0.46b0
-opentelemetry-instrumentation-asyncio==0.46b0
-opentelemetry-instrumentation-asyncpg==0.46b0
-opentelemetry-instrumentation-aws-lambda==0.46b0
-opentelemetry-instrumentation-boto==0.46b0
-opentelemetry-instrumentation-boto3sqs==0.46b0
-opentelemetry-instrumentation-botocore==0.46b0
-opentelemetry-instrumentation-cassandra==0.46b0
-opentelemetry-instrumentation-celery==0.46b0
-opentelemetry-instrumentation-confluent-kafka==0.46b0
-opentelemetry-instrumentation-dbapi==0.46b0
-opentelemetry-instrumentation-django==0.46b0
-opentelemetry-instrumentation-elasticsearch==0.46b0
-opentelemetry-instrumentation-falcon==0.46b0
-opentelemetry-instrumentation-fastapi==0.46b0
-opentelemetry-instrumentation-flask==0.46b0
-opentelemetry-instrumentation-grpc==0.46b0
-opentelemetry-instrumentation-httpx==0.46b0
-opentelemetry-instrumentation-jinja2==0.46b0
-opentelemetry-instrumentation-kafka-python==0.46b0
-opentelemetry-instrumentation-logging==0.46b0
-opentelemetry-instrumentation-mysql==0.46b0
-opentelemetry-instrumentation-mysqlclient==0.46b0
-opentelemetry-instrumentation-pika==0.46b0
-opentelemetry-instrumentation-psycopg==0.46b0
-opentelemetry-instrumentation-psycopg2==0.46b0
-opentelemetry-instrumentation-pymemcache==0.46b0
-opentelemetry-instrumentation-pymongo==0.46b0
-opentelemetry-instrumentation-pymysql==0.46b0
-opentelemetry-instrumentation-pyramid==0.46b0
-opentelemetry-instrumentation-redis==0.46b0
-opentelemetry-instrumentation-remoulade==0.46b0
-opentelemetry-instrumentation-requests==0.46b0
-opentelemetry-instrumentation-sklearn==0.46b0
-opentelemetry-instrumentation-sqlalchemy==0.46b0
-opentelemetry-instrumentation-sqlite3==0.46b0
-opentelemetry-instrumentation-starlette==0.46b0
-opentelemetry-instrumentation-system-metrics==0.46b0
-opentelemetry-instrumentation-threading==0.46b0
-opentelemetry-instrumentation-tornado==0.46b0
-opentelemetry-instrumentation-tortoiseorm==0.46b0
-opentelemetry-instrumentation-urllib==0.46b0
-opentelemetry-instrumentation-urllib3==0.46b0
-opentelemetry-instrumentation-wsgi==0.46b0
+opentelemetry-instrumentation-aio-pika==0.47b0
+opentelemetry-instrumentation-aiohttp-client==0.47b0
+opentelemetry-instrumentation-aiohttp-server==0.47b0
+opentelemetry-instrumentation-aiopg==0.47b0
+opentelemetry-instrumentation-asgi==0.47b0
+opentelemetry-instrumentation-asyncio==0.47b0
+opentelemetry-instrumentation-asyncpg==0.47b0
+opentelemetry-instrumentation-boto==0.47b0
+opentelemetry-instrumentation-boto3sqs==0.47b0
+opentelemetry-instrumentation-botocore==0.47b0
+opentelemetry-instrumentation-cassandra==0.47b0
+opentelemetry-instrumentation-celery==0.47b0
+opentelemetry-instrumentation-confluent-kafka==0.47b0
+opentelemetry-instrumentation-dbapi==0.47b0
+opentelemetry-instrumentation-django==0.47b0
+opentelemetry-instrumentation-elasticsearch==0.47b0
+opentelemetry-instrumentation-falcon==0.47b0
+opentelemetry-instrumentation-fastapi==0.47b0
+opentelemetry-instrumentation-flask==0.47b0
+opentelemetry-instrumentation-grpc==0.47b0
+opentelemetry-instrumentation-httpx==0.47b0
+opentelemetry-instrumentation-jinja2==0.47b0
+opentelemetry-instrumentation-kafka-python==0.47b0
+opentelemetry-instrumentation-logging==0.47b0
+opentelemetry-instrumentation-mysql==0.47b0
+opentelemetry-instrumentation-mysqlclient==0.47b0
+opentelemetry-instrumentation-pika==0.47b0
+opentelemetry-instrumentation-psycopg==0.47b0
+opentelemetry-instrumentation-psycopg2==0.47b0
+opentelemetry-instrumentation-pymemcache==0.47b0
+opentelemetry-instrumentation-pymongo==0.47b0
+opentelemetry-instrumentation-pymysql==0.47b0
+opentelemetry-instrumentation-pyramid==0.47b0
+opentelemetry-instrumentation-redis==0.47b0
+opentelemetry-instrumentation-remoulade==0.47b0
+opentelemetry-instrumentation-requests==0.47b0
+opentelemetry-instrumentation-sqlalchemy==0.47b0
+opentelemetry-instrumentation-sqlite3==0.47b0
+opentelemetry-instrumentation-starlette==0.47b0
+opentelemetry-instrumentation-system-metrics==0.47b0
+opentelemetry-instrumentation-threading==0.47b0
+opentelemetry-instrumentation-tornado==0.47b0
+opentelemetry-instrumentation-tortoiseorm==0.47b0
+opentelemetry-instrumentation-urllib==0.47b0
+opentelemetry-instrumentation-urllib3==0.47b0
+opentelemetry-instrumentation-wsgi==0.47b0

controllers/builder_test.go

@@ -1291,7 +1291,7 @@ service:
 						Annotations: map[string]string{},
 					},
 					Data: map[string]string{
-						"collector.yaml": "exporters:\n    logging: null\nreceivers:\n    prometheus:\n        config: {}\n        target_allocator:\n            collector_id: ${POD_NAME}\n            endpoint: http://test-targetallocator:80\n            interval: 30s\nservice:\n    pipelines:\n        metrics:\n            exporters:\n                - logging\n            receivers:\n                - prometheus\n",
+						"collector.yaml": "exporters:\n    logging: null\nreceivers:\n    prometheus:\n        config: {}\n        target_allocator:\n            collector_id: ${POD_NAME}\n            endpoint: http://test-targetallocator.test.svc.cluster.local:80\n            interval: 30s\nservice:\n    pipelines:\n        metrics:\n            exporters:\n                - logging\n            receivers:\n                - prometheus\n",
 					},
 				},
 				&corev1.ServiceAccount{
@@ -1682,7 +1682,7 @@ prometheus_cr:
 						Annotations: map[string]string{},
 					},
 					Data: map[string]string{
-						"collector.yaml": "exporters:\n    logging: null\nreceivers:\n    prometheus:\n        config: {}\n        target_allocator:\n            collector_id: ${POD_NAME}\n            endpoint: http://test-targetallocator:80\n            interval: 30s\nservice:\n    pipelines:\n        metrics:\n            exporters:\n                - logging\n            receivers:\n                - prometheus\n",
+						"collector.yaml": "exporters:\n    logging: null\nreceivers:\n    prometheus:\n        config: {}\n        target_allocator:\n            collector_id: ${POD_NAME}\n            endpoint: http://test-targetallocator.test.svc.cluster.local:80\n            interval: 30s\nservice:\n    pipelines:\n        metrics:\n            exporters:\n                - logging\n            receivers:\n                - prometheus\n",
 					},
 				},
 				&corev1.ServiceAccount{

internal/manifests/collector/config_replace.go

@@ -71,7 +71,7 @@ func ReplaceConfig(otelcol v1beta1.OpenTelemetryCollector, targetAllocator *v1al
 
 	// To avoid issues caused by Prometheus validation logic, which fails regex validation when it encounters
 	// $$ in the prom config, we update the YAML file directly without marshaling and unmarshalling.
-	updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TAService(targetAllocator.Name))
+	updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TAService(targetAllocator.Name), targetAllocator.Namespace)
 	if getCfgPromErr != nil {
 		return "", getCfgPromErr
 	}

internal/manifests/collector/config_replace_test.go

@@ -43,7 +43,7 @@ func TestPrometheusParser(t *testing.T) {
 		assert.NotContains(t, prometheusConfig, "scrape_configs")
 
 		expectedTAConfig := map[interface{}]interface{}{
-			"endpoint":     "http://test-targetallocator:80",
+			"endpoint":     "http://test-targetallocator.default.svc.cluster.local:80",
 			"interval":     "30s",
 			"collector_id": "${POD_NAME}",
 		}
@@ -68,7 +68,7 @@ func TestPrometheusParser(t *testing.T) {
 		assert.NotContains(t, prometheusConfig, "scrape_configs")
 
 		expectedTAConfig := map[interface{}]interface{}{
-			"endpoint":     "http://test-targetallocator:80",
+			"endpoint":     "http://test-targetallocator.default.svc.cluster.local:80",
 			"interval":     "30s",
 			"collector_id": "${POD_NAME}",
 		}

internal/manifests/collector/configmap_test.go

@@ -84,7 +84,7 @@ receivers:
     config: {}
     target_allocator:
       collector_id: ${POD_NAME}
-      endpoint: http://test-targetallocator:80
+      endpoint: http://test-targetallocator.default.svc.cluster.local:80
       interval: 30s
 service:
   pipelines:

internal/manifests/collector/testdata/config_expected_targetallocator.yaml

@@ -9,7 +9,7 @@ receivers:
         scrape_timeout: 10s
     target_allocator:
       collector_id: ${POD_NAME}
-      endpoint: http://test-targetallocator:80
+      endpoint: http://test-targetallocator.default.svc.cluster.local:80
       interval: 30s
 service:
   pipelines:

internal/manifests/collector/testdata/relabel_config_expected_with_sd_config.yaml

@@ -10,7 +10,7 @@ receivers:
       scrape_configs:
       - honor_labels: true
         http_sd_configs:
-        - url: http://test-targetallocator:80/jobs/service-x/targets?collector_id=$POD_NAME
+        - url: http://test-targetallocator.default.svc.cluster.local:80/jobs/service-x/targets?collector_id=$POD_NAME
         job_name: service-x
         metric_relabel_configs:
         - action: keep

internal/manifests/targetallocator/adapters/config_to_prom_config.go

@@ -196,7 +196,7 @@ func UnescapeDollarSignsInPromConfig(cfg string) (map[interface{}]interface{}, e
 // This function removes any existing service discovery configurations (e.g., `sd_configs`, `dns_sd_configs`, `file_sd_configs`, etc.)
 // from the `scrape_configs` section and adds a single `http_sd_configs` configuration.
 // The `http_sd_configs` points to the TA (Target Allocator) endpoint that provides the list of targets for the given job.
-func AddHTTPSDConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceName string) (map[interface{}]interface{}, error) {
+func AddHTTPSDConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceName string, taNamespace string) (map[interface{}]interface{}, error) {
 	prometheusConfigProperty, ok := prometheus["config"]
 	if !ok {
 		return nil, errorNoComponent("prometheusConfig")
@@ -249,7 +249,7 @@ func AddHTTPSDConfigToPromConfig(prometheus map[interface{}]interface{}, taServi
 		escapedJob := url.QueryEscape(jobName)
 		scrapeConfig["http_sd_configs"] = []interface{}{
 			map[string]interface{}{
-				"url": fmt.Sprintf("http://%s:80/jobs/%s/targets?collector_id=$POD_NAME", taServiceName, escapedJob),
+				"url": fmt.Sprintf("http://%s.%s.svc.cluster.local:80/jobs/%s/targets?collector_id=$POD_NAME", taServiceName, taNamespace, escapedJob),
 			},
 		}
 	}
@@ -260,7 +260,7 @@ func AddHTTPSDConfigToPromConfig(prometheus map[interface{}]interface{}, taServi
 // AddTAConfigToPromConfig adds or updates the target_allocator configuration in the Prometheus configuration.
 // If the `EnableTargetAllocatorRewrite` feature flag for the target allocator is enabled, this function
 // removes the existing scrape_configs from the collector's Prometheus configuration as it's not required.
-func AddTAConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceName string) (map[interface{}]interface{}, error) {
+func AddTAConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceName string, taNamespace string) (map[interface{}]interface{}, error) {
 	prometheusConfigProperty, ok := prometheus["config"]
 	if !ok {
 		return nil, errorNoComponent("prometheusConfig")
@@ -281,7 +281,7 @@ func AddTAConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceNa
 		return nil, errorNotAMap("target_allocator")
 	}
 
-	targetAllocatorCfg["endpoint"] = fmt.Sprintf("http://%s:80", taServiceName)
+	targetAllocatorCfg["endpoint"] = fmt.Sprintf("http://%s.%s.svc.cluster.local:80", taServiceName, taNamespace)
 	targetAllocatorCfg["interval"] = "30s"
 	targetAllocatorCfg["collector_id"] = "${POD_NAME}"
 

internal/manifests/targetallocator/adapters/config_to_prom_config_test.go

@@ -279,15 +279,15 @@ func TestAddHTTPSDConfigToPromConfig(t *testing.T) {
 						"job_name": "test_job",
 						"http_sd_configs": []interface{}{
 							map[string]interface{}{
-								"url": fmt.Sprintf("http://%s:80/jobs/%s/targets?collector_id=$POD_NAME", taServiceName, url.QueryEscape("test_job")),
+								"url": fmt.Sprintf("http://%s.default.svc.cluster.local:80/jobs/%s/targets?collector_id=$POD_NAME", taServiceName, url.QueryEscape("test_job")),
 							},
 						},
 					},
 				},
 			},
 		}
 
-		actualCfg, err := ta.AddHTTPSDConfigToPromConfig(cfg, taServiceName)
+		actualCfg, err := ta.AddHTTPSDConfigToPromConfig(cfg, taServiceName, "default")
 		assert.NoError(t, err)
 		assert.Equal(t, expectedCfg, actualCfg)
 	})
@@ -308,7 +308,7 @@ func TestAddHTTPSDConfigToPromConfig(t *testing.T) {
 
 		taServiceName := "test-service"
 
-		_, err := ta.AddHTTPSDConfigToPromConfig(cfg, taServiceName)
+		_, err := ta.AddHTTPSDConfigToPromConfig(cfg, taServiceName, "default")
 		assert.Error(t, err)
 		assert.EqualError(t, err, "no scrape_configs available as part of the configuration")
 	})
@@ -338,13 +338,13 @@ func TestAddTAConfigToPromConfig(t *testing.T) {
 		expectedResult := map[interface{}]interface{}{
 			"config": map[interface{}]interface{}{},
 			"target_allocator": map[interface{}]interface{}{
-				"endpoint":     "http://test-targetallocator:80",
+				"endpoint":     "http://test-targetallocator.default.svc.cluster.local:80",
 				"interval":     "30s",
 				"collector_id": "${POD_NAME}",
 			},
 		}
 
-		result, err := ta.AddTAConfigToPromConfig(cfg, taServiceName)
+		result, err := ta.AddTAConfigToPromConfig(cfg, taServiceName, "default")
 
 		assert.NoError(t, err)
 		assert.Equal(t, expectedResult, result)
@@ -374,7 +374,7 @@ func TestAddTAConfigToPromConfig(t *testing.T) {
 
 		for _, tc := range testCases {
 			t.Run(tc.name, func(t *testing.T) {
-				_, err := ta.AddTAConfigToPromConfig(tc.cfg, taServiceName)
+				_, err := ta.AddTAConfigToPromConfig(tc.cfg, taServiceName, "default")
 
 				assert.Error(t, err)
 				assert.EqualError(t, err, tc.errText)

tests/e2e-targetallocator/targetallocator-kubernetessd/00-assert.yaml

@@ -26,7 +26,7 @@ data:
             config: {}
             target_allocator:
                 collector_id: ${POD_NAME}
-                endpoint: http://prometheus-kubernetessd-targetallocator:80
+                endpoint: http://prometheus-kubernetessd-targetallocator.chainsaw-targetallocator-kubernetessd.svc.cluster.local:80
                 interval: 30s
     service:
         pipelines:

tests/e2e-targetallocator/targetallocator-kubernetessd/chainsaw-test.yaml

@@ -5,6 +5,7 @@ metadata:
   creationTimestamp: null
   name: targetallocator-kubernetessd
 spec:
+  namespace: chainsaw-targetallocator-kubernetessd
   steps:
   - name: step-00
     try:

tests/e2e-targetallocator/targetallocator-prometheuscr/00-assert.yaml

@@ -31,7 +31,7 @@ data:
             config: {}
             target_allocator:
                 collector_id: ${POD_NAME}
-                endpoint: http://prometheus-cr-targetallocator:80
+                endpoint: http://prometheus-cr-targetallocator.chainsaw-targetallocator-prometheuscr.svc.cluster.local:80
                 interval: 30s
     service:
         pipelines:

tests/e2e-targetallocator/targetallocator-prometheuscr/chainsaw-test.yaml

@@ -5,6 +5,7 @@ metadata:
   creationTimestamp: null
   name: targetallocator-prometheuscr
 spec:
+  namespace: chainsaw-targetallocator-prometheuscr
   steps:
   - name: step-00
     try:

tests/e2e/smoke-targetallocator/00-assert.yaml

@@ -33,7 +33,7 @@ data:
             config: {}
             target_allocator:
                 collector_id: ${POD_NAME}
-                endpoint: http://stateful-targetallocator:80
+                endpoint: http://stateful-targetallocator.chainsaw-smoke-targetallocator.svc.cluster.local:80
                 interval: 30s
     service:
         pipelines:

tests/e2e/smoke-targetallocator/chainsaw-test.yaml

@@ -5,6 +5,7 @@ metadata:
   creationTimestamp: null
   name: smoke-targetallocator
 spec:
+  namespace: chainsaw-smoke-targetallocator
   steps:
   - name: step-00
     try: