diff --git a/collector/config.combined.yaml b/collector/config.combined.yaml new file mode 100644 index 0000000000..fd97cb11ad --- /dev/null +++ b/collector/config.combined.yaml @@ -0,0 +1,68 @@ +receivers: + otlp: + protocols: + grpc: + endpoint: "localhost:4317" + http: + endpoint: "localhost:4318" + telemetryapireceiver: + types: ["platform", "function", "extension"] + +processors: + batch: + # Jaeger (classic) rejects non-scalar tags (arrays/maps). Drop array attributes + # (process.command_args, aws.log.group.names, process.tags) to prevent "invalid tag type" 500s. + # If you need these values, stringify arrays with a transform processor instead of dropping. + attributes/drop_array_tags: + actions: + - key: process.command_args + action: delete + - key: aws.log.group.names + action: delete + - key: process.tags + action: delete + resource/drop_array_tags: + attributes: + - key: process.command_args + action: delete + - key: aws.log.group.names + action: delete + - key: process.tags + action: delete + +exporters: + logzio/logs: + account_token: "${env:LOGZIO_LOGS_TOKEN}" + region: "${env:LOGZIO_REGION}" + headers: + user-agent: logzio-opentelemetry-layer-logs + logzio/traces: + account_token: "${env:LOGZIO_TRACES_TOKEN}" + region: "${env:LOGZIO_REGION}" + headers: + user-agent: logzio-opentelemetry-layer-traces + prometheusremotewrite: + endpoint: "https://listener.logz.io:8053" + headers: + Authorization: "Bearer ${env:LOGZIO_METRICS_TOKEN}" + user-agent: logzio-opentelemetry-layer-metrics + target_info: + enabled: false + +service: + pipelines: + traces: + receivers: [otlp, telemetryapireceiver] + processors: [resource/drop_array_tags, attributes/drop_array_tags, batch] + exporters: [logzio/traces] + metrics: + receivers: [otlp, telemetryapireceiver] + processors: [batch] + exporters: [prometheusremotewrite] + logs: + receivers: [telemetryapireceiver] + processors: [batch] + exporters: [logzio/logs] + telemetry: + logs: + level: "info" diff --git a/go/build-combined.sh b/go/build-combined.sh index 648a980234..dfdcab396d 100755 --- a/go/build-combined.sh +++ b/go/build-combined.sh @@ -34,6 +34,10 @@ mkdir -p "$BUILD_DIR/combined-layer/extensions" mkdir -p "$BUILD_DIR/combined-layer/collector-config" cp "$COLLECTOR_DIR/build/extensions"/* "$BUILD_DIR/combined-layer/extensions/" cp "$COLLECTOR_DIR/config"* "$BUILD_DIR/combined-layer/collector-config/" +# Prefer the combined production config as the default if present +if [ -f "$COLLECTOR_DIR/config.combined.yaml" ]; then + cp "$COLLECTOR_DIR/config.combined.yaml" "$BUILD_DIR/combined-layer/collector-config/config.yaml" +fi echo "Step 2: Creating combined layer package..." diff --git a/java/build-combined.sh b/java/build-combined.sh index 39c4bcb355..0b6cb7b504 100755 --- a/java/build-combined.sh +++ b/java/build-combined.sh @@ -77,6 +77,11 @@ mkdir -p "$WORKSPACE_DIR/collector-config" cp "$COLLECTOR_DIR/build/extensions"/* "$WORKSPACE_DIR/extensions/" cp "$COLLECTOR_DIR/config.yaml" "$WORKSPACE_DIR/collector-config/" +# Prefer the combined production config as the default if present +if [[ -f "$COLLECTOR_DIR/config.combined.yaml" ]]; then + cp "$COLLECTOR_DIR/config.combined.yaml" "$WORKSPACE_DIR/collector-config/config.yaml" +fi + # Include E2E-specific collector config for testing workflows if [[ -f "$COLLECTOR_DIR/config.e2e.yaml" ]]; then cp "$COLLECTOR_DIR/config.e2e.yaml" "$WORKSPACE_DIR/collector-config/" diff --git a/nodejs/packages/layer/build-combined.sh b/nodejs/packages/layer/build-combined.sh index 4402a8ad59..09748495c8 100755 --- a/nodejs/packages/layer/build-combined.sh +++ b/nodejs/packages/layer/build-combined.sh @@ -57,6 +57,11 @@ mkdir -p "$WORKSPACE_DIR/collector-config" cp "$COLLECTOR_DIR/build/extensions"/* "$WORKSPACE_DIR/extensions/" cp "$COLLECTOR_DIR/config.yaml" "$WORKSPACE_DIR/collector-config/" +# Prefer the combined production config as the default if present +if [ -f "$COLLECTOR_DIR/config.combined.yaml" ]; then + cp "$COLLECTOR_DIR/config.combined.yaml" "$WORKSPACE_DIR/collector-config/config.yaml" +fi + # Include E2E-specific collector config for testing workflows if [ -f "$COLLECTOR_DIR/config.e2e.yaml" ]; then cp "$COLLECTOR_DIR/config.e2e.yaml" "$WORKSPACE_DIR/collector-config/" diff --git a/python/src/build-combined.sh b/python/src/build-combined.sh index d57739d2fc..15869e1127 100755 --- a/python/src/build-combined.sh +++ b/python/src/build-combined.sh @@ -55,6 +55,10 @@ mkdir -p "$WORKSPACE_DIR/extensions" mkdir -p "$WORKSPACE_DIR/collector-config" cp "$COLLECTOR_DIR/build/extensions"/* "$WORKSPACE_DIR/extensions/" cp "$COLLECTOR_DIR/config.yaml" "$WORKSPACE_DIR/collector-config/" +# Prefer the combined production config as the default if present +if [ -f "$COLLECTOR_DIR/config.combined.yaml" ]; then + cp "$COLLECTOR_DIR/config.combined.yaml" "$WORKSPACE_DIR/collector-config/config.yaml" +fi # Include E2E-specific collector config for testing workflows if [ -f "$COLLECTOR_DIR/config.e2e.yaml" ]; then cp "$COLLECTOR_DIR/config.e2e.yaml" "$WORKSPACE_DIR/collector-config/" diff --git a/ruby/build-combined.sh b/ruby/build-combined.sh index 65c27c3719..32de6d6ad2 100755 --- a/ruby/build-combined.sh +++ b/ruby/build-combined.sh @@ -55,6 +55,9 @@ mkdir -p "$BUILD_DIR/combined-layer/extensions" mkdir -p "$BUILD_DIR/combined-layer/collector-config" cp "$COLLECTOR_DIR/build/extensions"/* "$BUILD_DIR/combined-layer/extensions/" cp "$COLLECTOR_DIR/config.yaml" "$BUILD_DIR/combined-layer/collector-config/" +if [ -f "$COLLECTOR_DIR/config.combined.yaml" ]; then + cp "$COLLECTOR_DIR/config.combined.yaml" "$BUILD_DIR/combined-layer/collector-config/config.yaml" +fi if [ -f "$COLLECTOR_DIR/config.e2e.yaml" ]; then cp "$COLLECTOR_DIR/config.e2e.yaml" "$BUILD_DIR/combined-layer/collector-config/" fi