Manual copy of #272 to trigger jenkins build

operator/components/autotracing/cluster-spans-configmap.yaml

@@ -205,29 +205,12 @@ data:
 
                         # Wavefront Conventions
                         'service': df.destination_service,
-                        'application': df.destination_namespace,
+                        'application': df.source_namespace,
+                        'from_service': df.source_service,
+                        'from_source': df.source_pod,
                         # We follow pixie's convention of setting an error tag only for a server span.
                         'error': df.error,
 
-                        # OTEL HTTP Conventions
-                        'http.status_code': df.resp_status,
-                        'http.method': df.req_method,
-                    },
-                ),
-                px.otel.trace.Span(
-                    name=df.req_path,
-                    start_time=df.start_time,
-                    end_time=df.time_,
-                    trace_id=df.trace_id,
-                    span_id=df.parent_span_id,
-                    kind=px.otel.trace.SPAN_KIND_CLIENT,
-                    attributes={
-                        # NOTE: the integration handles splitting of services.
-
-                        # Wavefront Conventions
-                        'service': df.source_service,
-                        'application': df.source_namespace,
-
                         # OTEL HTTP Conventions
                         'http.status_code': df.resp_status,
                         'http.method': df.req_method,

operator/components/autotracing/egress-spans-configmap.yaml

@@ -161,6 +161,8 @@ data:
             end_time=df.time_,
             trace_id=df.trace_id,
             span_id=df.span_id,
+            # dummy parent_span_id as ebpfSampler handles both dual spans and one span version of pixie scripts by dropping the synthetic parent span
+            parent_span_id=df.span_id,
             kind=px.otel.trace.SPAN_KIND_CLIENT,
             attributes={
               # NOTE: the integration handles splitting of services.

operator/components/autotracing/ingress-spans-configmap.yaml

@@ -161,6 +161,8 @@ data:
             end_time=df.time_,
             trace_id=df.trace_id,
             span_id=df.span_id,
+            # dummy parent_span_id as ebpfSampler handles both dual spans and one span version of pixie scripts by dropping the synthetic parent span
+            parent_span_id=df.span_id,
             kind=px.otel.trace.SPAN_KIND_SERVER,
             attributes={
               # NOTE: the integration handles splitting of services.

operator/components/proxy/1-wavefront-proxy-deployment.yaml

@@ -185,6 +185,8 @@ spec:
             mountPath: /wavefront-proxy
           - name: preprocessor
             mountPath: /etc/wavefront/preprocessor
+          - name: log4j2
+            mountPath: /etc/wavefront/wavefront-proxy
           {{- if .HttpProxy.UseHttpProxyCAcert }}
           - name: http-proxy-keystores
             mountPath: /tmp/secrets/keystores
@@ -195,6 +197,9 @@ spec:
       - name: preprocessor
         configMap:
           name: operator-proxy-preprocessor-rules-config
+      - name: log4j2
+        configMap:
+          name: custom-proxy-log4j2
       {{- if .HttpProxy.UseHttpProxyCAcert }}
       - name: http-proxy-keystores
         emptyDir: {}

operator/config/manager/component_versions.yaml

@@ -9,4 +9,4 @@ metadata:
 data:
   collector: "1.28.0"
   logging: "2.1.10"
-  proxy: "13.3"
+  proxy: "13.2_20231108-144729"

operator/hack/autoinstrumentation/cluster-spans.pxl

@@ -195,34 +195,17 @@ px.export(
 
                     # Wavefront Conventions
                     'service': df.destination_service,
-                    'application': df.destination_namespace,
+                    'application': df.source_namespace,
+                    'from_service': df.source_service,
+                    'from_source': df.source_pod,
                     # We follow pixie's convention of setting an error tag only for a server span.
                     'error': df.error,
 
-                    # OTEL HTTP Conventions
-                    'http.status_code': df.resp_status,
-                    'http.method': df.req_method,
-                },
-            ),
-            px.otel.trace.Span(
-                name=df.req_path,
-                start_time=df.start_time,
-                end_time=df.time_,
-                trace_id=df.trace_id,
-                span_id=df.parent_span_id,
-                kind=px.otel.trace.SPAN_KIND_CLIENT,
-                attributes={
-                    # NOTE: the integration handles splitting of services.
-
-                    # Wavefront Conventions
-                    'service': df.source_service,
-                    'application': df.source_namespace,
-
                     # OTEL HTTP Conventions
                     'http.status_code': df.resp_status,
                     'http.method': df.req_method,
                 },
             ),
         ],
     ),
-)
+)

operator/hack/autoinstrumentation/egress-spans.pxl

@@ -141,6 +141,7 @@ px.export(
                 end_time=df.time_,
                 trace_id=df.trace_id,
                 span_id=df.span_id,
+                parent_span_id=df.span_id,
                 kind=px.otel.trace.SPAN_KIND_CLIENT,
                 attributes={
                     # NOTE: the integration handles splitting of services.
@@ -159,4 +160,4 @@ px.export(
             ),
         ],
     ),
-)
+)

operator/hack/autoinstrumentation/ingress-spans.pxl

@@ -141,6 +141,7 @@ px.export(
                 end_time=df.time_,
                 trace_id=df.trace_id,
                 span_id=df.span_id,
+                parent_span_id=df.span_id,
                 kind=px.otel.trace.SPAN_KIND_SERVER,
                 attributes={
                     # NOTE: the integration handles splitting of services.
@@ -159,4 +160,4 @@ px.export(
             ),
         ],
     ),
-)
+)