From 04445d4b75363da28649bb8d4f49a98777d16958 Mon Sep 17 00:00:00 2001 From: "Joseph.W" Date: Tue, 8 Oct 2024 06:59:58 -0700 Subject: [PATCH] [traces] add a config in translator to allow otlp format in transit (#1363) --- go.mod | 46 +++++----- go.sum | 92 +++++++++---------- .../config/sampleSchema/validTrace.json | 3 +- translator/config/schema.json | 4 + .../appsignals_and_k8s_config.json | 3 +- .../appsignals_and_k8s_config.yaml | 1 + .../appsignals_fallback_and_eks_config.json | 3 +- .../tocwconfig/sampleConfig/trace_config.json | 3 +- .../sampleConfig/trace_config_linux.yaml | 1 + .../sampleConfig/trace_config_windows.yaml | 1 + .../otel/exporter/awsxray/translator.go | 8 +- 11 files changed, 90 insertions(+), 75 deletions(-) diff --git a/go.mod b/go.mod index 1909fddee5..2033cc6e46 100644 --- a/go.mod +++ b/go.mod @@ -7,40 +7,40 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2024 // Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters // to be all replaced since there are some changes that will always be from upstream replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240903195955-5944792b593a + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241004163757-90ec962f8f20 ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240903195955-5944792b593a +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241004163757-90ec962f8f20 replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240903195955-5944792b593a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241004163757-90ec962f8f20 ) replace ( // For clear resource attributes after copy functionality https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/148 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240903195955-5944792b593a + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241004163757-90ec962f8f20 // Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240903195955-5944792b593a + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241004163757-90ec962f8f20 ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240903195955-5944792b593a +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241004163757-90ec962f8f20 replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240903195955-5944792b593a - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240903195955-5944792b593a + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241004163757-90ec962f8f20 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241004163757-90ec962f8f20 ) // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957 @@ -91,7 +91,7 @@ replace github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.48.6 require ( github.com/BurntSushi/toml v1.3.2 github.com/Jeffail/gabs v1.4.0 - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240903195955-5944792b593a + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241004163757-90ec962f8f20 github.com/aws/aws-sdk-go v1.53.11 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.30.2 github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 @@ -222,7 +222,7 @@ require ( github.com/alecthomas/participle v0.4.1 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240903195955-5944792b593a // indirect + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241004163757-90ec962f8f20 // indirect github.com/antchfx/jsonquery v1.1.5 // indirect github.com/antchfx/xmlquery v1.3.9 // indirect github.com/antchfx/xpath v1.2.0 // indirect diff --git a/go.sum b/go.sum index 0bb405adb8..0929cdadf5 100644 --- a/go.sum +++ b/go.sum @@ -180,52 +180,52 @@ github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240903195955-5944792b593a h1:+m0HKrRgWR5ZLjDI72WFB66YRg0979qmDIzx9LNWkAQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240903195955-5944792b593a/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240903195955-5944792b593a h1:BuUJsHmG//vPawyBATmDJb/SExwtUXzOSm1TJabznt0= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240903195955-5944792b593a/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240903195955-5944792b593a h1:1jiSb2JiEGtVvrZqHkIB/gb9zfxpk02zqpltxmcXuQc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240903195955-5944792b593a/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240903195955-5944792b593a h1:23kKtkyU/yy4mfcUSIEluPA/bun6u6HGnchTUy1PK90= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240903195955-5944792b593a/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240903195955-5944792b593a h1:c5zlH1fgQAPKWaA34eKjw3KzwhRLDF2DZ77iMBWYWpA= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240903195955-5944792b593a/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240903195955-5944792b593a h1:wuDLqvY0VJgCGoU5wpKzWfMAwEqKSaahom4tq7JZiq8= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240903195955-5944792b593a/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240903195955-5944792b593a h1:wouJo1hZsvAZQxnzj8FI7g62Hw8Oz1rW9cs18eFqZMw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240903195955-5944792b593a/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240903195955-5944792b593a h1:L78yH5vGRGVgQnHvQ02X/F1fvIhJH/nLDDYKb7tJb5Y= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240903195955-5944792b593a/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240903195955-5944792b593a h1:k3/g8qInsk9QnBxMC8yCsPA2eOe7sGX7KMRJP9igPi4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240903195955-5944792b593a/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240903195955-5944792b593a h1:K3Lsbbjp4j6psfsJdKgUqRgloe0QxXMjp/Mq05l+5g0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240903195955-5944792b593a/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240903195955-5944792b593a h1:SHIR8iEWCBknsNHDUnWr3Zk6f/q67yaBRkDeFkvNU4g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240903195955-5944792b593a/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240903195955-5944792b593a h1:2u3Umdb45Z2t04d2BXl4bJWMrGBht9x8dObt7/5j7a4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240903195955-5944792b593a/go.mod h1:WkLIVRD7DNz7zNXQ6CyTajsJFhsV52hgNovjr6fVm1g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240903195955-5944792b593a h1:CP3MLanrf0O9EFPDOfKVOkCk8iC7zjnioN67N9OMYTM= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240903195955-5944792b593a/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240903195955-5944792b593a h1:uADShWDD2e68uUGTaIWBsGIjWK33XbqzxM/+HxAQ12g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240903195955-5944792b593a/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240903195955-5944792b593a h1:EQQLrlrDkjs3rm1i+vj0zTrdJkBdGS5n1w0tmcLNEz8= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240903195955-5944792b593a/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20240903195955-5944792b593a h1:6rB8vnscjDsrl/vU7wZh9e4r6ZQBnqzdVuo8kUOUejQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20240903195955-5944792b593a/go.mod h1:Rr5b3hr6Jy9w/zTjsOl3vcyDDusc90P+iGdOd0UCYOo= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240903195955-5944792b593a h1:ansEEnZyu1rMVJJP+Pb55RSyFZU8U4QwgYDk6tlMTOQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240903195955-5944792b593a/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240903195955-5944792b593a h1:U9tYL8FEcwCBNVTTcFGbC+MLmIYaqQQSTUfZLi2rbjg= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240903195955-5944792b593a/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240903195955-5944792b593a h1:hpW4XRsjMxk2+zxXaC1s2emeU8FgGDF2YHFLm8BWFKc= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240903195955-5944792b593a/go.mod h1:TgRVPbdaFu8pWg4H5yCqVznsRVe8wQJRfEeUpduTKT8= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240903195955-5944792b593a h1:0nr53ssW/mHIFKARQ15u/9IAAemvRLuInEcy3HL9FTU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240903195955-5944792b593a/go.mod h1:tvoacZuBVf9lftcH2O6rKjumRCFAy+ycjKk3QJFaFXQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240903195955-5944792b593a h1:sgWS0V5kO1qa85ufNET4569VpQtf1UZ2ymzRcEols9M= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240903195955-5944792b593a/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240903195955-5944792b593a h1:Dm0h8toX9zk+OmfsS9dUtOjTIFOoDiSEjyQmvfYbzoE= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240903195955-5944792b593a/go.mod h1:NfNPpD1AYb1Z8C/0iNtViQUmI8Nzxnr3Q4RY9EreG5c= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240903195955-5944792b593a h1:+ptQohy80eo09rVCEJA6RIeXCsykZMkRJz82XIbSFzI= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240903195955-5944792b593a/go.mod h1:FMPwht01yV4UvBAWkPFO/5jAkGFtfsmz1TRaoYgWeqU= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241004163757-90ec962f8f20 h1:SupVGBcVxJKPDbC7SF/ORLdFwDkF4E5zOLmIXFYfX5o= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241004163757-90ec962f8f20/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241004163757-90ec962f8f20 h1:K6BXZGu3WGfsf+CytDGjX94DM+1sjvRkXEaFr3Q/PG0= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241004163757-90ec962f8f20/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241004163757-90ec962f8f20 h1:F70m5ftsGrvFxRMtzSfSxrV3w/bZ+hihOQKAuszmXTs= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241004163757-90ec962f8f20/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241004163757-90ec962f8f20 h1:XEOQ0bV8xNk2k9dRdN+y/JN5+OzYwrPSFNRYjO5U6k8= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241004163757-90ec962f8f20/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241004163757-90ec962f8f20 h1:xiJvAwc5Mxn3SLM5p5Dw9RCpOraAX0pMXRvR7WieaRY= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241004163757-90ec962f8f20/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241004163757-90ec962f8f20 h1:KJO1kL6goAIy4QJd3xMT9EcS8QF+BAaRKK49V2dEgLg= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241004163757-90ec962f8f20/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241004163757-90ec962f8f20 h1:pKs3bgFjisPfCX0lzrwUbJDReuFnT1XwdMesiLv/Hgg= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241004163757-90ec962f8f20/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241004163757-90ec962f8f20 h1:a2bG1qFgEGdWNiTEHNWTZWo3CPb8MmxYfw1rbwk1H34= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241004163757-90ec962f8f20/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241004163757-90ec962f8f20 h1:hWFGf6IP9cw0mhybZAA5h/FnH727uE0d+/t6JmhVC4I= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241004163757-90ec962f8f20/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241004163757-90ec962f8f20 h1:b6NinVJw65FQKT2D69R0kV70OF2x3AtvCnOS2T1yIZs= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241004163757-90ec962f8f20/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241004163757-90ec962f8f20 h1:Vsfwf1aM49tko9YGxZNYs65vrQvgxp6YMCtJAlugAbA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241004163757-90ec962f8f20/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241004163757-90ec962f8f20 h1:jRnJibmHLBZhUpxaizoCYu6mSyHSV2OvjCYPWEB8i0g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241004163757-90ec962f8f20/go.mod h1:WkLIVRD7DNz7zNXQ6CyTajsJFhsV52hgNovjr6fVm1g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241004163757-90ec962f8f20 h1:cv0SJzSsEg4QhjmYxm4JyTzbgesKX/P/77udeUrGoeM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241004163757-90ec962f8f20/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241004163757-90ec962f8f20 h1:byYREjk2wnT3IXpW13ug+UL5S0lpXtIDSFPfoTwUV8c= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241004163757-90ec962f8f20/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241004163757-90ec962f8f20 h1:pc6xteYw+cY9p1UnCZn0PUc9BwxU6jWvi7BBuXFySRY= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241004163757-90ec962f8f20/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241004163757-90ec962f8f20 h1:mmHyi3pmzdQh5fv0IdaFBmvfEr2rne74jBhtSqINqGI= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241004163757-90ec962f8f20/go.mod h1:Rr5b3hr6Jy9w/zTjsOl3vcyDDusc90P+iGdOd0UCYOo= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241004163757-90ec962f8f20 h1:oMPij1/bWPNWLIqpluel2j9+R4OA+e6qI4FP9LRV1P8= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241004163757-90ec962f8f20/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241004163757-90ec962f8f20 h1:HLlG7MyY4J+bdeUGhcpWHzDJ1NESRf7A4H0E5AbeenA= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241004163757-90ec962f8f20/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241004163757-90ec962f8f20 h1:IPMMn35gTGHurZRZ+bAiqIvJPJpZWK9FMUpGdNKWhws= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241004163757-90ec962f8f20/go.mod h1:TgRVPbdaFu8pWg4H5yCqVznsRVe8wQJRfEeUpduTKT8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241004163757-90ec962f8f20 h1:1If4ksIFNnlrwSMlPyS9yW3DJ/k6js88MdT/DOBl7Qg= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241004163757-90ec962f8f20/go.mod h1:tvoacZuBVf9lftcH2O6rKjumRCFAy+ycjKk3QJFaFXQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241004163757-90ec962f8f20 h1:Ax9FUnbkFwwkIsxQUHWUFhL5d606KWzjs+4n2Kazwms= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241004163757-90ec962f8f20/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241004163757-90ec962f8f20 h1:hfYCuvDqPDiJoxcm93bX31lI18cscT0KBSkp8tG0ZJ8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241004163757-90ec962f8f20/go.mod h1:NfNPpD1AYb1Z8C/0iNtViQUmI8Nzxnr3Q4RY9EreG5c= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241004163757-90ec962f8f20 h1:xeV2jeizj/bdEZWBbFd6M97NYZqYbzjKDbYQAkyUsJM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241004163757-90ec962f8f20/go.mod h1:FMPwht01yV4UvBAWkPFO/5jAkGFtfsmz1TRaoYgWeqU= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= diff --git a/translator/config/sampleSchema/validTrace.json b/translator/config/sampleSchema/validTrace.json index 99582e5dc7..346b594895 100644 --- a/translator/config/sampleSchema/validTrace.json +++ b/translator/config/sampleSchema/validTrace.json @@ -22,6 +22,7 @@ }, "endpoint_override": "https://endpoint.us-west-2.amazonaws.com", "region_override": "us-west-2", - "proxy_override": "https://proxy.proxy.com" + "proxy_override": "https://proxy.proxy.com", + "transit_spans_in_otlp_format": true } } \ No newline at end of file diff --git a/translator/config/schema.json b/translator/config/schema.json index 082d5777fc..4569df27a8 100644 --- a/translator/config/schema.json +++ b/translator/config/schema.json @@ -1116,6 +1116,10 @@ "region_override": { "description": "The override region", "type": "string" + }, + "transit_spans_in_otlp_format": { + "description": "Export X-Ray to OTEL format. If not set then send spans as X-Ray format", + "type": "boolean" } }, "additionalProperties": false, diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.json b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.json index dcb42fcd2e..4ca852e3d4 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.json +++ b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.json @@ -25,6 +25,7 @@ "traces": { "traces_collected": { "application_signals": {} - } + }, + "transit_spans_in_otlp_format": true } } \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml index 8c903638ea..d66ab2f1ba 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml @@ -255,6 +255,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/logs: is_usage_data_enabled: true diff --git a/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.json b/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.json index e289b8adae..140b2d83ab 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.json +++ b/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.json @@ -29,6 +29,7 @@ "traces": { "traces_collected": { "app_signals": {} - } + }, + "transit_spans_in_otlp_format": false } } \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/trace_config.json b/translator/tocwconfig/sampleConfig/trace_config.json index 8e8e0130d8..1bd63d1ef0 100644 --- a/translator/tocwconfig/sampleConfig/trace_config.json +++ b/translator/tocwconfig/sampleConfig/trace_config.json @@ -5,6 +5,7 @@ }, "xray": { } - } + }, + "transit_spans_in_otlp_format": true } } \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/trace_config_linux.yaml b/translator/tocwconfig/sampleConfig/trace_config_linux.yaml index 165c305e4a..6502bfec4d 100644 --- a/translator/tocwconfig/sampleConfig/trace_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/trace_config_linux.yaml @@ -20,6 +20,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/traces: is_usage_data_enabled: true diff --git a/translator/tocwconfig/sampleConfig/trace_config_windows.yaml b/translator/tocwconfig/sampleConfig/trace_config_windows.yaml index 8ee589739b..c5b4d92093 100644 --- a/translator/tocwconfig/sampleConfig/trace_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/trace_config_windows.yaml @@ -20,6 +20,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/traces: is_usage_data_enabled: true diff --git a/translator/translate/otel/exporter/awsxray/translator.go b/translator/translate/otel/exporter/awsxray/translator.go index 3754080f86..fb27334f5c 100644 --- a/translator/translate/otel/exporter/awsxray/translator.go +++ b/translator/translate/otel/exporter/awsxray/translator.go @@ -23,8 +23,9 @@ import ( ) const ( - concurrencyKey = "concurrency" - resourceARNKey = "resource_arn" + concurrencyKey = "concurrency" + resourceARNKey = "resource_arn" + transitSpansInOtlpFormatKey = "transit_spans_in_otlp_format" ) type translator struct { @@ -102,6 +103,9 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { if resourceARN, ok := common.GetString(conf, common.ConfigKey(common.TracesKey, resourceARNKey)); ok { cfg.AWSSessionSettings.ResourceARN = resourceARN } + if transitOtlp, ok := common.GetBool(conf, common.ConfigKey(common.TracesKey, transitSpansInOtlpFormatKey)); ok { + cfg.TransitSpansInOtlpFormat = transitOtlp + } cfg.AWSSessionSettings.Region = getRegion(conf) cfg.AWSSessionSettings.RoleARN = getRoleARN(conf) if credentialsFileKey, ok := agent.Global_Config.Credentials[agent.CredentialsFile_Key]; ok {