Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/retail-store-sample-ap…
Browse files Browse the repository at this point in the history
…p/src/catalog/go.opentelemetry.io/contrib/propagators/aws-1.22.0
  • Loading branch information
seifrajhi authored Feb 1, 2024
2 parents 99f9158 + 04e4c66 commit e69b486
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion retail-store-sample-app/src/cart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.22.9</version>
<version>2.23.16</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions retail-store-sample-app/src/catalog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/swaggo/files v1.0.1
github.com/swaggo/gin-swagger v1.6.0
github.com/swaggo/swag v1.16.1
github.com/swaggo/swag v1.16.3
github.com/testcontainers/testcontainers-go v0.27.0
github.com/zsais/go-gin-prometheus v0.1.0
go.opentelemetry.io/contrib/detectors/aws/ec2 v1.17.0
Expand Down Expand Up @@ -64,8 +64,8 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.23.11 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.11.0 // indirect
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.11.0 // indirect
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.12.0 // indirect
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.12.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
Expand Down Expand Up @@ -110,7 +110,7 @@ require (
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.11.0
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.12.0
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.46.1
Expand Down
16 changes: 8 additions & 8 deletions retail-store-sample-app/src/catalog/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.11.0 h1:guPJXXDarmhh65i9JsigmxFuQAtmZ16fRI1/n9Y2XTc=
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.11.0/go.mod h1:w8QmM6xwcON7sSag6C4ehYQ6RzLeBffi8YTivVO3I7c=
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.11.0 h1:HTdpM48OeA6XoHecORUqBaYs06ntYjGLKJwn7f2Ba5c=
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.11.0/go.mod h1:0aP+jAoIIAub84Mwkg82birLgkQ3D45Ij2zePyMrHtk=
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.11.0 h1:knvxumjzaVsrkBzCHbZMj8wsAScCgoe6GI7iRKQ4z6g=
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.11.0/go.mod h1:ixl+egAHdiepjl/5umFOeSWoPbE/kVdjYgO9wKCiLvA=
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.12.0 h1:FhoETCebrUidlANOmrXQ2ddVW9VN+FwxwlB0HRzj8Pw=
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v1.12.0/go.mod h1:2BGPK/aLKdzOXwapCV0K/oVJZiNhO4dktKCI/AEbF5I=
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.12.0 h1:AuO6RBMVfCteFdwzFUPnF8lJpvWyImi/1EYIojQDQPg=
github.com/signalfx/splunk-otel-go/instrumentation/github.com/jmoiron/sqlx/splunksqlx v1.12.0/go.mod h1:ZKS8TDQ7VjEmRn1PKVpq6qO3KbxEJ2rXnm8Qrq515a8=
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.12.0 h1:qtXhCxx4snR3+4FZwtFLsKjyLkhBnc204iJpvSGsHO4=
github.com/signalfx/splunk-otel-go/instrumentation/internal v1.12.0/go.mod h1:H2A9DRgHAHNFE7Xh0iIZa4G5sL/3w3dLH1fm0MvE0FQ=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
Expand All @@ -262,8 +262,8 @@ github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+zy8M=
github.com/swaggo/gin-swagger v1.6.0/go.mod h1:BG00cCEy294xtVpyIAHG6+e2Qzj/xKlRdOqDkvq0uzo=
github.com/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg=
github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto=
github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg=
github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk=
github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk=
github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
Expand Down
2 changes: 1 addition & 1 deletion retail-store-sample-app/src/ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.12</version>
<version>1.6.13</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
Expand Down

0 comments on commit e69b486

Please sign in to comment.