diff --git a/Makefile b/Makefile index a573629256..819abbf9ed 100644 --- a/Makefile +++ b/Makefile @@ -342,4 +342,4 @@ dockerized-build-vendor: dockerized-windows-build: $(DOCKER_WINDOWS_BUILD_FROM_SOURCE) . @echo Built image: - @echo $(IMAGE) \ No newline at end of file + @echo $(IMAGE) diff --git a/go.mod b/go.mod index 6022642430..5451d84912 100644 --- a/go.mod +++ b/go.mod @@ -9,38 +9,38 @@ 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-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240604205355-82dc97164e88 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240709150923-869060a01b0a ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240604205355-82dc97164e88 +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240709150923-869060a01b0a replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240604205355-82dc97164e88 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240709150923-869060a01b0a ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240604205355-82dc97164e88 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240709150923-869060a01b0a // 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-20240604205355-82dc97164e88 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240709150923-869060a01b0a ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240604205355-82dc97164e88 +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240709150923-869060a01b0a replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240604205355-82dc97164e88 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240604205355-82dc97164e88 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240709150923-869060a01b0a + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240709150923-869060a01b0a ) // 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-20240604205355-82dc97164e88 + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240709150923-869060a01b0a github.com/aws/aws-sdk-go v1.51.17 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.30.2 github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 @@ -195,7 +195,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-20240604205355-82dc97164e88 // indirect + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240709150923-869060a01b0a // 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 540c25bc6c..bd3dd83438 100644 --- a/go.sum +++ b/go.sum @@ -179,50 +179,50 @@ 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-20240604205355-82dc97164e88 h1:L/A/Bzau/1GTEZBMIbpiRNNSoaVuSwkAbxJO6qz10hc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240604205355-82dc97164e88/go.mod h1:P9k2FWA6wiRTWRnUfknsMfHkN8XuQQ1lBYA3txjPf98= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240604205355-82dc97164e88 h1:YGwAm47fDg2m8Qof4CrKGcaRmoF956+KgyptR1AhaYk= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240604205355-82dc97164e88/go.mod h1:shTWN1DIuzxMlxFAePpC5ssPno7InKYz67kS7p+zTTM= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240604205355-82dc97164e88 h1:CpAKZizvTGadzRj7GGuI+6MlHJ+6dzkvXUVILiARhyg= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240604205355-82dc97164e88/go.mod h1:o9NV6CjnL89FLwpxhDYD+/p+6hCh5vlxE6fZPFIuV8g= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240604205355-82dc97164e88 h1:XIbmRLcVjJ61az7cB3Uvo2nEHV1VOnGIwA6/uWdW3DU= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240604205355-82dc97164e88/go.mod h1:cDpFSR8i0bjVLkxLxOFABagktk5wd7LdMzU4xX7unPo= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240604205355-82dc97164e88 h1:4gdQNseN1pQcPhUQeLuGbFo3CMomRIZW3RzWDBThNuI= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240604205355-82dc97164e88/go.mod h1:CMxOkDu9MF1JJ7X/jYYvjFTLxZ90n+mkFt88aMdBINI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240604205355-82dc97164e88 h1:wciLSLkoe6hlfzERjowXjl/G4keXHgZkrascV4ev6BI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240604205355-82dc97164e88/go.mod h1:V8pzzNan0O1W9o3rBWpSwn8YIUN9ZVCEctuzn55EWtw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240604205355-82dc97164e88 h1:/aw/gz8G76MDm4YRoAfaB6AAOq8X3pcbqfm7pNjx1iI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240604205355-82dc97164e88/go.mod h1:EW3A0XWGehjQfN6cw17uoDtYqd5SqsXDNfac9WAj8oU= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240604205355-82dc97164e88 h1:mi0J/jQeiPMqEqqH4+o5WA3RMhyqSKZ9OPrZY1qsP/w= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240604205355-82dc97164e88/go.mod h1:dkG+z2jMW6p8HgiZauQwJLgeTxQzwa/I1qoeSx0U3wI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240604205355-82dc97164e88 h1:EBw+PdzFDgq4aavGFa46I49Sz5DEXjrx6Nm9sPuYxPk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240604205355-82dc97164e88/go.mod h1:vwINNzS7Mu37VQRRa5Kq/iO88u30K3fL0MdssCP5Qnw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240604205355-82dc97164e88 h1:SojHbT2cXgFXRHw1dAXc4qIIBGGarLzqfpnMXusN8fY= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240604205355-82dc97164e88/go.mod h1:bwdfq5JKghWQG9QrzVW8g9Kd2D7b9brOaHiYWPO8V4A= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240604205355-82dc97164e88 h1:vrmlXIH1nDJJJF9InsBYZcp2EdarQuiKY6b9xnvCwQI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240604205355-82dc97164e88/go.mod h1:Y+QZTJhbAmXu7FcAlFjQ78hxoGMXP7apd9X5ux6ENQo= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240604205355-82dc97164e88 h1:aawL1Wu8iVMWVmI8vRDcMR8OUI8mVwDqhyq7FQO1sUw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240604205355-82dc97164e88/go.mod h1:0arlQ0mj/VhcFFSKHDmIc+iieHweXKENSBcqNnAY8OA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240604205355-82dc97164e88 h1:YbFx5BW2q0Qan0kQFnVXEMAHT/5sD/p356Qm0QjpwT4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240604205355-82dc97164e88/go.mod h1:JRRvo6HJ8jtHzHA2/H4+bIZsO5M8gpSXDLZ06fHN7II= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240604205355-82dc97164e88 h1:hQ1RARi6WWL6MSkkX4ggfYB3ypa2ax22GimUX7awlhU= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240604205355-82dc97164e88/go.mod h1:JZ3OGy7w5tcCOXXSZ/KPIleJ4pLH1URvxc0gS/W19p8= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240604205355-82dc97164e88 h1:S7WEq/1Cm/VgPloauwu/xy6x4H6DkOeCcdLj9bZ4tps= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240604205355-82dc97164e88/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240604205355-82dc97164e88 h1:968dseYaXy8ExWxZZrAsBZMbKtsEqatkcFPO/P9eg7I= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240604205355-82dc97164e88/go.mod h1:zhLhabEO8mr1PY65YZuJuFJAbN0938xhi3bVKD8fbnQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240604205355-82dc97164e88 h1:jM+UKjcdi90eXjiuxVgqWLDpQvfFDSKeiWfcpIAGNJ4= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240604205355-82dc97164e88/go.mod h1:FjFQFT6tfC7Gac53GC/vorbTwvR/UzRrGh/rgSQsCB4= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240604205355-82dc97164e88 h1:eYvJPHe85d8O/caqwBV76+g5zxl4OE6mx55fDzOQIn8= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240604205355-82dc97164e88/go.mod h1:a6HP//RgakNXjSCDK5NB1Fxb7uNGWD23JTWqSyp1DxU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240604205355-82dc97164e88 h1:k1kmxlRH9UhzmlV+DNHlAacJp/bniDfsbL3PoH61/c0= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240604205355-82dc97164e88/go.mod h1:qUFt/MaXuMA2uRd/hssUWAyIw5IsriPv8KV4VjPjWZA= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240604205355-82dc97164e88 h1:DeKLxbcnTGWpqohruyGddFdUyVfu4mLvzpU0aNL58Ok= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240604205355-82dc97164e88/go.mod h1:gw1UQJfG+9fp8X3JkKp1q66J86w1nnFFUDQslUCZStI= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240604205355-82dc97164e88 h1:YqJHT8oIRkuCol14Eon+f/6iUWIHY+Sw6mdfR3no2mg= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240604205355-82dc97164e88/go.mod h1:FiCQt2OTMpH5x7yU2pQ9LPL/s+btIo8dywXndVB2/HU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240604205355-82dc97164e88 h1:wjqt+C744cNhSy28NQKd+EVKb7NTIA1kUSZWtD0GQaM= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240604205355-82dc97164e88/go.mod h1:JLA1nMGAcSlqAdtK9KuVg092WnrXE2ULkCr1j/1po6g= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240709150923-869060a01b0a h1:6NRZ9WZsevO7YXEGcv8z+hqxouJxucrPxqLlxXQyt7U= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240709150923-869060a01b0a/go.mod h1:P9k2FWA6wiRTWRnUfknsMfHkN8XuQQ1lBYA3txjPf98= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240709150923-869060a01b0a h1:rmnCy9BunqQI2Pri2nCHCqcE7byppKEamV9P6I1r4mA= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240709150923-869060a01b0a/go.mod h1:shTWN1DIuzxMlxFAePpC5ssPno7InKYz67kS7p+zTTM= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240709150923-869060a01b0a h1:J5OIBvE0gs/aB9dBZJL8FYKpQ2c/LGhqyVYBgK1pQxE= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240709150923-869060a01b0a/go.mod h1:o9NV6CjnL89FLwpxhDYD+/p+6hCh5vlxE6fZPFIuV8g= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240709150923-869060a01b0a h1:qjm1Orf13X+xCVA1VwJxSVAqQyA43FQeoQfPaqZsbBQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240709150923-869060a01b0a/go.mod h1:cDpFSR8i0bjVLkxLxOFABagktk5wd7LdMzU4xX7unPo= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240709150923-869060a01b0a h1:AEG6Qf1r0YkoAEkCwy+lHB2z3r9kab7nAijv+VGfgfA= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240709150923-869060a01b0a/go.mod h1:CMxOkDu9MF1JJ7X/jYYvjFTLxZ90n+mkFt88aMdBINI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240709150923-869060a01b0a h1:V53YTfSatZpTd5HdNEtAEpoHpOwOrj7gg/yt+DNAxjg= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240709150923-869060a01b0a/go.mod h1:V8pzzNan0O1W9o3rBWpSwn8YIUN9ZVCEctuzn55EWtw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240709150923-869060a01b0a h1:BekvQfdY1w5q5lh8Gm+1XlfpuoW/7zkxVNzO+LBMJaU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240709150923-869060a01b0a/go.mod h1:EW3A0XWGehjQfN6cw17uoDtYqd5SqsXDNfac9WAj8oU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240709150923-869060a01b0a h1:tMtWSYveX52Z37FYHgLjPGCN+T4xqjbYOOkaH90Fxhk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240709150923-869060a01b0a/go.mod h1:dkG+z2jMW6p8HgiZauQwJLgeTxQzwa/I1qoeSx0U3wI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240709150923-869060a01b0a h1:1wwgIiZ3A+0uYqAmFnUh+gyaoHC5oMa9NZwHJhIUBCQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240709150923-869060a01b0a/go.mod h1:vwINNzS7Mu37VQRRa5Kq/iO88u30K3fL0MdssCP5Qnw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240709150923-869060a01b0a h1:ctJUBPkltuZIYUDKgfgAwCLMTMH5WbK3rfqmK8UiFzs= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240709150923-869060a01b0a/go.mod h1:bwdfq5JKghWQG9QrzVW8g9Kd2D7b9brOaHiYWPO8V4A= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240709150923-869060a01b0a h1:P1/gaCwv4mWUAGtg5nIUBsS6LmEETDJOuaBD9qci8W4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240709150923-869060a01b0a/go.mod h1:Y+QZTJhbAmXu7FcAlFjQ78hxoGMXP7apd9X5ux6ENQo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240709150923-869060a01b0a h1:oGaH5ZQVDbnIgoW6u76OBXTjhPa8nqwDwmJFQEhagj0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240709150923-869060a01b0a/go.mod h1:0arlQ0mj/VhcFFSKHDmIc+iieHweXKENSBcqNnAY8OA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240709150923-869060a01b0a h1:YtHPoZpXhoA7mujb4TkgLgbhmA5ynF4k0sDiJzZ8LzU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240709150923-869060a01b0a/go.mod h1:JRRvo6HJ8jtHzHA2/H4+bIZsO5M8gpSXDLZ06fHN7II= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240709150923-869060a01b0a h1:mEtW+BAbjb9s34nfAaoh6tHukYbidiDfntxwT2oS42A= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240709150923-869060a01b0a/go.mod h1:JZ3OGy7w5tcCOXXSZ/KPIleJ4pLH1URvxc0gS/W19p8= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240709150923-869060a01b0a h1:5yFOA5CfCs1ZN7y1PRhsxrDw88kSsSUowqQGTOlC1zw= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240709150923-869060a01b0a/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240709150923-869060a01b0a h1:HVn70nvE66Eou9FUmb8F2fOuNs2k+K3GpxpSdVmyqZk= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240709150923-869060a01b0a/go.mod h1:zhLhabEO8mr1PY65YZuJuFJAbN0938xhi3bVKD8fbnQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240709150923-869060a01b0a h1:3km+ldjYwX4CWesUnrd3C+8PEyaPq0W93/yeNoqmwGE= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240709150923-869060a01b0a/go.mod h1:FjFQFT6tfC7Gac53GC/vorbTwvR/UzRrGh/rgSQsCB4= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240709150923-869060a01b0a h1:w1Ce+hT3NTuiS3++an1dOhvbSpDEvx4NfZXHzDOUiOc= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240709150923-869060a01b0a/go.mod h1:a6HP//RgakNXjSCDK5NB1Fxb7uNGWD23JTWqSyp1DxU= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240709150923-869060a01b0a h1:WzphIOnRt2A0ewAuddeS0ZPXD5NI2RO8WEnlvvuM99M= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240709150923-869060a01b0a/go.mod h1:qUFt/MaXuMA2uRd/hssUWAyIw5IsriPv8KV4VjPjWZA= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240709150923-869060a01b0a h1:7d8np4xV3SmvqMrdjwGLpTjghizwpp8vcNvbJ61btno= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240709150923-869060a01b0a/go.mod h1:gw1UQJfG+9fp8X3JkKp1q66J86w1nnFFUDQslUCZStI= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240709150923-869060a01b0a h1:lII8a8ABldWE8hmkdDs5eYENvk8iDXDdlvaOgkwPsx4= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240709150923-869060a01b0a/go.mod h1:FiCQt2OTMpH5x7yU2pQ9LPL/s+btIo8dywXndVB2/HU= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240709150923-869060a01b0a h1:LCocfiDwZh4+xCSe8tofNmq4AE5Jqd/2EJ3iT+169Aw= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240709150923-869060a01b0a/go.mod h1:JLA1nMGAcSlqAdtK9KuVg092WnrXE2ULkCr1j/1po6g= 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/packaging/linux/amazon-cloudwatch-agent.spec b/packaging/linux/amazon-cloudwatch-agent.spec index e85cf74e36..e56e66e41e 100644 --- a/packaging/linux/amazon-cloudwatch-agent.spec +++ b/packaging/linux/amazon-cloudwatch-agent.spec @@ -12,6 +12,7 @@ Source: amazon-cloudwatch-agent.tar.gz %define debug_package %{nil} %define _source_payload w6.gzdio %define _binary_payload w6.gzdio +%define __jar_repack %{nil} %prep %setup -c %{name}-%{version} diff --git a/packaging/opentelemetry-jmx-metrics.jar b/packaging/opentelemetry-jmx-metrics.jar index 2fdb162b6d..02fa6fe315 100644 Binary files a/packaging/opentelemetry-jmx-metrics.jar and b/packaging/opentelemetry-jmx-metrics.jar differ diff --git a/packaging/opentelemetry_jmx_jar_test.go b/packaging/opentelemetry_jmx_jar_test.go index 7c741f8638..d9a55858c0 100644 --- a/packaging/opentelemetry_jmx_jar_test.go +++ b/packaging/opentelemetry_jmx_jar_test.go @@ -18,9 +18,9 @@ type supportedJar struct { func TestOpentelemetryJMXMetricsJarSHA(t *testing.T) { var jmxMetricsGathererVersions = map[string]supportedJar{ - "60b2ee1a798c35d10f6e3602ea46f1b1c0298080262636d73b4fc652b7dcd0da": { - version: "1.35.0-alpha", - jar: "JMX metrics gatherer", + "14f28b1c45e6ad91faa7f25462bfd96e6ab3b6980afe5534f92b8a4973895cbb": { + version: "1.37.0-fix", + jar: "JMX metrics gatherer w/ Tomcat metrics fix", }, } hash, _ := hashFile("opentelemetry-jmx-metrics.jar")