Skip to content

Commit 246d730

Browse files
VihasMakwanaVihasMakwana
committed
fix: add license, remove uuid5
1 parent ac01831 commit 246d730

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎NOTICE.txt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13180,11 +13180,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
1318013180

1318113181
--------------------------------------------------------------------------------
1318213182
Dependency : github.com/elastic/elastic-agent-system-metrics
13183-
Version: v0.10.3
13183+
Version: v0.10.5
1318413184
Licence type (autodetected): Apache-2.0
1318513185
--------------------------------------------------------------------------------
1318613186

13187-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.10.3/LICENSE.txt:
13187+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.10.5/LICENSE.txt:
1318813188

1318913189
Apache License
1319013190
Version 2.0, January 2004
@@ -17464,6 +17464,36 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1746417464
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1746517465

1746617466

17467+
--------------------------------------------------------------------------------
17468+
Dependency : github.com/gofrs/uuid/v5
17469+
Version: v5.2.0
17470+
Licence type (autodetected): MIT
17471+
--------------------------------------------------------------------------------
17472+
17473+
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/v5@v5.2.0/LICENSE:
17474+
17475+
Copyright (C) 2013-2018 by Maxim Bublis <b@codemonkey.ru>
17476+
17477+
Permission is hereby granted, free of charge, to any person obtaining
17478+
a copy of this software and associated documentation files (the
17479+
"Software"), to deal in the Software without restriction, including
17480+
without limitation the rights to use, copy, modify, merge, publish,
17481+
distribute, sublicense, and/or sell copies of the Software, and to
17482+
permit persons to whom the Software is furnished to do so, subject to
17483+
the following conditions:
17484+
17485+
The above copyright notice and this permission notice shall be
17486+
included in all copies or substantial portions of the Software.
17487+
17488+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17489+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17490+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17491+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
17492+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
17493+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
17494+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17495+
17496+
1746717497
--------------------------------------------------------------------------------
1746817498
Dependency : github.com/gogo/protobuf
1746917499
Version: v1.3.2
@@ -39815,36 +39845,6 @@ Contents of probable licence file $GOMODCACHE/github.com/godror/knownpb@v0.1.0/L
3981539845
limitations under the License.
3981639846

3981739847

39818-
--------------------------------------------------------------------------------
39819-
Dependency : github.com/gofrs/uuid/v5
39820-
Version: v5.2.0
39821-
Licence type (autodetected): MIT
39822-
--------------------------------------------------------------------------------
39823-
39824-
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/v5@v5.2.0/LICENSE:
39825-
39826-
Copyright (C) 2013-2018 by Maxim Bublis <b@codemonkey.ru>
39827-
39828-
Permission is hereby granted, free of charge, to any person obtaining
39829-
a copy of this software and associated documentation files (the
39830-
"Software"), to deal in the Software without restriction, including
39831-
without limitation the rights to use, copy, modify, merge, publish,
39832-
distribute, sublicense, and/or sell copies of the Software, and to
39833-
permit persons to whom the Software is furnished to do so, subject to
39834-
the following conditions:
39835-
39836-
The above copyright notice and this permission notice shall be
39837-
included in all copies or substantial portions of the Software.
39838-
39839-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39840-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
39841-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39842-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
39843-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
39844-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
39845-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39846-
39847-
3984839848
--------------------------------------------------------------------------------
3984939849
Dependency : github.com/golang-jwt/jwt/v4
3985039850
Version: v4.5.0

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ require (
204204
github.com/elastic/toutoumomoma v0.0.0-20221026030040-594ef30cb640
205205
github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
206206
github.com/go-ldap/ldap/v3 v3.4.6
207-
github.com/gofrs/uuid/v5 v5.2.0
208207
github.com/golang-jwt/jwt/v5 v5.2.1
209208
github.com/google/cel-go v0.19.0
210209
github.com/googleapis/gax-go/v2 v2.12.0
@@ -292,6 +291,7 @@ require (
292291
github.com/gobuffalo/here v0.6.7 // indirect
293292
github.com/goccy/go-json v0.10.2 // indirect
294293
github.com/godror/knownpb v0.1.0 // indirect
294+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
295295
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
296296
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
297297
github.com/golang-sql/sqlexp v0.1.0 // indirect

‎heartbeat/monitors/mocks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525
"time"
2626

27-
"github.com/gofrs/uuid/v5"
27+
"github.com/gofrs/uuid"
2828
"github.com/stretchr/testify/require"
2929

3030
"github.com/elastic/elastic-agent-libs/config"

‎libbeat/beat/info.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package beat
2020
import (
2121
"time"
2222

23-
"github.com/gofrs/uuid/v5"
23+
"github.com/gofrs/uuid"
2424
)
2525

2626
// Info stores a beats instance meta data.

‎libbeat/cmd/instance/beat.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"strings"
3838
"time"
3939

40-
"github.com/gofrs/uuid/v5"
40+
"github.com/gofrs/uuid"
4141
"go.uber.org/zap"
4242

4343
"github.com/elastic/beats/v7/libbeat/api"
@@ -275,7 +275,7 @@ func NewBeat(name, indexPrefix, v string, elasticLicensed bool, initFuncs []func
275275
ID: id,
276276
FirstStart: time.Now(),
277277
StartTime: time.Now(),
278-
EphemeralID: metricreport.EphemeralID(),
278+
EphemeralID: uuid.UUID(metricreport.EphemeralID()),
279279
},
280280
Fields: fields,
281281
}

0 commit comments

Comments
 (0)