From e43e60378315681b33c828c1e8995a391f439b25 Mon Sep 17 00:00:00 2001 From: John Bley Date: Fri, 1 Sep 2023 12:05:12 -0400 Subject: [PATCH 1/5] Update to latest upstream otel-lambda --- opentelemetry-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-lambda b/opentelemetry-lambda index c6a7138..02bc9ec 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit c6a7138f19999f2c0adb7b5752b263ad76581647 +Subproject commit 02bc9ec168b2684d1c67eb200f08cc825a39a943 From 5d903c60d50d6a942ae46516318333a1bf6a42fe Mon Sep 17 00:00:00 2001 From: John Bley Date: Fri, 1 Sep 2023 12:09:30 -0400 Subject: [PATCH 2/5] Update java dependcies, including otel-java 1.29.0 to match upstream otel-lambda --- java/build.gradle | 12 ++++++------ java/settings.gradle | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/build.gradle b/java/build.gradle index dc6ebb7..7fd4cfc 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "com.diffplug.spotless" version "6.18.0" apply false + id "com.diffplug.spotless" version "6.21.0" apply false } group = 'com.splunk.public' @@ -8,8 +8,8 @@ description = "Splunk distribution of OpenTelemetry Lambda" ext { versions = [ - opentelemetry: '1.27.0', - opentelemetryalpha: '1.27.0-alpha' + opentelemetry: '1.29.0', + opentelemetryalpha: '1.29.0-alpha' ] } @@ -43,12 +43,12 @@ dependencies { implementation("io.opentelemetry:opentelemetry-exporter-otlp") // auto service (loaded by SDK) - annotationProcessor("com.google.auto.service:auto-service:1.0.1") - compileOnly("com.google.auto.service:auto-service:1.0.1") + annotationProcessor("com.google.auto.service:auto-service:1.1.1") + compileOnly("com.google.auto.service:auto-service:1.1.1") // AWS lambda // events - implementation("com.amazonaws:aws-lambda-java-events:3.11.2") + implementation("com.amazonaws:aws-lambda-java-events:3.11.3") // lambda logging implementation("com.amazonaws:aws-lambda-java-log4j2:1.5.1") implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0") diff --git a/java/settings.gradle b/java/settings.gradle index 5f78487..c6eb8fa 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.gradle.enterprise' version '3.13.4' + id 'com.gradle.enterprise' version '3.14.1' } gradleEnterprise { From 861d44717b5e43260806a2c237a5102b176ae0e8 Mon Sep 17 00:00:00 2001 From: John Bley Date: Fri, 1 Sep 2023 12:19:55 -0400 Subject: [PATCH 3/5] Update to splunk-otel-python 1.12.0 --- python/build-layer.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/build-layer.sh b/python/build-layer.sh index 65b1f52..d3eb1e8 100755 --- a/python/build-layer.sh +++ b/python/build-layer.sh @@ -8,11 +8,11 @@ echo "Modify dependencies and script for Splunk integration" pushd "$OTEL_PYTHON_DIR" cd "$SOURCES_DIR" -sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.11.0/g' requirements.txt -sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.18.0/g' requirements.txt +sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.12.0/g' requirements.txt +sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.19.0/g' requirements.txt # Even if this regex does nothing, leave these lines in to make later updates easier -sed -i 's/0.39b0/0.39b0/g' requirements-nodeps.txt -sed -i 's/0.39b0/0.39b0/g' requirements.txt +sed -i 's/0.40b0/0.40b0/g' requirements-nodeps.txt +sed -i 's/0.40b0/0.40b0/g' requirements.txt sed -i 's/^docker run --rm/docker run/g' ../../build.sh sed -i 's/opentelemetry-instrument/splunk-py-trace/g' otel-instrument echo "Modified python wrapper requirements:" From 3abe17402b0fe2dbde0230d1fac6771042e46d70 Mon Sep 17 00:00:00 2001 From: John Bley Date: Tue, 5 Sep 2023 13:12:39 -0400 Subject: [PATCH 4/5] Add CHANGELOG.md to, you know, log changes. --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f62ec98..ebde74d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Changelog -All notable changes to this repository are documented in this file. +## [Unreleased] -The format is based on the [Splunk GDI specification](https://github.com/signalfx/gdi-specification/blob/v1.0.0/specification/repository.md), -and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +- -## Unreleased +## 0.6.5 -### General +- Updated python to splunk-otel 1.12.0 +- Updated java dependencies, including otel-java 1.29.0 +- Updated to latest upstream otel-lambda From c40fc0f90aa21479264d8cf9155128f25e45be74 Mon Sep 17 00:00:00 2001 From: John Bley Date: Tue, 5 Sep 2023 13:17:01 -0400 Subject: [PATCH 5/5] Update actions/checkout from 3 to 4 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d713a14..5af2fe0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: check-links: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0